X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/122129da83e4e9ec2d0363ef9f60d32491af2629..02b04f3b19b8bd69ae292eeb2c2d7eec410506f2:/uip/mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index c72bd818..623f474a 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -190,9 +190,8 @@ build_mime (char *infile, int autobuild, int dist, int directives,
 		    fclose(in);
 		    free (ct);
 		    return NULL;
-		} else {
-		    adios (NULL, "draft shouldn't contain %s: field", name);
 		}
+                adios (NULL, "draft shouldn't contain %s: field", name);
 	    }
 
 	    /* ignore any Content-Type fields in the header */
@@ -205,8 +204,8 @@ build_mime (char *infile, int autobuild, int dist, int directives,
 	    }
 
 	    /* get copies of the buffers */
-	    np = add (name, NULL);
-	    vp = add (buf, NULL);
+	    np = mh_xstrdup(name);
+	    vp = mh_xstrdup(buf);
 
 	    /* if necessary, get rest of field */
 	    while (state == FLDPLUS) {
@@ -344,7 +343,7 @@ finish_field:
 
 	case BODY:
 	    fseek (in, (long) (-strlen (buf)), SEEK_CUR);
-	    /* fall through */
+	    /* FALLTHRU */
 	case FILEEOF:
 	    break;
 
@@ -378,7 +377,7 @@ finish_field:
      */
 
     if (! dist) {
-	np = add (VRSN_FIELD, NULL);
+	np = mh_xstrdup(VRSN_FIELD);
 	vp = concat (" ", VRSN_VALUE, "\n", NULL);
 	add_header (ct, np, vp);
     }
@@ -406,7 +405,7 @@ finish_field:
 	CT p;
 
 	if (user_content (in, buf, &p, infile) == DONE) {
-	    admonish (NULL, "ignoring spurious #end");
+	    inform("ignoring spurious #end, continuing...");
 	    continue;
 	}
 	if (!p)
@@ -613,23 +612,26 @@ static char *
 fgetstr (char *s, int n, FILE *stream)
 {
     char *cp, *ep;
-    int o_n = n;
 
+    ep = s + n;
     while(1) {
-	for (ep = (cp = s) + o_n; cp < ep; ) {
-	    int i;
+	for (cp = s; cp < ep;) {
+	    int len;
 
 	    if (!fgets (cp, n, stream))
-		return (cp != s ? s : NULL);
+                return cp == s ? NULL : s; /* "\\\nEOF" ignored. */
 
-	    if (cp == s && *cp != '#')
-		return s;
+	    if (! do_direct()  ||  (cp == s && *cp != '#'))
+		return s; /* Plaintext line. */
 
-	    cp += (i = strlen (cp)) - 1;
-	    if (i <= 1 || *cp-- != '\n' || *cp != '\\')
+	    len = strlen(cp);
+	    if (len <= 1)
+		break; /* Can't contain "\\\n". */
+	    cp += len - 1; /* Just before NUL. */
+	    if (*cp-- != '\n' || *cp != '\\')
 		break;
-	    *cp = '\0';
-	    n -= (i - 2);
+	    *cp = '\0'; /* Erase the trailing "\\\n". */
+	    n -= (len - 2);
 	}
 
 	if (strcmp(s, "#on\n") == 0) {
@@ -639,11 +641,9 @@ fgetstr (char *s, int n, FILE *stream)
 	} else if (strcmp(s, "#pop\n") == 0) {
 	    directive_pop();
 	} else {
-	    break;
+	    return s;
 	}
     }
-
-    return s;
 }
 
 
@@ -704,16 +704,15 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename)
 	}
 
 	/* use a temp file to collect the plain text lines */
-	ce->ce_file = add (cp, NULL);
+	ce->ce_file = mh_xstrdup(cp);
 	ce->ce_unlink = 1;
 
 	if (do_direct() && (buf[0] == '#' && buf[1] == '<')) {
 	    strncpy (content, buf + 2, sizeof(content));
 	    inlineD = 1;
 	    goto rock_and_roll;
-	} else {
-	    inlineD = 0;
 	}
