X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/90edb255effd0d29d94e662ca5bf3e9eda7ed122..5ed8cd671b27e1388c0c7e881805775a8e5b353a:/uip/mhparse.c?ds=inline

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 69ed3bd4..bab4e5b6 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -1,6 +1,4 @@
-
-/*
- * mhparse.c -- routines to parse the contents of MIME messages
+/* mhparse.c -- routines to parse the contents of MIME messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -15,6 +13,9 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <h/mhcachesbr.h>
+#include "../sbr/m_mktemp.h"
+#include "mhfree.h"
 #ifdef HAVE_ICONV
 # include <iconv.h>
 #endif /* HAVE_ICONV */
@@ -22,10 +23,6 @@
 
 extern int debugsw;
 
-/* cache policies */
-extern int rcachesw;	/* mhcachesbr.c */
-extern int wcachesw;	/* mhcachesbr.c */
-
 int checksw = 0;	/* check Content-MD5 field */
 
 /*
@@ -34,13 +31,16 @@ int checksw = 0;	/* check Content-MD5 field */
  *    in a multipart.
  * 2) Suppress the warning about bogus multipart content, and report it.
  * 3) Suppress the warning about extraneous trailing ';' in header parameter
- *    lists, and report it.
+ *    lists.
  */
 int skip_mp_cte_check;
 int suppress_bogus_mp_content_warning;
 int bogus_mp_content;
 int suppress_extraneous_trailing_semicolon_warning;
-int extraneous_trailing_semicolon;
+
+/*
+ * By default, suppress warning about multiple MIME-Version header fields.
+ */
 int suppress_multiple_mime_version_warning = 1;
 
 /* list of preferred type/subtype pairs, for -prefer */
@@ -54,8 +54,8 @@ int npreferred;
  */
 struct k2v SubText[] = {
     { "plain",    TEXT_PLAIN },
-    { "richtext", TEXT_RICHTEXT },  /* defined in RFC-1341    */
-    { "enriched", TEXT_ENRICHED },  /* defined in RFC-1896    */
+    { "richtext", TEXT_RICHTEXT },  /* defined in RFC 1341    */
+    { "enriched", TEXT_ENRICHED },  /* defined in RFC 1896    */
     { NULL,       TEXT_UNKNOWN }    /* this one must be last! */
 };
 
@@ -106,17 +106,11 @@ static struct k2v EncodingType[] = {
 };
 
 
-/* mhcachesbr.c */
-int find_cache (CT, int, int *, char *, char *, int);
-
 /* mhmisc.c */
 int part_ok (CT);
 int type_ok (CT, int);
 void content_error (char *, CT, char *, ...);
 
-/* mhfree.c */
-void free_encoding (CT, int);
-
 /*
  * static prototypes
  */
@@ -206,6 +200,9 @@ parse_mime (char *file)
     FILE *fp;
     CT ct;
     size_t n;
