X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhbuildsbr.c;h=ca69fbe6e8c15c0936cd337fb54785efa22d3a7a;hp=1ca8091013ea46d581d4d6de138de799b9aee80c;hb=ced6090a330d3d83d0bce709f756aa3d7d65fea4;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 1ca8091..ca69fbe 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -1,18 +1,18 @@
 /*
- * mhbuildsbr.c -- routines to expand/translate MIME composition files
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** mhbuildsbr.c -- routines to expand/translate MIME composition files
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 /*
- * This code was originally part of mhn.c.  I split it into
- * a separate program (mhbuild.c) and then later split it
- * again (mhbuildsbr.c).  But the code still has some of
- * the mhn.c code in it.  This program needs additional
- * streamlining and removal of unneeded code.
- */
+** This code was originally part of mhn.c.  I split it into
+** a separate program (mhbuild.c) and then later split it
+** again (mhbuildsbr.c).  But the code still has some of
+** the mhn.c code in it.  This program needs additional
+** streamlining and removal of unneeded code.
+*/
 
 #include <h/mh.h>
 #include <fcntl.h>
@@ -57,9 +57,9 @@ extern int rcachesw;  /* mhcachesbr.c */
 extern int wcachesw;  /* mhcachesbr.c */
 
 /*
- * Directory to place tmp files.  This must
- * be set before these routines are called.
- */
+** Directory to place tmp files.  This must
+** be set before these routines are called.
+*/
 char *tmp;
 
 pid_t xpid = 0;
@@ -83,13 +83,13 @@ void free_ctinfo (CT);
 void free_encoding (CT, int);
 
 /*
- * prototypes
- */
+** prototypes
+*/
 CT build_mime (char *);
 
 /*
- * static prototypes
- */
+** static prototypes
+*/
 static int init_decoded_content (CT);
 static char *fgetstr (char *, int, FILE *);
 static int user_content (FILE *, char *, char *, CT *);
@@ -101,13 +101,13 @@ static char *calculate_digest (CT, int);
 
 
 /*
- * Main routine for translating composition file
- * into valid MIME message.  It translates the draft
- * into a content structure (actually a tree of content
- * structures).  This message then can be manipulated
- * in various ways, including being output via
- * output_message().
- */
+** Main routine for translating composition file
+** into valid MIME message.  It translates the draft
+** into a content structure (actually a tree of content
+** structures).  This message then can be manipulated
+** in various ways, including being output via
+** output_message().
+*/
 
 CT
 build_mime (char *infile)