+        inlineD = 0;
 
 	/* the directive is implicit */
 	strncpy (content, "text/plain", sizeof(content));
@@ -810,7 +809,7 @@ rock_and_roll:
 		ct->c_encoding = CE_7BIT;
 		goto call_init;
 	    }
-	    /* else fall... */
+	    /* FALLTHRU */
 	case CT_MULTIPART:
 	    adios (NULL, "it doesn't make sense to define an in-line %s content",
 		   ct->c_type == CT_MESSAGE ? "message" : "multipart");
@@ -932,7 +931,7 @@ use_forw:
 		    continue;
 		if (!*cp)
 		    adios (NULL, "empty pipe command for #%s directive", ci->ci_type);
-		cp = add (cp, NULL);
+		cp = mh_xstrdup(cp);
 		free (ci->ci_magic);
 		ci->ci_magic = cp;
 	    } else {
@@ -956,7 +955,7 @@ use_forw:
 	    content_error (NULL, ct, "don't know how to compose content");
 	    done (1);
 	}
-	ci->ci_magic = add (cp, NULL);
+	ci->ci_magic = mh_xstrdup(cp);
 	return OK;
     }
 
@@ -994,7 +993,7 @@ use_forw:
 
 	/* else, use the current folder */
 	if (!folder)
-	    folder = add (getfolder (1), NULL);
+	    folder = mh_xstrdup(getfolder(1));
 
 	if (!(mp = folder_read (folder, 0)))
 	    adios (NULL, "unable to read folder %s", folder);
@@ -1039,7 +1038,7 @@ use_forw:
 		    p->c_subtype = MESSAGE_RFC822;
 
 		    snprintf (buffer, sizeof(buffer), "%s/%d", mp->foldpath, msgnum);
-		    pe->ce_file = add (buffer, NULL);
+		    pe->ce_file = mh_xstrdup(buffer);
 		    if (listsw && stat (pe->ce_file, &st) != NOTOK)
 			p->c_end = (long) st.st_size;
 
@@ -1058,7 +1057,7 @@ use_forw:
 
 	    msgnum = mp->lowsel;
 	    snprintf (buffer, sizeof(buffer), "%s/%d", mp->foldpath, msgnum);
-	    ce->ce_file = add (buffer, NULL);
+	    ce->ce_file = mh_xstrdup(buffer);
 	    if (listsw && stat (ce->ce_file, &st) != NOTOK)
 		ct->c_end = (long) st.st_size;
 	}
@@ -1124,7 +1123,7 @@ use_forw:
 	    pp = &part->mp_next;
 	    part->mp_part = p;
 	}
-	admonish (NULL, "premature end-of-file, missing #end");
+	inform("premature end-of-file, missing #end, continuing...");
 	return OK;
     }
 
@@ -1187,7 +1186,7 @@ compose_content (CT ct, int verbose)
 	    CT p = part->mp_part;
 
 	    sprintf (pp, "%d", partnum);
-	    p->c_partno = add (partnam, NULL);
+	    p->c_partno = mh_xstrdup(partnam);
 	    if (compose_content (p, verbose) == NOTOK)
 		return NOTOK;
 	}
@@ -1253,7 +1252,7 @@ compose_content (CT ct, int verbose)
 		adios("mhbuildsbr", "unable to create temporary file in %s",
 		      get_temp_dir());
 	    }
-	    ce->ce_file = add (tfile, NULL);
+	    ce->ce_file = mh_xstrdup(tfile);
 	    ce->ce_unlink = 1;
 
 	    xstdout = 0;
@@ -1289,7 +1288,7 @@ compose_content (CT ct, int verbose)
 		    case 'F':
 			/* %f, and stdout is not-redirected */
 			xstdout = 1;