+    struct stat statbuf;
+
+    bogus_mp_content = 0;
 
     /*
      * Check if file is actually standard input
@@ -217,7 +214,7 @@ parse_mime (char *file)
 		   get_temp_dir());
             return NULL;
         }
-	file = add (tfile, NULL);
+	file = mh_xstrdup(tfile);
 
 	while ((n = fread(buffer, 1, sizeof(buffer), stdin)) > 0) {
 	    if (fwrite(buffer, 1, n, fp) != n) {
@@ -239,6 +236,13 @@ parse_mime (char *file)
 	    return NULL;
 	}
 	fseek (fp, 0L, SEEK_SET);
+    } else if (stat (file, &statbuf) == NOTOK) {
+	advise (file, "unable to stat");
+	return NULL;
+    } else if (S_ISDIR(statbuf.st_mode)) {
+	/* Don't try to parse a directory. */
+	inform("%s is a directory", file);
+	return NULL;
     } else if ((fp = fopen (file, "r")) == NULL) {
 	advise (file, "unable to read");
 	return NULL;
@@ -247,7 +251,7 @@ parse_mime (char *file)
     if (!(ct = get_content (fp, file, 1))) {
 	if (is_stdin)
 	    (void) m_unlink (file);
-	advise (NULL, "unable to decode %s", file);
+	inform("unable to decode %s", file);
 	return NULL;
     }
 
@@ -287,7 +291,7 @@ static CT
 get_content (FILE *in, char *file, int toplevel)
 {
     int compnum, state;
-    char buf[BUFSIZ], name[NAMESZ];
+    char buf[NMH_BUFSIZ], name[NAMESZ];
     char *np, *vp;
     CT ct;
     HF hp;
@@ -312,8 +316,8 @@ get_content (FILE *in, char *file, int toplevel)
 	    compnum++;
 
 	    /* 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) {
@@ -330,7 +334,28 @@ get_content (FILE *in, char *file, int toplevel)
 	    continue;
 
 	case BODY:
-	    ct->c_begin = ftell (in) - strlen (buf);
+            /* There are two cases.  The unusual one is when there is no
+             * blank line between the headers and the body.  This is
+             * indicated by the name of the header starting with `:'.
+             *
+             * For both cases, normal first, `1' is the desired c_begin
+             * file position for the start of the body, and `2' is the
+             * file position when buf is returned.
+             *
+             *     f o o :   b a r \n \n b o d y \n    bufsz = 6
+             *                          1          2   move -5
+             *     f o o :   b a r \n b o d y \n       bufsz = 4
+             *                       1       2         move -4
+             *
+             * For the normal case, bufsz includes the
+             * header-terminating `\n', even though it is not in buf,
+             * but bufsz isn't affected when it's missing in the unusual
+             * case. */
+	    if (name[0] == ':') {
+		ct->c_begin = ftell(in) - bufsz;
+	    } else {
+		ct->c_begin = ftell (in) - (bufsz - 1);
+	    }
 	    break;
 
 	case FILEEOF:
@@ -392,14 +417,14 @@ get_content (FILE *in, char *file, int toplevel)
 	    ucmp = !strcasecmp (cp, VRSN_VALUE);
 	    *dp = c;
 	    if (!ucmp) {
-		admonish (NULL, "message %s has unknown value for %s: field (%s)",
+		inform("message %s has unknown value for %s: field (%s), continuing...",
 		ct->c_file, VRSN_FIELD, cp);
 	    }
 	    if (!ct->c_vrsn) {
 		ct->c_vrsn = vrsn;
 	    } else {
 		if (! suppress_multiple_mime_version_warning)
-		    advise (NULL, "message %s has multiple %s: fields",
+		    inform("message %s has multiple %s: fields",
 			    ct->c_file, VRSN_FIELD);
 		free(vrsn);
 	    }
@@ -411,7 +436,7 @@ get_content (FILE *in, char *file, int toplevel)
 
 	    /* Check if we've already seen a Content-Type header */
 	    if (ct->c_ctline) {
-		advise (NULL, "message %s has multiple %s: fields",
+		inform("message %s has multiple %s: fields",
 			ct->c_file, TYPE_FIELD);
 		goto next_header;
 	    }
@@ -442,7 +467,7 @@ get_content (FILE *in, char *file, int toplevel)
 	     * Content-Transfer-Encoding field
 	     */
 	    if (ct->c_celine) {
-		advise (NULL, "message %s has multiple %s: fields",
+		inform("message %s has multiple %s: fields",
 			ct->c_file, ENCODING_FIELD);
 		goto next_header;
 	    }
@@ -481,7 +506,7 @@ get_content (FILE *in, char *file, int toplevel)
 		goto next_header;
 
 	    if (ct->c_digested) {
-		advise (NULL, "message %s has multiple %s: fields",
+		inform("message %s has multiple %s: fields",
 			ct->c_file, MD5_FIELD);
 		goto next_header;
 	    }
@@ -640,20 +665,18 @@ get_ctinfo (char *cp, CT ct, int magic)
 
     for (dp = cp; istoken (*dp); dp++)
 	continue;
-    c = *dp, *dp = '\0';
-    ci->ci_type = add (cp, NULL);	/* store content type */
-    *dp = c, cp = dp;
+    c = *dp;
+    *dp = '\0';
+    ci->ci_type = mh_xstrdup(cp);	/* store content type */
+    *dp = c;
+    cp = dp;
 
     if (!*ci->ci_type) {
-	advise (NULL, "invalid %s: field in message %s (empty type)",
+	inform("invalid %s: field in message %s (empty type)",
 		TYPE_FIELD, ct->c_file);
 	return NOTOK;
     }
-
-    /* down case the content type string */
-    for (dp = ci->ci_type; *dp; dp++)
-	if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
-	    *dp = tolower ((unsigned char) *dp);
+    to_lower(ci->ci_type);
 
     while (isspace ((unsigned char) *cp))
 	cp++;
@@ -664,7 +687,7 @@ get_ctinfo (char *cp, CT ct, int magic)
 
     if (*cp != '/') {
 	if (!magic)
-	    ci->ci_subtype = add ("", NULL);
+	    ci->ci_subtype = mh_xstrdup("");
 	goto magic_skip;
     }
 
@@ -678,21 +701,18 @@ get_ctinfo (char *cp, CT ct, int magic)
 
     for (dp = cp; istoken (*dp); dp++)
 	continue;
-    c = *dp, *dp = '\0';
-    ci->ci_subtype = add (cp, NULL);	/* store the content subtype */
-    *dp = c, cp = dp;
+    c = *dp;
+    *dp = '\0';
+    ci->ci_subtype = mh_xstrdup(cp);	/* store the content subtype */
+    *dp = c;
+    cp = dp;
 
     if (!*ci->ci_subtype) {
-	advise (NULL,
-		"invalid %s: field in message %s (empty subtype for \"%s\")",
-		TYPE_FIELD, ct->c_file, ci->ci_type);
+	inform("invalid %s: field in message %s (empty subtype for \"%s\")",
+            TYPE_FIELD, ct->c_file, ci->ci_type);
 	return NOTOK;
     }
-
-    /* down case the content subtype string */
-    for (dp = ci->ci_subtype; *dp; dp++)
-	if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
-	    *dp = tolower ((unsigned char) *dp);
+    to_lower(ci->ci_subtype);
 
 magic_skip:
     while (isspace ((unsigned char) *cp))
@@ -712,12 +732,10 @@ magic_skip:
      * Get any <Content-Id> given in buffer
      */
     if (magic && *cp == '<') {
-	if (ct->c_id) {
-	    free (ct->c_id);
-	    ct->c_id = NULL;
-	}
+        mh_xfree(ct->c_id);
+        ct->c_id = NULL;
 	if (!(dp = strchr(ct->c_id = ++cp, '>'))) {
-	    advise (NULL, "invalid ID in message %s", ct->c_file);
+	    inform("invalid ID in message %s", ct->c_file);
 	    return NOTOK;
 	}
 	c = *dp;
@@ -742,7 +760,7 @@ magic_skip:
 	    if (*dp == ']')
 		break;
 	if (dp < cp) {
-	    advise (NULL, "invalid description in message %s", ct->c_file);
+	    inform("invalid description in message %s", ct->c_file);
 	    ct->c_descr = NULL;
 	    return NOTOK;
 	}
@@ -769,7 +787,7 @@ magic_skip:
 	    if (*dp == '}')
 		break;
 	if (dp < cp) {
-	    advise (NULL, "invalid disposition in message %s", ct->c_file);
+	    inform("invalid disposition in message %s", ct->c_file);
 	    ct->c_dispo = NULL;
 	    return NOTOK;
 	}
@@ -803,7 +821,7 @@ magic_skip:
 	    cp++;
 
 	if (dp == cp) {
-	    advise (NULL, "invalid null transfer encoding specification");
+	    inform("invalid null transfer encoding specification");
 	    return NOTOK;
 	}
 
@@ -820,7 +838,7 @@ magic_skip:
 	}
 
 	if (ct->c_reqencoding == CE_UNKNOWN) {
-	    advise (NULL, "invalid CTE specification: \"%s\"", dp);
+	    inform("invalid CTE specification: \"%s\"", dp);
 	    return NOTOK;
 	}
 
@@ -833,7 +851,7 @@ magic_skip:
      */
     if (*cp) {
         if (magic) {
-	    ci->ci_magic = add (cp, NULL);
+	    ci->ci_magic = mh_xstrdup(cp);
 
             /* If there is a Content-Disposition header and it doesn't
                have a *filename=, extract it from the magic contents.
@@ -846,9 +864,8 @@ magic_skip:
 	    }
         }
 	else
-	    advise (NULL,
-		    "extraneous information in message %s's %s: field\n%*s(%s)",
-                    ct->c_file, TYPE_FIELD, strlen(invo_name) + 2, "", cp);
+	    inform("extraneous information in message %s's %s: field\n%*s(%s)",
+                ct->c_file, TYPE_FIELD, strlen(invo_name) + 2, "", cp);
     }
 
     return OK;
@@ -899,9 +916,11 @@ get_dispo (char *cp, CT ct, int buildflag)
 
     for (dp = cp; istoken (*dp); dp++)
 	continue;
-    c = *dp, *dp = '\0';
-    ct->c_dispo_type = add (cp, NULL);	/* store disposition type */
-    *dp = c, cp = dp;
+    c = *dp;
+    *dp = '\0';
+    ct->c_dispo_type = mh_xstrdup(cp);	/* store disposition type */
+    *dp = c;
+    cp = dp;
 
     if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) == NOTOK)
 	return NOTOK;
@@ -914,9 +933,8 @@ get_dispo (char *cp, CT ct, int buildflag)
 	    return NOTOK;
 	}
     } else if (*cp) {
-	advise (NULL,
-		"extraneous information in message %s's %s: field\n%*s(%s)",
-                    ct->c_file, DISPO_FIELD, strlen(invo_name) + 2, "", cp);
+	inform("extraneous information in message %s's %s: field\n%*s(%s)",
+            ct->c_file, DISPO_FIELD, strlen(invo_name) + 2, "", cp);
     }
 
     if (buildflag)
@@ -944,7 +962,7 @@ get_comment (const char *filename, const char *fieldname, char **ap,
 	switch (c = *cp++) {
 	case '\0':
 invalid:
-	advise (NULL, "invalid comment in message %s's %s: field",
+	inform("invalid comment in message %s's %s: field",
 		filename, fieldname);
 	return NOTOK;
 
@@ -957,7 +975,7 @@ invalid:
 
 	case '(':
 	    i++;
-	    /* and fall... */
+	    /* FALLTHRU */
 	default:
 	    *bp++ = c;
 	    continue;
@@ -977,7 +995,7 @@ invalid:
 	    *commentp = concat (dp, " ", buffer, NULL);
 	    free (dp);
 	} else {
-	    *commentp = add (buffer, NULL);
+	    *commentp = mh_xstrdup(buffer);
 	}
     }
 
@@ -1083,25 +1101,24 @@ InitMultiPart (CT ct)
 
     /*
      * The encoding for multipart messages must be either
-     * 7bit, 8bit, or binary (per RFC2045).
+     * 7bit, 8bit, or binary (per RFC 2045).
      */
     if (! skip_mp_cte_check  &&  ct->c_encoding != CE_7BIT  &&
         ct->c_encoding != CE_8BIT  &&  ct->c_encoding != CE_BINARY) {
 	/* Copy the Content-Transfer-Encoding header field body so we can
 	   remove any trailing whitespace and leading blanks from it. */
-	char *cte = add (ct->c_celine ? ct->c_celine : "(null)", NULL);
+	char *cte = mh_xstrdup(ct->c_celine ? ct->c_celine : "(null)");
 
 	bp = cte + strlen (cte) - 1;
 	while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';
 	for (bp = cte; *bp && isblank ((unsigned char) *bp); ++bp) continue;
 
-	admonish (NULL,
-		  "\"%s/%s\" type in message %s must be encoded in\n"
-		  "7bit, 8bit, or binary, per RFC 2045 (6.4).  "
-                  "mhfixmsg -fixcte can fix it, or\n"
-                  "manually edit the file and change the \"%s\"\n"
-		  "Content-Transfer-Encoding to one of those.  For now",
-		  ci->ci_type, ci->ci_subtype, ct->c_file, bp);
+	inform("\"%s/%s\" type in message %s must be encoded in\n"
+	    "7bit, 8bit, or binary, per RFC 2045 (6.4).  "
+	    "mhfixmsg -fixcte can fix it, or\n"
+	    "manually edit the file and change the \"%s\"\n"
+	    "Content-Transfer-Encoding to one of those.  For now, continuing...",
+	    ci->ci_type, ci->ci_subtype, ct->c_file, bp);
 	free (cte);
 
 	return NOTOK;
@@ -1124,9 +1141,8 @@ InitMultiPart (CT ct)
 
     /* complain if boundary parameter is missing */
     if (!pm) {
-	advise (NULL,
-		"a \"boundary\" parameter is mandatory for \"%s/%s\" type in message %s's %s: field",
-		ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
+	inform("a \"boundary\" parameter is mandatory for \"%s/%s\" type in message %s's %s: field",
+            ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
 	return NOTOK;
     }
 
@@ -1138,7 +1154,7 @@ InitMultiPart (CT ct)
     for (cp = bp; isspace ((unsigned char) *cp); cp++)
 	continue;
     if (!*cp) {
-	advise (NULL, "invalid \"boundary\" parameter for \"%s/%s\" type in message %s's %s: field",
+	inform("invalid \"boundary\" parameter for \"%s/%s\" type in message %s's %s: field",
 		ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
 	return NOTOK;
     }
@@ -1201,15 +1217,14 @@ end_part:
 		if (inout)
 		    goto next_part;
 		goto last_part;
-	    } else {
-		if (strcmp (bufp + 2, m->mp_stop) == 0)
-		    goto end_part;
 	    }
+            if (strcmp (bufp + 2, m->mp_stop) == 0)
+                goto end_part;
 	}
     }
 
     if (! suppress_bogus_mp_content_warning) {
-        advise (NULL, "bogus multipart content in message %s", ct->c_file);
+        inform("bogus multipart content in message %s", ct->c_file);
     }
     bogus_mp_content = 1;
 
@@ -1223,7 +1238,7 @@ end_part:
 		continue;
 	    *next = NULL;
 	    free_content (p);
-	    free ((char *) part);
+	    free(part);
 	}
     }
 
@@ -1255,7 +1270,7 @@ last_part:
 	    p = part->mp_part;
 
 	    sprintf (pp, "%d", partnum);
-	    p->c_partno = add (partnam, NULL);
+	    p->c_partno = mh_xstrdup(partnam);
 
 	    /* initialize the content of the subparts */
 	    if (p->c_ctinitfnx && (*p->c_ctinitfnx) (p) == NOTOK) {
@@ -1283,7 +1298,7 @@ last_part:
  * ease of choosing/displaying it later on.  from a mail message on
  * nmh-workers, from kenh:
  *  "Stock" MH 6.8.5 did not have a reverse_parts() function, but I
- *  see code in mhn that did the same thing...  Acccording to the RCS
+ *  see code in mhn that did the same thing...  According to the RCS
  *  logs, that code was around from the initial checkin of mhn.c by
  *  John Romine in 1992, which is as far back as we have."
  */
@@ -1392,9 +1407,9 @@ InitMessage (CT ct)
     CI ci = &ct->c_ctinfo;
 
     if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT)) {
-	admonish (NULL,
-		  "\"%s/%s\" type in message %s should be encoded in 7bit or 8bit",
-		  ci->ci_type, ci->ci_subtype, ct->c_file);
+	inform("\"%s/%s\" type in message %s should be encoded in "
+	    "7bit or 8bit, continuing...", ci->ci_type, ci->ci_subtype,
+	    ct->c_file);
 	return NOTOK;
     }
 
@@ -1427,10 +1442,9 @@ InitMessage (CT ct)
 			if (sscanf (pm->pm_value, "%d", &p->pm_partno) != 1
 			        || p->pm_partno < 1) {
 invalid_param:
-			    advise (NULL,
-				    "invalid %s parameter for \"%s/%s\" type in message %s's %s field",
-				    pm->pm_name, ci->ci_type, ci->ci_subtype,
-				    ct->c_file, TYPE_FIELD);
+			    inform("invalid %s parameter for \"%s/%s\" type in message %s's %s field",
+                                pm->pm_name, ci->ci_type, ci->ci_subtype,
+                                ct->c_file, TYPE_FIELD);
 			    return NOTOK;
 			}
 			continue;
@@ -1446,10 +1460,8 @@ invalid_param:
 		if (!p->pm_partid
 		        || !p->pm_partno
 		        || (p->pm_maxno && p->pm_partno > p->pm_maxno)) {
-		    advise (NULL,
-			    "invalid parameters for \"%s/%s\" type in message %s's %s field",
-			    ci->ci_type, ci->ci_subtype,
-			    ct->c_file, TYPE_FIELD);
+		    inform("invalid parameters for \"%s/%s\" type in message %s's %s field",
+                        ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
 		    return NOTOK;
 		}
 	    }
@@ -1529,7 +1541,7 @@ no_body:
 		    case CT_MESSAGE:
 			if (p->c_subtype != MESSAGE_RFC822)
 			    break;
-			/* else fall... */
+			/* FALLTHRU */
 		    default:
 			e->eb_partno = ct->c_partno;
 			if (p->c_ctinitfnx)
@@ -1634,9 +1646,8 @@ params_external (CT ct, int composing)
     }
 
     if (!e->eb_access) {
-	advise (NULL,
-		"invalid parameters for \"%s/%s\" type in message %s's %s field",
-		ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
+	inform("invalid parameters for \"%s/%s\" type in message %s's %s field",
+            ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
 	return NOTOK;
     }
 
@@ -1702,8 +1713,7 @@ size_encoding (CT ct)
     if (ce->ce_file) {
 	if (stat (ce->ce_file, &st) != NOTOK)
 	    return (long) st.st_size;
-	else
-	    return 0L;
+        return 0L;
     }
 
     if (ct->c_encoding == CE_EXTERNAL)
@@ -1763,7 +1773,7 @@ openBase64 (CT ct, char **file)
     if (*file == NULL) {
 	ce->ce_unlink = 1;
     } else {
-	ce->ce_file = add (*file, NULL);
+	ce->ce_file = mh_xstrdup(*file);
 	ce->ce_unlink = 0;
     }
 
@@ -1785,7 +1795,7 @@ openBase64 (CT ct, char **file)
 	    adios(NULL, "unable to create temporary file in %s",
 		  get_temp_dir());
 	}
-	ce->ce_file = add (tempfile, NULL);
+	ce->ce_file = mh_xstrdup(tempfile);
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
@@ -1836,7 +1846,7 @@ openBase64 (CT ct, char **file)
         for (i = 0; i < decoded_len; ++i) {
             putc (*decoded_p++, ce->ce_fp);
         }
-        free ((char *) decoded);
+        free(decoded);
         if (ferror (ce->ce_fp)) {
             content_error (ce->ce_file, ct, "error writing to");
             goto clean_up;
@@ -1844,7 +1854,7 @@ openBase64 (CT ct, char **file)
 
         if (ct->c_digested) {
             if (memcmp(digest, ct->c_digest,
-                       sizeof(digest) / sizeof(digest[0]))) {
+                       sizeof digest)) {
                 content_error (NULL, ct,
                                "content integrity suspect (digest mismatch) -- continuing");
             } else {
@@ -1947,7 +1957,7 @@ openQuoted (CT ct, char **file)
     if (*file == NULL) {
 	ce->ce_unlink = 1;
     } else {
-	ce->ce_file = add (*file, NULL);
+	ce->ce_file = mh_xstrdup(*file);
 	ce->ce_unlink = 0;
     }
 
@@ -1969,7 +1979,7 @@ openQuoted (CT ct, char **file)
 	    adios(NULL, "unable to create temporary file in %s",
 		  get_temp_dir());
 	}
-	ce->ce_file = add (tempfile, NULL);
+	ce->ce_file = mh_xstrdup(tempfile);
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
@@ -2010,7 +2020,8 @@ openQuoted (CT ct, char **file)
 	for (ep = (cp = bufp) + cc - 1; cp <= ep; ep--)
 	    if (!isspace ((unsigned char) *ep))
 		break;
-	*++ep = '\n', ep++;
+        *++ep = '\n';
+        ep++;
 
 	for (; cp < ep; cp++) {
 	    if (quoted > 0) {
@@ -2056,11 +2067,10 @@ openQuoted (CT ct, char **file)
 		     * sequence; let's decode it (above). */
 		    quoted = 1;
 		    continue;
-		} else {
-		    /* One or both of the next 2 is out of range, making this
-		     * an invalid escape sequence; just show the raw bytes
-		     * (below). */
 		}
+                /* One or both of the next 2 is out of range, making this
+                 * an invalid escape sequence; just show the raw bytes
+                 * (below). */
 	    }
 
 	    /* Just show the raw byte. */
@@ -2096,7 +2106,7 @@ openQuoted (CT ct, char **file)
 
 	MD5Final (digest, &mdContext);
 	if (memcmp((char *) digest, (char *) ct->c_digest,
-		   sizeof(digest) / sizeof(digest[0])))
+		   sizeof digest))
 	    content_error (NULL, ct,
 			   "content integrity suspect (digest mismatch) -- continuing");
 	else
@@ -2167,7 +2177,7 @@ open7Bit (CT ct, char **file)
     if (*file == NULL) {
 	ce->ce_unlink = 1;
     } else {
-	ce->ce_file = add (*file, NULL);
+	ce->ce_file = mh_xstrdup(*file);
 	ce->ce_unlink = 0;
     }
 
@@ -2189,7 +2199,7 @@ open7Bit (CT ct, char **file)
 	    adios(NULL, "unable to create temporary file in %s",
 		  get_temp_dir());
 	}
-	ce->ce_file = add (tempfile, NULL);
+	ce->ce_file = mh_xstrdup(tempfile);
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
@@ -2325,9 +2335,8 @@ openExternal (CT ct, CT cb, CE ce, char **file, int *fd)
 	    ce->ce_file = mh_xstrdup(cachefile);
 	    ce->ce_unlink = 0;
 	    goto ready_already;
-	} else {
-	    admonish (cachefile, "unable to fopen for reading");
 	}
+        admonish (cachefile, "unable to fopen for reading");
     }
 
     *fd = fileno (ce->ce_fp);
@@ -2533,16 +2542,16 @@ openFTP (CT ct, char **file)
     }
 
     if (*file)
-	ce->ce_file = add (*file, NULL);
+	ce->ce_file = mh_xstrdup(*file);
     else if (caching)
-	ce->ce_file = add (cachefile, NULL);
+	ce->ce_file = mh_xstrdup(cachefile);
     else {
 	char *tempfile;
 	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
 	    adios(NULL, "unable to create temporary file in %s",
 		  get_temp_dir());
 	}
-	ce->ce_file = add (tempfile, NULL);
+	ce->ce_file = mh_xstrdup(tempfile);
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
@@ -2721,7 +2730,7 @@ openMail (CT ct, char **file)
 
 	default:
 	    if (pidXwait (child_id, NULL) == OK)
-		advise (NULL, "request sent");
+		inform("request sent");
 	    break;
     }
 