@@ -127,23 +127,23 @@ build_mime (char *infile)
 		adios (infile, "unable to open for reading");
 
 	/*
-	 * Allocate space for primary (outside) content
-	 */
+	** Allocate space for primary (outside) content
+	*/
 	if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL)
 		adios (NULL, "out of memory");
 
 	/*
-	 * Allocate structure for handling decoded content
-	 * for this part.  We don't really need this, but
-	 * allocate it to remain consistent.
-	 */
+	** Allocate structure for handling decoded content
+	** for this part.  We don't really need this, but
+	** allocate it to remain consistent.
+	*/
 	init_decoded_content (ct);
 
 	/*
-	 * Parse some of the header fields in the composition
-	 * draft into the linked list of header fields for
-	 * the new MIME message.
-	 */
+	** Parse some of the header fields in the composition
+	** draft into the linked list of header fields for
+	** the new MIME message.
+	*/
 	for (compnum = 1, state = FLD;;) {
 		switch (state = m_getfld (state, name, buf, sizeof(buf), in)) {
 		case FLD:
@@ -155,14 +155,18 @@ build_mime (char *infile)
 			if (!mh_strcasecmp (name, VRSN_FIELD))
 				adios (NULL, "draft shouldn't contain %s: field", VRSN_FIELD);
 
-			/* abort if draft has Content-Transfer-Encoding header field */
+			/*
+			** abort if draft has Content-Transfer-Encoding
+			** header field
+			*/
 			if (!mh_strcasecmp (name, ENCODING_FIELD))
 				adios (NULL, "draft shouldn't contain %s: field", ENCODING_FIELD);
 
 			/* ignore any Content-Type fields in the header */
 			if (!mh_strcasecmp (name, TYPE_FIELD)) {
 				while (state == FLDPLUS)
-					state = m_getfld (state, name, buf, sizeof(buf), in);
+					state = m_getfld (state, name, buf,
+							sizeof(buf), in);
 				goto finish_field;
 			}
 
@@ -173,14 +177,14 @@ build_mime (char *infile)
 			/* if necessary, get rest of field */
 			while (state == FLDPLUS) {
 				state = m_getfld (state, name, buf, sizeof(buf), in);
-				vp = add (buf, vp);  /* add to previous value */
+				vp = add (buf, vp);  /* add to prev value */
 			}
 
 			/* Now add the header data to the list */
 			add_header (ct, np, vp);
 
 finish_field:
-			/* if this wasn't the last header field, then continue */
+			/* if this wasn't the last hdr field, then continue */
 			if (state != FLDEOF)
 				continue;
 			/* else fall... */
@@ -196,7 +200,8 @@ finish_field:
 
 		case LENERR:
 		case FMTERR:
-			adios (NULL, "message format error in component #%d", compnum);
+			adios (NULL, "message format error in component #%d",
+					compnum);
 
 		default:
 			adios (NULL, "getfld() returned %d", state);
@@ -205,18 +210,18 @@ finish_field:
 	}
 
 	/*
-	 * Now add the MIME-Version header field
-	 * to the list of header fields.
-	 */
+	** Now add the MIME-Version header field
+	** to the list of header fields.
+	*/
 	np = add (VRSN_FIELD, NULL);
 	vp = concat (" ", VRSN_VALUE, "\n", NULL);
 	add_header (ct, np, vp);
 
 	/*
-	 * We initally assume we will find multiple contents in the
-	 * draft.  So create a multipart/mixed content to hold everything.
-	 * We can remove this later, if it is not needed.
-	 */
+	** We initally assume we will find multiple contents in the
+	** draft.  So create a multipart/mixed content to hold everything.
+	** We can remove this later, if it is not needed.
+	*/
 	if (get_ctinfo ("multipart/mixed", ct, 0) == NOTOK)
 		done (1);
 	ct->c_type = CT_MULTIPART;
@@ -229,9 +234,9 @@ finish_field:
 	pp = &m->mp_parts;
 
 	/*
-	 * read and parse the composition file
-	 * and the directives it contains.
-	 */
+	** read and parse the composition file
+	** and the directives it contains.
+	*/
 	while (fgetstr (buf, sizeof(buf) - 1, in)) {
 		struct part *part;
 		CT p;
@@ -251,9 +256,9 @@ finish_field:
 	}
 
 	/*
-	 * close the composition draft since
-	 * it's not needed any longer.
-	 */
+	** close the composition draft since
+	** it's not needed any longer.
+	*/
 	fclose (in);
 
 	/* check if any contents were found */
@@ -261,9 +266,9 @@ finish_field:
 		adios (NULL, "no content directives found");
 
 	/*
-	 * If only one content was found, then remove and
-	 * free the outer multipart content.
-	 */
+	** If only one content was found, then remove and
+	** free the outer multipart content.
+	*/
 	if (!m->mp_parts->mp_next) {
 		CT p;
 
@@ -283,19 +288,19 @@ finish_field:
 	}
 
 	/*
-	 * Fill out, or expand directives.  Parse and execute
-	 * commands specified by profile composition strings.
-	 */
+	** Fill out, or expand directives.  Parse and execute
+	** commands specified by profile composition strings.
+	*/
 	compose_content (ct);
 
 	if ((cp = strchr(prefix, 'a')) == NULL)
 		adios (NULL, "internal error(4)");
 
 	/*
-	 * Scan the contents.  Choose a transfer encoding, and
-	 * check if prefix for multipart boundary clashes with
-	 * any of the contents.
-	 */
+	** Scan the contents.  Choose a transfer encoding, and
+	** check if prefix for multipart boundary clashes with
+	** any of the contents.
+	*/
 	while (scan_content (ct) == NOTOK) {
 		if (*cp < 'z') {
 			(*cp)++;
@@ -315,9 +320,9 @@ finish_field:
 
 
 /*
- * Set up structures for placing unencoded
- * content when building parts.
- */
+** Set up structures for placing unencoded
+** content when building parts.
+*/
 
 static int
 init_decoded_content (CT ct)
@@ -361,9 +366,9 @@ fgetstr (char *s, int n, FILE *stream)
 
 
 /*
- * Parse the composition draft for text and directives.
- * Do initial setup of Content structure.
- */
+** Parse the composition draft for text and directives.
+** Do initial setup of Content structure.
+*/
 
 static int
 user_content (FILE *in, char *file, char *buf, CT *ctp)
@@ -398,13 +403,13 @@ user_content (FILE *in, char *file, char *buf, CT *ctp)
 	set_id (ct, 0);
 
 	/*
-	 * Handle inline text.  Check if line
-	 * is one of the following forms:
-	 *
-	 * 1) doesn't begin with '#'  (implicit directive)
-	 * 2) begins with "##"        (implicit directive)
-	 * 3) begins with "#<"
-	 */
+	** Handle inline text.  Check if line
+	** is one of the following forms:
+	**
+	** 1) doesn't begin with '#'  (implicit directive)
+	** 2) begins with "##"        (implicit directive)
+	** 3) begins with "#<"
+	*/
 	if (buf[0] != '#' || buf[1] == '#' || buf[1] == '<') {
 		int headers;
 		int inlineD;
@@ -414,7 +419,8 @@ user_content (FILE *in, char *file, char *buf, CT *ctp)
 		char *cp;
 
 		cp = m_mktemp2(NULL, invo_name, NULL, &out);
-		if (cp == NULL) adios("mhbuildsbr", "unable to create temporary file");
+		if (cp == NULL)
+			adios("mhbuildsbr", "unable to create temporary file");
 
 		/* use a temp file to collect the plain text lines */
 		ce->ce_file = add (cp, NULL);
@@ -436,7 +442,7 @@ user_content (FILE *in, char *file, char *buf, CT *ctp)
 			int i;
 
 			if (headers >= 0 && uprf (buffer, DESCR_FIELD)
-				&& buffer[i = strlen (DESCR_FIELD)] == ':') {
+					&& buffer[i = strlen (DESCR_FIELD)] == ':') {
 				headers = 1;
 
 again_descr:
@@ -515,8 +521,8 @@ rock_and_roll:
 			s2i++;
 
 		/*
-		 * check type specified (possibly implicitly)
-		 */
+		** check type specified (possibly implicitly)
+		*/
 		switch (ct->c_type = s2i->si_val) {
 		case CT_MESSAGE:
 			if (!mh_strcasecmp (ci->ci_subtype, "rfc822")) {
@@ -526,7 +532,8 @@ rock_and_roll:
 			/* else fall... */
 		case CT_MULTIPART:
 			adios (NULL, "it doesn't make sense to define an in-line %s content",
-				   ct->c_type == CT_MESSAGE ? "message" : "multipart");
+					ct->c_type == CT_MESSAGE ? "message" :
+					"multipart");
 			/* NOTREACHED */
 
 		default:
@@ -542,9 +549,9 @@ call_init:
 	}
 
 	/*
-	 * If we've reached this point, the next line
-	 * must be some type of explicit directive.
-	 */
+	** If we've reached this point, the next line
+	** must be some type of explicit directive.
+	*/
 
 	/* check if directive is external-type */
 	extrnal = (buf[1] == '@');
@@ -559,12 +566,12 @@ call_init:
 			break;
 
 	/*
-	 * Check if the directive specified a valid type.
-	 * This will happen if it was one of the following forms:
-	 *
-	 *    #type/subtype  (or)
-	 *    #@type/subtype
-	 */
+	** Check if the directive specified a valid type.
+	** This will happen if it was one of the following forms:
+	**
+	**    #type/subtype  (or)
+	**    #@type/subtype
+	*/
 	if (s2i->si_key) {
 		if (!ci->ci_subtype)
 			adios (NULL, "missing subtype in \"#%s\"", ci->ci_type);
@@ -595,8 +602,8 @@ use_forw:
 		}
 
 		/*
-		 * #@type/subtype (external types directive)
-		 */
+		** #@type/subtype (external types directive)
+		*/
 		if (extrnal) {
 			struct exbody *e;
 			CT p;
@@ -611,11 +618,12 @@ use_forw:
 			ci->ci_magic = NULL;
 
 			/*
-			 * Since we are using the current Content structure to
-			 * hold information about the type of the external
-			 * reference, we need to create another Content structure
-			 * for the message/external-body to wrap it in.
-			 */
+			** Since we are using the current Content structure to
+			** hold information about the type of the external
+			** reference, we need to create another Content
+			** structure for the message/external-body to wrap
+			** it in.
+			*/
 			if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL)
 				adios (NULL, "out of memory");
 			*ctp = ct;
@@ -663,13 +671,14 @@ use_forw:
 		}
 
 		/*
-		 * No [file] argument, so check profile for
-		 * method to compose content.
-		 */
+		** No [file] argument, so check profile for
+		** method to compose content.
+		*/
 		snprintf (buffer, sizeof(buffer), "%s-compose-%s/%s",
 				invo_name, ci->ci_type, ci->ci_subtype);
 		if ((cp = context_find (buffer)) == NULL || *cp == '\0') {
-			snprintf (buffer, sizeof(buffer), "%s-compose-%s", invo_name, ci->ci_type);
+			snprintf (buffer, sizeof(buffer), "%s-compose-%s",
+					invo_name, ci->ci_type);
 			if ((cp = context_find (buffer)) == NULL || *cp == '\0') {
 				content_error (NULL, ct, "don't know how to compose content");
 				done (1);
@@ -680,12 +689,13 @@ use_forw:
 	}
 
 	if (extrnal)
-		adios (NULL, "external definition not allowed for \"#%s\"", ci->ci_type);
+		adios (NULL, "external definition not allowed for \"#%s\"",
+				ci->ci_type);
 
 	/*
-	 * Message directive
-	 * #forw [+folder] [msgs]
-	 */
+	** Message directive
+	** #forw [+folder] [msgs]
+	*/
 	if (!mh_strcasecmp (ci->ci_type, "forw")) {
 		int msgnum;
 		char *folder, *arguments[MAXARGS];
@@ -727,11 +737,11 @@ use_forw:
 		free_ctinfo (ct);
 
 		/*
-		 * If there is more than one message to include, make this
-		 * a content of type "multipart/digest" and insert each message
-		 * as a subpart.  If there is only one message, then make this
-		 * a content of type "message/rfc822".
-		 */
+		** If there is more than one message to include, make this
+		** a content of type "multipart/digest" and insert each message
+		** as a subpart.  If there is only one message, then make this
+		** a content of type "message/rfc822".
+		*/
 		if (mp->numsel > 1) {
 			/* we are forwarding multiple messages */
 			if (get_ctinfo ("multipart/digest", ct, 0) == NOTOK)
@@ -790,8 +800,8 @@ use_forw:
 	}
 
 	/*
-	 * #end
-	 */
+	** #end
+	*/
 	if (!mh_strcasecmp (ci->ci_type, "end")) {
 		free_content (ct);
 		*ctp = NULL;
@@ -799,8 +809,8 @@ use_forw:
 	}
 
 	/*
-	 * #begin [ alternative | parallel ]
-	 */
+	** #begin [ alternative | parallel ]
+	*/
 	if (!mh_strcasecmp (ci->ci_type, "begin")) {
 		if (!ci->ci_magic) {
 			vrsn = MULTI_MIXED;
@@ -853,8 +863,8 @@ use_forw:
 	}
 
 	/*
-	 * Unknown directive
-	 */
+	** Unknown directive
+	*/
 	adios (NULL, "unknown directive \"#%s\"", ci->ci_type);
 	return NOTOK;  /* NOT REACHED */
 }
@@ -917,10 +927,10 @@ static char ebcdicsafe[0x100] = {
 
 
 /*
- * Fill out, or expand the various contents in the composition
- * draft.  Read-in any necessary files.  Parse and execute any
- * commands specified by profile composition strings.
- */
+** Fill out, or expand the various contents in the composition
+** draft.  Read-in any necessary files.  Parse and execute any
+** commands specified by profile composition strings.
+*/
 
 static int
 compose_content (CT ct)
@@ -944,7 +954,8 @@ compose_content (CT ct)
 		}
 
 		/* first, we call compose_content on all the subparts */
-		for (part = m->mp_parts, partnum = 1; part; part = part->mp_next, partnum++) {
+		for (part = m->mp_parts, partnum = 1; part;
+				part = part->mp_next, partnum++) {
 			CT p = part->mp_part;
 
 			sprintf (pp, "%d", partnum);
@@ -954,11 +965,11 @@ compose_content (CT ct)
 		}
 
 		/*
-		 * If the -rfc934mode switch is given, then check all
-		 * the subparts of a multipart/digest.  If they are all
-		 * message/rfc822, then mark this content and all
-		 * subparts with the rfc934 compatibility mode flag.
-		 */
+		** If the -rfc934mode switch is given, then check all
+		** the subparts of a multipart/digest.  If they are all
+		** message/rfc822, then mark this content and all
+		** subparts with the rfc934 compatibility mode flag.
+		*/
 		if (rfc934sw && ct->c_subtype == MULTI_DIGEST) {
 			int is934 = 1;
 
@@ -995,8 +1006,8 @@ compose_content (CT ct)
 		break;
 
 	/*
-	 * Discrete types (text/application/audio/image/video)
-	 */
+	** Discrete types (text/application/audio/image/video)
+	*/
 	default:
 		if (!ce->ce_file) {
 			pid_t child_id;
@@ -1025,14 +1036,17 @@ compose_content (CT ct)
 			buflen = sizeof(buffer);
 
 			/*
-			 * Parse composition string into buffer
-			 */
+			** Parse composition string into buffer
+			*/
 			for ( ; *cp; cp++) {
 				if (*cp == '%') {
 					switch (*++cp) {
 					case 'a':
 					{
-						/* insert parameters from directive */
+						/*
+						** insert parameters from
+						** directive
+						*/
 						char **ep;
 						char *s = "";
 
@@ -1053,9 +1067,10 @@ compose_content (CT ct)
 
 					case 'f':
 						/*
-						 * insert temporary filename where
-						 * content should be written
-						 */
+						** insert temporary filename
+						** where content should be
+						** written
+						*/
 						snprintf (bp, buflen, "%s", ce->ce_file);
 						break;
 
@@ -1079,9 +1094,9 @@ compose_content (CT ct)
 					buflen -= len;
 				} else {
 raw:
-				*bp++ = *cp;
-				*bp = '\0';
-				buflen--;
+					*bp++ = *cp;
+					*bp = '\0';
+					buflen--;
 				}
 			}
 
@@ -1139,17 +1154,17 @@ raw:
 
 
 /*
- * Scan the content.
- *
- *    1) choose a transfer encoding.
- *    2) check for clashes with multipart boundary string.
- *    3) for text content, figure out which character set is being used.
- *
- * If there is a clash with one of the contents and the multipart boundary,
- * this function will exit with NOTOK.  This will cause the scanning process
- * to be repeated with a different multipart boundary.  It is possible
- * (although highly unlikely) that this scan will be repeated multiple times.
- */
+** Scan the content.
+**
+**    1) choose a transfer encoding.
+**    2) check for clashes with multipart boundary string.
+**    3) for text content, figure out which character set is being used.
+**
+** If there is a clash with one of the contents and the multipart boundary,
+** this function will exit with NOTOK.  This will cause the scanning process
+** to be repeated with a different multipart boundary.  It is possible
+** (although highly unlikely) that this scan will be repeated multiple times.
+*/
 
 static int
 scan_content (CT ct)
@@ -1166,9 +1181,9 @@ scan_content (CT ct)
 	CE ce = ct->c_cefile;
 
 	/*
-	 * handle multipart by scanning all subparts
-	 * and then checking their encoding.
-	 */
+	** handle multipart by scanning all subparts
+	** and then checking their encoding.
+	*/
 	if (ct->c_type == CT_MULTIPART) {
 		struct multipart *m = (struct multipart *) ct->c_ctparams;
 		struct part *part;
@@ -1182,7 +1197,10 @@ scan_content (CT ct)
 			if (scan_content (p) == NOTOK)  /* choose encoding for subpart */
 				return NOTOK;
 
-			/* if necessary, enlarge encoding for enclosing multipart */
+			/*
+			** if necessary, enlarge encoding for enclosing
+			** multipart
+			*/
 			if (p->c_encoding == CE_BINARY)
 				ct->c_encoding = CE_BINARY;
 			if (p->c_encoding == CE_8BIT && ct->c_encoding != CE_BINARY)
@@ -1193,8 +1211,8 @@ scan_content (CT ct)
 	}
 
 	/*
-	 * Decide what to check while scanning this content.
-	 */
+	** Decide what to check while scanning this content.
+	*/
 	switch (ct->c_type) {
 	case CT_TEXT:
 		check8bit = 1;
@@ -1235,9 +1253,9 @@ scan_content (CT ct)
 	case CT_IMAGE:
 	case CT_VIDEO:
 		/*
-		 * Don't check anything for these types,
-		 * since we are forcing use of base64.
-		 */
+		** Don't check anything for these types,
+		** since we are forcing use of base64.
+		*/
 		check8bit = 0;
 		checkebcdic = 0;
 		checklinelen = 0;
@@ -1247,8 +1265,8 @@ scan_content (CT ct)
 	}
 
 	/*
-	 * Scan the unencoded content
-	 */
+	** Scan the unencoded content
+	*/
 	if (check8bit || checklinelen || checklinespace || checkboundary) {
 		if ((in = fopen (ce->ce_file, "r")) == NULL)
 			adios (ce->ce_file, "unable to open for reading");
@@ -1256,45 +1274,51 @@ scan_content (CT ct)
 
 		while (fgets (buffer, sizeof(buffer) - 1, in)) {
 			/*
-			 * Check for 8bit data.
-			 */
+			** Check for 8bit data.
+			*/
 			if (check8bit) {
 				for (cp = buffer; *cp; cp++) {
 					if (!isascii (*cp)) {
 						contains8bit = 1;
-						check8bit = 0;  /* no need to keep checking */
+						/* no need to keep checking */
+						check8bit = 0;
 					}
 					/*
-					 * Check if character is ebcdic-safe.  We only check
-					 * this if also checking for 8bit data.
-					 */
+					** Check if character is ebcdic-safe.
+					** We only check this if also checking
+					** for 8bit data.
+					*/
 					if (checkebcdic && !ebcdicsafe[*cp & 0xff]) {
 						ebcdicunsafe = 1;
-						checkebcdic = 0; /* no need to keep checking */
+						/* no need to keep checking */
+						checkebcdic = 0;
 					}
 				}
 			}
 
 			/*
-			 * Check line length.
-			 */
+			** Check line length.
+			*/
 			if (checklinelen && (strlen (buffer) > CPERLIN + 1)) {
 				linelen = 1;
 				checklinelen = 0;  /* no need to keep checking */
 			}
 
 			/*
-			 * Check if line ends with a space.
-			 */
-			if (checklinespace && (cp = buffer + strlen (buffer) - 2) > buffer && isspace (*cp)) {
+			** Check if line ends with a space.
+			*/
+			if (checklinespace &&
+					(cp = buffer + strlen (buffer) - 2) >
+					buffer && isspace (*cp)) {
 				linespace = 1;
-				checklinespace = 0;  /* no need to keep checking */
+				/* no need to keep checking */
+				checklinespace = 0;
 			}
 
 			/*
-			 * Check if content contains a line that clashes
-			 * with our standard boundary for multipart messages.
-			 */
+			** Check if content contains a line that clashes
+			** with our standard boundary for multipart messages.
+			*/
 			if (checkboundary && buffer[0] == '-' && buffer[1] == '-') {
 				for (cp = buffer + strlen (buffer) - 1; cp >= buffer; cp--)
 					if (!isspace (*cp))
@@ -1302,7 +1326,8 @@ scan_content (CT ct)
 				*++cp = '\0';
 				if (!strncmp(buffer + 2, prefix, len) && isdigit(buffer[2 + len])) {
 					boundaryclash = 1;
-					checkboundary = 0;  /* no need to keep checking */
+					/* no need to keep checking */
+					checkboundary = 0;
 				}
 			}
 		}
@@ -1310,14 +1335,14 @@ scan_content (CT ct)
 	}
 
 	/*
-	 * Decide which transfer encoding to use.
-	 */
+	** Decide which transfer encoding to use.
+	*/
 	switch (ct->c_type) {
 	case CT_TEXT:
 		/*
-		 * If the text content didn't specify a character
-		 * set, we need to figure out which one was used.
-		 */
+		** If the text content didn't specify a character
+		** set, we need to figure out which one was used.
+		*/
 		t = (struct text *) ct->c_ctparams;
 		if (t->tx_charset == CHARSET_UNSPECIFIED) {
 			CI ci = &ct->c_ctinfo;
@@ -1372,10 +1397,10 @@ scan_content (CT ct)
 
 
 /*
- * Scan the content structures, and build header
- * fields that will need to be output into the
- * message.
- */
+** Scan the content structures, and build header
+** fields that will need to be output into the
+** message.
+*/
 
 static int
 build_headers (CT ct)
@@ -1386,9 +1411,9 @@ build_headers (CT ct)
 	CI ci = &ct->c_ctinfo;
 
 	/*
-	 * If message is type multipart, then add the multipart
-	 * boundary to the list of attribute/value pairs.
-	 */
+	** If message is type multipart, then add the multipart
+	** boundary to the list of attribute/value pairs.
+	*/
 	if (ct->c_type == CT_MULTIPART) {
 		char *cp;
 		static int level = 0;  /* store nesting level */
@@ -1403,18 +1428,18 @@ build_headers (CT ct)
 	}
 
 	/*
-	 * Skip the output of Content-Type, parameters, content
-	 * description and disposition, and Content-ID if the
-	 * content is of type "message" and the rfc934 compatibility
-	 * flag is set (which means we are inside multipart/digest
-	 * and the switch -rfc934mode was given).
-	 */
+	** Skip the output of Content-Type, parameters, content
+	** description and disposition, and Content-ID if the
+	** content is of type "message" and the rfc934 compatibility
+	** flag is set (which means we are inside multipart/digest
+	** and the switch -rfc934mode was given).
+	*/
 	if (ct->c_type == CT_MESSAGE && ct->c_rfc934)
 		goto skip_headers;
 
 	/*
-	 * output the content type and subtype
-	 */
+	** output the content type and subtype
+	*/
 	np = add (TYPE_FIELD, NULL);
 	vp = concat (" ", ci->ci_type, "/", ci->ci_subtype, NULL);
 
@@ -1427,9 +1452,9 @@ build_headers (CT ct)
 		&& ((struct exbody *) ct->c_ctparams)->eb_body;
 
 	/*
-	 * Append the attribute/value pairs to
-	 * the end of the Content-Type line.
-	 */
+	** Append the attribute/value pairs to
+	** the end of the Content-Type line.
+	*/
 	for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
 		if (mailbody && !mh_strcasecmp (*ap, "body"))
 			continue;
@@ -1450,9 +1475,9 @@ build_headers (CT ct)
 	}
 
 	/*
-	 * Append any RFC-822 comment to the end of
-	 * the Content-Type line.
-	 */
+	** Append any RFC-822 comment to the end of
+	** the Content-Type line.
+	*/
 	if (ci->ci_comment) {
 		snprintf (buffer, sizeof(buffer), "(%s)", ci->ci_comment);
 		if (len + 1 + (cc = 2 + strlen (ci->ci_comment)) >= CPERLIN) {
@@ -1469,8 +1494,8 @@ build_headers (CT ct)
 	add_header (ct, np, vp);
 
 	/*
-	 * output the Content-ID, unless disabled by -nocontentid
-	 */
+	** output the Content-ID, unless disabled by -nocontentid
+	*/
 	if (contentidsw && ct->c_id) {
 		np = add (ID_FIELD, NULL);
 		vp = concat (" ", ct->c_id, NULL);
@@ -1478,8 +1503,8 @@ build_headers (CT ct)
 	}
 
 	/*
-	 * output the Content-Description
-	 */
+	** output the Content-Description
+	*/
 	if (ct->c_descr) {
 		np = add (DESCR_FIELD, NULL);
 		vp = concat (" ", ct->c_descr, NULL);
@@ -1487,8 +1512,8 @@ build_headers (CT ct)
 	}
 
 	/*
-	 * output the Content-Disposition
-	 */
+	** output the Content-Disposition
+	*/
 	if (ct->c_dispo) {
 		np = add (DISPO_FIELD, NULL);
 		vp = concat (" ", ct->c_dispo, NULL);
@@ -1497,16 +1522,16 @@ build_headers (CT ct)
 
 skip_headers:
 	/*
-	 * If this is the internal content structure for a
-	 * "message/external", then we are done with the
-	 * headers (since it has no body).
-	 */
+	** If this is the internal content structure for a
+	** "message/external", then we are done with the
+	** headers (since it has no body).
+	*/
 	if (ct->c_ctexbody)
 		return OK;
 
 	/*
-	 * output the Content-MD5
-	 */
+	** output the Content-MD5
+	*/
 	if (checksw) {
 		np = add (MD5_FIELD, NULL);
 		vp = calculate_digest (ct, (ct->c_encoding == CE_QUOTED) ? 1 : 0);
@@ -1514,8 +1539,8 @@ skip_headers:
 	}
 
 	/*
-	 * output the Content-Transfer-Encoding
-	 */
+	** output the Content-Transfer-Encoding
+	*/
 	switch (ct->c_encoding) {
 	case CE_7BIT:
 		/* Nothing to output */
@@ -1568,8 +1593,8 @@ skip_headers:
 	}
 
 	/*
-	 * Additional content specific header processing
-	 */
+	** Additional content specific header processing
+	*/
 	switch (ct->c_type) {
 	case CT_MULTIPART:
 	{
@@ -1643,7 +1668,8 @@ calculate_digest (CT ct, int asciiP)
 		}
 	} else {
 		while ((cc = fread (buffer, sizeof(*buffer), sizeof(buffer), in)) > 0)
-			MD5Update (&mdContext, (unsigned char *) buffer, (unsigned int) cc);
+			MD5Update (&mdContext, (unsigned char *) buffer,
+					(unsigned int) cc);
 	}
 
 	/* md5 finalization.  Write digest and zero md5 context */