-			/* and fall... */
+			/* FALLTHRU */
 
 		    case 'f':
 			/*
@@ -1680,7 +1679,7 @@ build_headers (CT ct, int header_encoding)
     /*
      * output the content type and subtype
      */
-    np = add (TYPE_FIELD, NULL);
+    np = mh_xstrdup(TYPE_FIELD);
     vp = concat (" ", ci->ci_type, "/", ci->ci_subtype, NULL);
 
     /* keep track of length of line */
@@ -1726,10 +1725,12 @@ build_headers (CT ct, int header_encoding)
     add_header (ct, np, vp);
 
     /*
-     * output the Content-ID, unless disabled by -nocontentid
+     * output the Content-ID, unless disabled by -nocontentid.  Note that
+     * RFC 2045 always requires a Content-ID header for message/external-body
+     * entities.
      */
-    if (contentidsw && ct->c_id) {
-	np = add (ID_FIELD, NULL);
+    if ((contentidsw || ct->c_ctexbody) && ct->c_id) {
+	np = mh_xstrdup(ID_FIELD);
 	vp = concat (" ", ct->c_id, NULL);
 	add_header (ct, np, vp);
     }
@@ -1737,7 +1738,7 @@ build_headers (CT ct, int header_encoding)
      * output the Content-Description
      */
     if (ct->c_descr) {
-	np = add (DESCR_FIELD, NULL);
+	np = mh_xstrdup(DESCR_FIELD);
 	vp = concat (" ", ct->c_descr, NULL);
 	if (header_encoding != CE_8BIT) {
 	    if (encode_rfc2047(DESCR_FIELD, &vp, header_encoding, NULL)) {
@@ -1752,7 +1753,7 @@ build_headers (CT ct, int header_encoding)
      * set, then we need to build it.
      */
     if (ct->c_dispo) {
-	np = add (DISPO_FIELD, NULL);
+	np = mh_xstrdup(DISPO_FIELD);
 	vp = concat (" ", ct->c_dispo, NULL);
 	add_header (ct, np, vp);
     } else if (ct->c_dispo_type) {
@@ -1761,8 +1762,7 @@ build_headers (CT ct, int header_encoding)
 	np = output_params(len, ct->c_dispo_first, NULL, 0);
 	vp = add(np, vp);
 	vp = add("\n", vp);
-	if (np)
-	    free(np);
+        mh_xfree(np);
 	add_header (ct, mh_xstrdup(DISPO_FIELD), vp);
     }
 
@@ -1779,7 +1779,7 @@ skip_headers:
      * output the Content-MD5
      */
     if (checksw) {
-	np = add (MD5_FIELD, NULL);
+	np = mh_xstrdup(MD5_FIELD);
 	vp = calculate_digest (ct, (ct->c_encoding == CE_QUOTED) ? 1 : 0);
 	add_header (ct, np, vp);
     }
@@ -1798,7 +1798,7 @@ skip_headers:
 	break;
 
     case CE_8BIT:
-	np = add (ENCODING_FIELD, NULL);
+	np = mh_xstrdup(ENCODING_FIELD);
 	vp = concat (" ", "8bit", "\n", NULL);
 	add_header (ct, np, vp);
 	break;
@@ -1807,7 +1807,7 @@ skip_headers:
 	if (ct->c_type == CT_MESSAGE || ct->c_type == CT_MULTIPART)
 	    adios (NULL, "internal error, invalid encoding");
 
-	np = add (ENCODING_FIELD, NULL);
+	np = mh_xstrdup(ENCODING_FIELD);
 	vp = concat (" ", "quoted-printable", "\n", NULL);
 	add_header (ct, np, vp);
 	break;
@@ -1816,7 +1816,7 @@ skip_headers:
 	if (ct->c_type == CT_MESSAGE || ct->c_type == CT_MULTIPART)
 	    adios (NULL, "internal error, invalid encoding");
 
-	np = add (ENCODING_FIELD, NULL);
+	np = mh_xstrdup(ENCODING_FIELD);
 	vp = concat (" ", "base64", "\n", NULL);
 	add_header (ct, np, vp);
 	break;
@@ -1825,7 +1825,7 @@ skip_headers:
 	if (ct->c_type == CT_MESSAGE)
 	    adios (NULL, "internal error, invalid encoding");
 
-	np = add (ENCODING_FIELD, NULL);
+	np = mh_xstrdup(ENCODING_FIELD);
 	vp = concat (" ", "binary", "\n", NULL);
 	add_header (ct, np, vp);
 	break;
@@ -2017,7 +2017,7 @@ setup_attach_content(CT ct, char *filename)
 	if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0)
 	    adios(NULL, "external-body messages must be specified "
 		"by mhbuild directives");
-	/* Fall through */
+	/* FALLTHRU */
 
     default:
 	/*
@@ -2035,8 +2035,7 @@ setup_attach_content(CT ct, char *filename)
 
     for (pm = ct->c_ctinfo.ci_first_pm; pm; pm = pm->pm_next) {
 	if (strcasecmp(pm->pm_name, "name") == 0) {
-	    if (pm->pm_value)
-		free(pm->pm_value);
+            mh_xfree(pm->pm_value);
 	    pm->pm_value = mh_xstrdup(simplename);
 	    break;
 	}
@@ -2070,13 +2069,13 @@ set_disposition (CT ct) {
 
         if (cp  &&  strcasecmp (cp, "attachment")  &&
             strcasecmp (cp, "inline")) {
-            admonish (NULL, "configuration problem: %s-disposition-%s%s%s "
-                      "specifies '%s' but only 'attachment' and 'inline' are "
-                      "allowed", invo_name,
-                      ct->c_ctinfo.ci_type,
-                      ct->c_ctinfo.ci_subtype ? "/" : "",
-                      ct->c_ctinfo.ci_subtype ? ct->c_ctinfo.ci_subtype : "",
-                      cp);
+            inform("configuration problem: %s-disposition-%s%s%s specifies "
+		"'%s' but only 'attachment' and 'inline' are allowed, "
+		"continuing...", invo_name,
+		ct->c_ctinfo.ci_type,
+		ct->c_ctinfo.ci_subtype ? "/" : "",
+		ct->c_ctinfo.ci_subtype ? ct->c_ctinfo.ci_subtype : "",
+		cp);
         }
 
         if (!cp)
@@ -2249,7 +2248,7 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
 
     if ((status = show_content_aux (ct, 0, convert_command, NULL, NULL)) !=
         OK) {
-        admonish (NULL, "store of %s content failed", type);
+        inform("store of %s content failed, continuing...", type);
     }
     free (convert_command);
 
@@ -2259,9 +2258,8 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
 
     if (extract_headers (reply_ct, reply_file, &reply_fp) == NOTOK) {
         free (reply_file);
-        admonish (NULL,
-                  "failed to extract headers from convert output in %s",
-                  reply_file);
+        inform("failed to extract headers from convert output in %s, "
+	    "continuing...", reply_file);
         return;
     }
 
@@ -2272,11 +2270,10 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
         if ((fd = open (reply_file, O_RDONLY)) == NOTOK  ||
             scan_input (fd, &eightbit) == NOTOK) {
             free (reply_file);
-            admonish (NULL, "failed to read %s", reply_file);
+            inform("failed to read %s, continuing...", reply_file);
             return;
-        } else {
-            (void) close (fd);
-        }
+        } 
+        (void) close (fd);
     }
 
     /* This sets reply_ct->c_ctparams, and reply_ct->c_termproc if the
@@ -2442,7 +2439,7 @@ extract_headers (CT ct, char *reply_file, FILE **reply_fp) {
         n = strlen (buffer);
 
         if (get_ctinfo (buffer + 14, ct, 0) != OK) {
-            admonish (NULL, "unable to get content info for reply");
+            inform("unable to get content info for reply, continuing...");
             goto failed_to_extract_ct;
         }