@@ -2731,10 +2740,10 @@ openMail (CT ct, char **file)
 	    adios(NULL, "unable to create temporary file in %s",
 		  get_temp_dir());
 	}
-	ce->ce_file = add (tempfile, NULL);
+	ce->ce_file = mh_xstrdup(tempfile);
 	ce->ce_unlink = 1;
     } else {
-	ce->ce_file = add (*file, NULL);
+	ce->ce_file = mh_xstrdup(*file);
 	ce->ce_unlink = 0;
     }
 
@@ -2745,9 +2754,8 @@ openMail (CT ct, char **file)
 
     /* showproc is for mhshow and mhstore, though mhlist -debug
      * prints it, too. */
-    if (ct->c_showproc)
-	free (ct->c_showproc);
-    ct->c_showproc = add ("true", NULL);
+    mh_xfree(ct->c_showproc);
+    ct->c_showproc = mh_xstrdup("true");
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
     *file = ce->ce_file;
@@ -2814,16 +2822,16 @@ openURL (CT ct, char **file)
     }
 
     if (*file)
-    	ce->ce_file = add(*file, NULL);
+        ce->ce_file = mh_xstrdup(*file);
     else if (caching)
-    	ce->ce_file = add(cachefile, NULL);
+        ce->ce_file = mh_xstrdup(cachefile);
     else {
 	char *tempfile;
 	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
 	    adios(NULL, "unable to create temporary file in %s",
 		  get_temp_dir());
 	}
