X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b28c59528986bca109750b6f683263bd5ffd19d5..665dfc96:/uip/mhbuildsbr.c?ds=inline

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 9b733e85..b5d88a3f 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * mhbuildsbr.c -- routines to expand/translate MIME composition files
+/* 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
@@ -54,12 +52,6 @@ typedef struct convert_list {
     struct convert_list *next;
 } convert_list;
 
-/*
- * Maximum size of URL token in message/external-body
- */
-
-#define MAXURLTOKEN 40
-
 
 /* mhmisc.c */
 void content_error (char *, CT, char *, ...);
@@ -139,7 +131,7 @@ build_mime (char *infile, int autobuild, int dist, int directives,
 	    int header_encoding, size_t maxunencoded, int verbose)
 {
     int	compnum, state;
-    char buf[BUFSIZ], name[NAMESZ];
+    char buf[NMH_BUFSIZ], name[NAMESZ];
     char *cp, *np, *vp;
     struct multipart *m;
     struct part **pp;
@@ -383,7 +375,7 @@ finish_field:
     }
 
     /*
-     * We initally assume we will find multiple contents in the
+     * We initially 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.
      */
@@ -405,7 +397,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)
@@ -1123,7 +1115,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;
     }
 
@@ -1220,7 +1212,7 @@ compose_content (CT ct, int verbose)
 	if (listsw) {
 	    ct->c_end = (partnum = strlen (prefix) + 2) + 2;
 	    if (ct->c_rfc934)
-		ct->c_end += 1;
+		ct->c_end++;
 
 	    for (part = m->mp_parts; part; part = part->mp_next)
 		ct->c_end += part->mp_part->c_end + partnum;
@@ -1780,7 +1772,7 @@ skip_headers:
      */
     if (checksw) {
 	np = mh_xstrdup(MD5_FIELD);
-	vp = calculate_digest (ct, (ct->c_encoding == CE_QUOTED) ? 1 : 0);
+        vp = calculate_digest (ct, ct->c_encoding == CE_QUOTED);
 	add_header (ct, np, vp);
     }
 
@@ -1985,7 +1977,7 @@ setup_attach_content(CT ct, char *filename)
 
     /*
      * Parse the Content-Type.  get_ctinfo() parses MIME parameters, but
-     * since we're just feeding it a MIME type we have to add those ourself.
+     * since we're just feeding it a MIME type we have to add those ourselves.
      * Map that to a valid content-type label and call any initialization
      * function.
      */
@@ -2069,13 +2061,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 ? "/" : "",
+		FENDNULL(ct->c_ctinfo.ci_subtype),
+		cp);
         }
 
         if (!cp)
@@ -2086,7 +2078,7 @@ set_disposition (CT ct) {
 
 /*
  * Set text content charset if it was unspecified.  contains8bit
- * selctions:
+ * selections:
  * 0: content does not contain 8-bit characters
  * 1: content contains 8-bit characters
  * -1: ignore content and use user's locale to determine charset
@@ -2239,7 +2231,7 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
     /* reply_file is used to pass the output of the convert. */
     reply_file = getcpy (m_mktemp2 (NULL, invo_name, NULL, NULL));
     convert_command =
-        concat (convert, " ", argstring ? argstring : "", " >", reply_file,
+        concat (convert, " ", FENDNULL(argstring), " >", reply_file,
                 NULL);
 
     /* Convert here . . . */
@@ -2248,7 +2240,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);
 
@@ -2258,9 +2250,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;
     }
 
@@ -2271,7 +2262,7 @@ 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;
         } 
         (void) close (fd);
@@ -2440,7 +2431,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;
         }