-	ce->ce_file = add (tempfile, NULL);
+	ce->ce_file = mh_xstrdup(tempfile);
     }
 
     if ((ce->ce_fp = fopen(ce->ce_file, "w+")) == NULL) {
@@ -2903,7 +2911,7 @@ readDigest (CT ct, char *cp)
 
     size_t len;
     if (decodeBase64 (cp, &digest, &len, 0, NULL) == OK) {
-        const size_t maxlen = sizeof ct->c_digest / sizeof ct->c_digest[0];
+        const size_t maxlen = sizeof ct->c_digest;
 
         if (strlen ((char *) digest) <= maxlen) {
             memcpy (ct->c_digest, digest, maxlen);
@@ -2919,17 +2927,16 @@ readDigest (CT ct, char *cp)
             }
 
             return OK;
-        } else {
-            if (debugsw) {
-                fprintf (stderr, "invalid MD5 digest (got %d octets)\n",
-                         (int) strlen ((char *) digest));
-            }
-
-            return NOTOK;
         }
-    } else {
+        if (debugsw) {
+            fprintf (stderr, "invalid MD5 digest (got %d octets)\n",
+                     (int) strlen ((char *) digest));
+        }
+
         return NOTOK;
     }
+
+    return NOTOK;
 }
 
 
@@ -3284,27 +3291,22 @@ parse_header_attrs (const char *filename, const char *fieldname,
 
 	if (*cp == 0) {
 	    if (! suppress_extraneous_trailing_semicolon_warning) {
-		advise (NULL,
-			"extraneous trailing ';' in message %s's %s: "
-			"parameter list",
-			filename, fieldname);
+		inform("extraneous trailing ';' in message %s's %s: "
+                    "parameter list", filename, fieldname);
 	    }
-	    extraneous_trailing_semicolon = 1;
 	    return DONE;
 	}
 
 	/* down case the attribute name */
 	for (dp = cp; istoken ((unsigned char) *dp); dp++)
-	    if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
-		*dp = tolower ((unsigned char) *dp);
+            *dp = tolower ((unsigned char) *dp);
 
 	for (up = dp; isspace ((unsigned char) *dp);)
 	    dp++;
 	if (dp == cp || *dp != '=') {
-	    advise (NULL,
-		    "invalid parameter in message %s's %s: "
-                    "field\n%*sparameter %s (error detected at offset %d)",
-		    filename, fieldname, strlen(invo_name) + 2, "",cp, dp - cp);
+	    inform("invalid parameter in message %s's %s: "
+                "field\n%*sparameter %s (error detected at offset %d)",
+                filename, fieldname, strlen(invo_name) + 2, "",cp, dp - cp);
 	    return NOTOK;
 	}
 
@@ -3328,13 +3330,14 @@ parse_header_attrs (const char *filename, const char *fieldname,
 	    if (*vp == '*' && vp < up - 1) {
 		partial = 1;
 		continue;
-	    } else if (*vp == '*' && vp == up - 1) {
+	    }
+            if (*vp == '*' && vp == up - 1) {
 	    	encoded = 1;
 	    } else if (partial) {
 		if (isdigit((unsigned char) *vp))
 		    index = *vp - '0' + index * 10;
 		else {
-		    advise (NULL, "invalid parameter index in message %s's "
+		    inform("invalid parameter index in message %s's "
 			    "%s: field\n%*s(parameter %s)", filename,
 			    fieldname, strlen(invo_name) + 2, "", cp);
 		    return NOTOK;
@@ -3378,7 +3381,7 @@ parse_header_attrs (const char *filename, const char *fieldname,
 		    }
 		    vp++;
 		} else {
-		    advise(NULL, "missing charset in message %s's %s: "
+		    inform("missing charset in message %s's %s: "
 			   "field\n%*s(parameter %s)", filename, fieldname,
 			   strlen(invo_name) + 2, "", nameptr);
 		    free(nameptr);
@@ -3401,12 +3404,11 @@ parse_header_attrs (const char *filename, const char *fieldname,
 		    }
 		    vp++;
 		} else {
-		    advise(NULL, "missing language tag in message %s's %s: "
+		    inform("missing language tag in message %s's %s: "
 			   "field\n%*s(parameter %s)", filename, fieldname,
 			   strlen(invo_name) + 2, "", nameptr);
 		    free(nameptr);
-		    if (charset)
-			free(charset);
+                    mh_xfree(charset);
 		    return NOTOK;
 		}
 
@@ -3426,15 +3428,13 @@ parse_header_attrs (const char *filename, const char *fieldname,
 				!isxdigit((unsigned char) *(vp + 1)) ||
 				*(vp + 2) == '\0' ||
 				!isxdigit((unsigned char) *(vp + 2))) {
-			advise(NULL, "invalid encoded sequence in message "
+			inform("invalid encoded sequence in message "
 			       "%s's %s: field\n%*s(parameter %s)",
 			       filename, fieldname, strlen(invo_name) + 2,
 			       "", nameptr);
 			free(nameptr);
-			if (charset)
-			    free(charset);
-			if (lang)
-			    free(lang);
+                        mh_xfree(charset);
+                        mh_xfree(lang);
 			return NOTOK;
 		    }
 		    vp += 2;
@@ -3471,16 +3471,12 @@ parse_header_attrs (const char *filename, const char *fieldname,
 		    switch (*cp++) {
 		    case '\0':
 bad_quote:
-		        advise (NULL,
-				"invalid quoted-string in message %s's %s: "
-                                "field\n%*s(parameter %s)",
-				filename, fieldname, strlen(invo_name) + 2, "",
-				nameptr);
+		        inform("invalid quoted-string in message %s's %s: "
+                            "field\n%*s(parameter %s)", filename,
+                            fieldname, strlen(invo_name) + 2, "", nameptr);
 			free(nameptr);
-			if (charset)
-			    free(charset);
-			if (lang)
-			    free(lang);
+                        mh_xfree(charset);
+                        mh_xfree(lang);
 			return NOTOK;
 		    case '"':
 			break;
@@ -3488,7 +3484,7 @@ bad_quote:
 		    case '\\':
 			if (*++cp == '\0')
 			    goto bad_quote;
-			/* FALL THROUGH */
+			/* FALLTHRU */
 		    default:
 			len++;
 			continue;
@@ -3532,8 +3528,11 @@ bad_quote:
 
 	if (partial) {
 	    for (pp = phead; pp != NULL; pp = pp->next) {
-		if (strcasecmp(nameptr, pp->name) == 0)
+		if (strcasecmp(nameptr, pp->name) == 0) {
+                    free (nameptr);
+                    nameptr = pp->name;
 		    break;
+                }
 	    }
 
 	    if (pp == NULL) {
@@ -3558,11 +3557,10 @@ bad_quote:
 	    } else {
 		for (sp2 = pp->sechead; sp2 != NULL; sp2 = sp2->next) {
 		    if (sp2->index == sp->index) {
-			advise (NULL, "duplicate index (%d) in message "
+			inform("duplicate index (%d) in message "
 				"%s's %s: field\n%*s(parameter %s)", sp->index,
 				filename, fieldname, strlen(invo_name) + 2, "",
 				nameptr);
-			free (nameptr);
 			return NOTOK;
 		    }
 		    if (sp2->index < sp->index &&
@@ -3574,11 +3572,10 @@ bad_quote:
 		}
 
 		if (sp2 == NULL) {
-		    advise(NULL, "Internal error: cannot insert partial "
+		    inform("Internal error: cannot insert partial "
 		    	   "param in message %s's %s: field\n%*s(parameter %s)",
 			   filename, fieldname, strlen(invo_name) + 2, "",
 			   nameptr);
-		    free (nameptr);
 		    return NOTOK;
 		}
 	    }
@@ -3588,11 +3585,9 @@ bad_quote:
 	     */
 
 	    if (index == 0 && encoded) {
-		if (pp->charset)
-		    free(pp->charset);
+                mh_xfree(pp->charset);
 	    	pp->charset = charset;
-		if (pp->lang)
-		    free(pp->lang);
+                mh_xfree(pp->lang);
 		pp->lang = lang;
 	    }
 	} else {
@@ -3620,7 +3615,7 @@ bad_quote:
 	int pindex = 0;
 	for (sp = pp->sechead; sp != NULL; sp = sp->next) {
 	    if (sp->index != pindex++) {
-		advise(NULL, "missing section %d for parameter in "
+		inform("missing section %d for parameter in "
 		       "message %s's %s: field\n%*s(parameter %s)", pindex - 1,
 		       filename, fieldname, strlen(invo_name) + 2, "",
 		       pp->name);
@@ -3691,9 +3686,8 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 	    continue;
 
 	if (strlen(params->pm_name) > CPERLIN) {
-	    advise(NULL, "Parameter name \"%s\" is too long", params->pm_name);
-	    if (paramout)
-		free(paramout);
+	    inform("Parameter name \"%s\" is too long", params->pm_name);
+            mh_xfree(paramout);
 	    return NULL;
 	}
 
@@ -3730,8 +3724,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 				 numchars, valoff);
 
 	    if (i == 0) {
-		if (paramout)
-		    free(paramout);
+                mh_xfree(paramout);
 		return NULL;
 	    }
 
@@ -3774,7 +3767,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 	}
 
 	/*
-	 * At this point, we're either finishing a contined parameter, or
+	 * At this point, we're either finishing a continued parameter, or
 	 * we're working on a new one.
 	 */
 
@@ -3794,8 +3787,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 	    		     strlen(params->pm_value + valoff), valoff);
 
 	if (i == 0) {
-	    if (paramout)
-		free(paramout);
+            mh_xfree(paramout);
 	    return NULL;
 	}
 
@@ -3944,7 +3936,7 @@ param_len(PM pm, int index, size_t valueoff, int *encode, int *cont,
 	    case '\\':
 	    	len++;
 		maxfit--;
-	    /* FALL THROUGH */
+	    /* FALLTHRU */
 	    default:
 		len++;
 		maxfit--;
@@ -3998,7 +3990,7 @@ encode_param(PM pm, char *output, size_t len, size_t valuelen,
 	output += n;
 	outlen += n;
 	if (output > endptr) {
-	    advise(NULL, "Internal error: parameter buffer overflow");
+	    inform("Internal error: parameter buffer overflow");
 	    return 0;
 	}
     }
@@ -4018,7 +4010,7 @@ encode_param(PM pm, char *output, size_t len, size_t valuelen,
 	    outlen++;
 	}
 	if (output > endptr) {
-	    advise(NULL, "Internal error: parameter buffer overflow");
+	    inform("Internal error: parameter buffer overflow");
 	    return 0;
 	}
     }
@@ -4052,18 +4044,19 @@ normal_param(PM pm, char *output, size_t len, size_t valuelen,
 	case '"':
 	    *output++ = '\\';
 	    outlen++;
+	    /* FALLTHRU */
 	default:
 	    *output++ = *p++;
 	    outlen++;
 	}
 	if (output > endptr) {
-	    advise(NULL, "Internal error: parameter buffer overflow");
+	    inform("Internal error: parameter buffer overflow");
 	    return 0;
 	}
     }
 
     if (output - 2 > endptr) {
-	advise(NULL, "Internal error: parameter buffer overflow");
+	inform("Internal error: parameter buffer overflow");
 	return 0;
     }
 
@@ -4136,8 +4129,7 @@ get_param(PM first, const char *name, char replace, int fetchonly)
 	if (strcasecmp(name, first->pm_name) == 0) {
 	    if (fetchonly)
 	    	return first->pm_value;
-	    else
-	    	return getcpy(get_param_value(first, replace));
+            return getcpy(get_param_value(first, replace));
 	}
 	first = first->pm_next;
     }
@@ -4242,13 +4234,13 @@ noiconv:
 #endif /* HAVE_ICONV */
 
     /*
-     * Take everything non-ASCII and substituite the replacement character
+     * Take everything non-ASCII and substitute the replacement character
      */
 
     q = buffer;
     bufsize = sizeof(buffer);
     for (p = pm->pm_value; *p != '\0' && bufsize > 1; p++, q++, bufsize--) {
-	if (isascii((unsigned char) *p) && !iscntrl((unsigned char) *p))
+	if (isascii((unsigned char) *p) && isprint((unsigned char) *p))
 	    *q = *p;
 	else
 	    *q = replace;