X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/71807b3575bb312a3b650ce7091b02f0285b9aab..af32d40a8ca0b341c082066b2f1e3e83005c1a89:/uip/mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 5b1758d0..9b8eb973 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -1,31 +1,34 @@
-
-/*
- * 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
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/context_find.h"
+#include "sbr/pidstatus.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
 #include <fcntl.h>
-#include <h/md5.h>
-#include <h/mts.h>
-#include <h/tws.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/utils.h>
+#include "h/md5.h"
+#include "h/mts.h"
+#include "h/tws.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/utils.h"
+#include "mhmisc.h"
+#include "h/mhcachesbr.h"
+#include "sbr/m_mktemp.h"
+#include "mhfree.h"
 #ifdef HAVE_ICONV
 # include <iconv.h>
 #endif /* HAVE_ICONV */
+#include "sbr/base64.h"
 
 
 extern int debugsw;
 
-/* cache policies */
-extern int rcachesw;	/* mhcachesbr.c */
-extern int wcachesw;	/* mhcachesbr.c */
-
 int checksw = 0;	/* check Content-MD5 field */
 
 /*
@@ -36,19 +39,18 @@ int checksw = 0;	/* check Content-MD5 field */
  * 3) Suppress the warning about extraneous trailing ';' in header parameter
  *    lists.
  */
-int skip_mp_cte_check;
-int suppress_bogus_mp_content_warning;
-int bogus_mp_content;
-int suppress_extraneous_trailing_semicolon_warning;
+bool skip_mp_cte_check;
+bool suppress_bogus_mp_content_warning;
+bool bogus_mp_content;
+bool suppress_extraneous_trailing_semicolon_warning;
 
 /*
  * By default, suppress warning about multiple MIME-Version header fields.
  */
-int suppress_multiple_mime_version_warning = 1;
+bool suppress_multiple_mime_version_warning = true;
 
 /* list of preferred type/subtype pairs, for -prefer */
-char *preferred_types[NPREFS],
-     *preferred_subtypes[NPREFS];
+mime_type_subtype mime_preference[NPREFS];
 int npreferred;
 
 
@@ -57,8 +59,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! */
 };
 
@@ -109,17 +111,6 @@ 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
  */
@@ -182,7 +173,7 @@ struct str2init str2ces[] = {
 /*
  * NOTE WELL: si_key MUST NOT have value of NOTOK
  *
- * si_key is 1 if access method is anonymous.
+ * si_val is 1 if access method is anonymous.
  */
 struct str2init str2methods[] = {
     { "afs",         1,	InitFile },
@@ -209,8 +200,9 @@ parse_mime (char *file)
     FILE *fp;
     CT ct;
     size_t n;
+    struct stat statbuf;
 
-    bogus_mp_content = 0;
+    bogus_mp_content = false;
 
     /*
      * Check if file is actually standard input
@@ -244,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;
@@ -252,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;
     }
 
@@ -292,26 +291,27 @@ 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;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
 
     /* allocate the content structure */
     NEW0(ct);
     ct->c_fp = in;
-    ct->c_file = add (file, NULL);
+    ct->c_file = mh_xstrdup(FENDNULL(file));
     ct->c_begin = ftell (ct->c_fp) + 1;
 
     /*
      * Parse the header fields for this
      * content into a linked list.
      */
-    m_getfld_track_filepos (&gstate, in);
+    gstate = m_getfld_state_init(in);
+    m_getfld_track_filepos2(&gstate);
     for (compnum = 1;;) {
 	int bufsz = sizeof buf;
-	switch (state = m_getfld (&gstate, name, buf, &bufsz, in)) {
+	switch (state = m_getfld2(&gstate, name, buf, &bufsz)) {
 	case FLD:
 	case FLDPLUS:
 	    compnum++;
@@ -323,7 +323,7 @@ get_content (FILE *in, char *file, int toplevel)
 	    /* if necessary, get rest of field */
 	    while (state == FLDPLUS) {
 		bufsz = sizeof buf;
-		state = m_getfld (&gstate, name, buf, &bufsz, in);
+		state = m_getfld2(&gstate, name, buf, &bufsz);
 		vp = add (buf, vp);	/* add to previous value */
 	    }
 
@@ -335,12 +335,25 @@ get_content (FILE *in, char *file, int toplevel)
 	    continue;
 
 	case BODY:
+            /* 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] == ':') {
-		/* Special case:  no blank line between header and body.  The
-		   file position indicator is on the newline at the end of the
-		   line, but it needs to be one prior to the beginning of the
-		   line.  So subtract the length of the line, bufsz, plus 1. */
-		ct->c_begin = ftell (in) - (bufsz + 1);
+		ct->c_begin = ftell(in) - bufsz;
 	    } else {
 		ct->c_begin = ftell (in) - (bufsz - 1);
 	    }
@@ -352,10 +365,10 @@ get_content (FILE *in, char *file, int toplevel)
 
 	case LENERR:
 	case FMTERR:
-	    adios (NULL, "message format error in component #%d", compnum);
+	    die("message format error in component #%d", compnum);
 
 	default:
-	    adios (NULL, "getfld() returned %d", state);
+	    die("getfld() returned %d", state);
 	}
 
 	/* break out of the loop */
@@ -378,7 +391,7 @@ get_content (FILE *in, char *file, int toplevel)
 	    char c, *cp, *dp;
 	    char *vrsn;
 
-	    vrsn = add (hp->value, NULL);
+	    vrsn = mh_xstrdup(FENDNULL(hp->value));
 
 	    /* Now, cleanup this field */
 	    cp = vrsn;
@@ -405,14 +418,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);
 	    }
@@ -424,7 +437,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;
 	    }
@@ -455,13 +468,13 @@ 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;
 	    }
 
 	    /* get copy of this field */
-	    ct->c_celine = cp = add (hp->value, NULL);
+	    ct->c_celine = cp = mh_xstrdup(FENDNULL(hp->value));
 
 	    while (isspace ((unsigned char) *cp))
 		cp++;
@@ -494,12 +507,12 @@ 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;
 	    }
 
-	    ep = cp = add (hp->value, NULL);	/* get a copy */
+	    ep = cp = mh_xstrdup(FENDNULL(hp->value)); /* get a copy */
 
 	    while (isspace ((unsigned char) *cp))
 		cp++;
@@ -629,7 +642,7 @@ get_ctinfo (char *cp, CT ct, int magic)
     ci = &ct->c_ctinfo;
 
     /* store copy of Content-Type line */
-    cp = ct->c_ctline = add (cp, NULL);
+    cp = ct->c_ctline = mh_xstrdup(FENDNULL(cp));
 
     while (isspace ((unsigned char) *cp))	/* trim leading spaces */
 	cp++;
@@ -653,16 +666,18 @@ get_ctinfo (char *cp, CT ct, int magic)
 
     for (dp = cp; istoken (*dp); dp++)
 	continue;
-    c = *dp, *dp = '\0';
+    c = *dp;
+    *dp = '\0';
     ci->ci_type = mh_xstrdup(cp);	/* store content type */
-    *dp = c, cp = dp;
+    *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;
     }
-    ToLower(ci->ci_type);
+    to_lower(ci->ci_type);
 
     while (isspace ((unsigned char) *cp))
 	cp++;
@@ -687,17 +702,18 @@ get_ctinfo (char *cp, CT ct, int magic)
 
     for (dp = cp; istoken (*dp); dp++)
 	continue;
-    c = *dp, *dp = '\0';
+    c = *dp;
+    *dp = '\0';
     ci->ci_subtype = mh_xstrdup(cp);	/* store the content subtype */
-    *dp = c, cp = dp;
+    *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;
     }
-    ToLower(ci->ci_subtype);
+    to_lower(ci->ci_subtype);
 
 magic_skip:
     while (isspace ((unsigned char) *cp))
@@ -717,10 +733,10 @@ magic_skip:
      * Get any <Content-Id> given in buffer
      */
     if (magic && *cp == '<') {
-        mh_xfree(ct->c_id);
+        free(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;
@@ -745,7 +761,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;
 	}
@@ -772,7 +788,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;
 	}
@@ -806,7 +822,7 @@ magic_skip:
 	    cp++;
 
 	if (dp == cp) {
-	    advise (NULL, "invalid null transfer encoding specification");
+	    inform("invalid null transfer encoding specification");
 	    return NOTOK;
 	}
 
@@ -823,7 +839,7 @@ magic_skip:
 	}
 
 	if (ct->c_reqencoding == CE_UNKNOWN) {
-	    advise (NULL, "invalid CTE specification: \"%s\"", dp);
+	    inform("invalid CTE specification: \"%s\"", dp);
 	    return NOTOK;
 	}
 
@@ -849,9 +865,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)", ct->c_file, TYPE_FIELD, cp);
     }
 
     return OK;
@@ -876,7 +891,7 @@ get_dispo (char *cp, CT ct, int buildflag)
      * time.
      */
 
-    dispoheader = cp = add(cp, NULL);
+    dispoheader = cp = mh_xstrdup(FENDNULL(cp));
 
     while (isspace ((unsigned char) *cp))	/* trim leading spaces */
 	cp++;
@@ -902,9 +917,11 @@ get_dispo (char *cp, CT ct, int buildflag)
 
     for (dp = cp; istoken (*dp); dp++)
 	continue;
-    c = *dp, *dp = '\0';
+    c = *dp;
+    *dp = '\0';
     ct->c_dispo_type = mh_xstrdup(cp);	/* store disposition type */
-    *dp = c, cp = dp;
+    *dp = c;
+    cp = dp;
 
     if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) == NOTOK)
 	return NOTOK;
@@ -917,9 +934,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)",
+            ct->c_file, DISPO_FIELD, cp);
     }
 
     if (buildflag)
@@ -947,7 +963,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;
 
@@ -960,7 +976,7 @@ invalid:
 
 	case '(':
 	    i++;
-	    /* and fall... */
+	    /* FALLTHRU */
 	default:
 	    *bp++ = c;
 	    continue;
@@ -1070,7 +1086,7 @@ InitText (CT ct)
 static int
 InitMultiPart (CT ct)
 {
-    int	inout;
+    bool inout;
     long last, pos;
     char *cp, *dp;
     PM pm;
@@ -1086,7 +1102,7 @@ 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) {
@@ -1096,15 +1112,14 @@ InitMultiPart (CT ct)
 
 	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);
+	for (bp = cte; isblank((unsigned char)*bp); ++bp) continue;
+
+	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;
@@ -1127,9 +1142,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;
     }
 
@@ -1141,7 +1155,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;
     }
@@ -1165,7 +1179,7 @@ InitMultiPart (CT ct)
     last = ct->c_end;
     next = &m->mp_parts;
     part = NULL;
-    inout = 1;
+    inout = true;
 
     while ((gotlen = getline(&bufp, &buflen, fp)) != -1) {
 	if (pos > last)
@@ -1192,10 +1206,10 @@ next_part:
 	    part->mp_part = p;
 	    pos = p->c_begin;
 	    fseek (fp, pos, SEEK_SET);
-	    inout = 0;
+	    inout = false;
 	} else {
 	    if (strcmp (bufp + 2, m->mp_start) == 0) {
-		inout = 1;
+		inout = true;
 end_part:
 		p = part->mp_part;
 		p->c_end = ftell(fp) - (gotlen + 1);
@@ -1211,9 +1225,9 @@ 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;
+    bogus_mp_content = true;
 
     if (!inout && part) {
 	p = part->mp_part;
@@ -1285,7 +1299,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."
  */
@@ -1306,7 +1320,7 @@ reverse_parts (CT ct)
 }
 
 static void
-move_preferred_part (CT ct, char *type, char *subtype)
+move_preferred_part(CT ct, mime_type_subtype *pref)
 {
     struct multipart *m = (struct multipart *) ct->c_ctparams;
     struct part *part, *prev, *head, *nhead, *ntail;
@@ -1330,8 +1344,9 @@ move_preferred_part (CT ct, char *type, char *subtype)
     part = head->mp_next;
     while (part != NULL) {
 	ci = &part->mp_part->c_ctinfo;
-	if (!strcasecmp(ci->ci_type, type) &&
-		(!subtype || !strcasecmp(ci->ci_subtype, subtype))) {
+	if (!strcasecmp(ci->ci_type, pref->type) &&
+            (!pref->subtype ||
+                !strcasecmp(ci->ci_subtype, pref->subtype))) {
 	    prev->mp_next = part->mp_next;
 	    part->mp_next = NULL;
 	    ntail->mp_next = part;
@@ -1344,7 +1359,6 @@ move_preferred_part (CT ct, char *type, char *subtype)
     }
     ntail->mp_next = head->mp_next;
     m->mp_parts = nhead->mp_next;
-
 }
 
 /*
@@ -1356,8 +1370,8 @@ static void
 prefer_parts(CT ct)
 {
     int i;
-    for (i = npreferred-1; i >= 0; i--)
-	move_preferred_part(ct, preferred_types[i], preferred_subtypes[i]);
+    for (i = 0; i < npreferred; i++)
+	move_preferred_part(ct, mime_preference + i);
 }
 
 
@@ -1367,7 +1381,8 @@ prefer_parts(CT ct)
    example, a text/plain part before a text/html part in a
    multipart/alternative part, for example, where it belongs. */
 void
-reverse_alternative_parts (CT ct) {
+reverse_alternative_parts (CT ct)
+{
     if (ct->c_type == CT_MULTIPART) {
         struct multipart *m = (struct multipart *) ct->c_ctparams;
         struct part *part;
@@ -1394,9 +1409,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;
     }
 
@@ -1422,17 +1437,16 @@ InitMessage (CT ct)
 		/* scan for parameters "id", "number", and "total" */
 		for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
 		    if (!strcasecmp (pm->pm_name, "id")) {
-			p->pm_partid = add (pm->pm_value, NULL);
+			p->pm_partid = mh_xstrdup(FENDNULL(pm->pm_value));
 			continue;
 		    }
 		    if (!strcasecmp (pm->pm_name, "number")) {
 			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;
@@ -1448,10 +1462,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;
 		}
 	    }
@@ -1504,7 +1516,7 @@ invalid_param:
 			        adios ("failed", "fread");
 
 			    case OK:
-				adios (NULL, "unexpected EOF from fread");
+				die("unexpected EOF from fread");
 
 			    default:
 				bp += cc, size -= cc;
@@ -1531,7 +1543,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)
@@ -1636,9 +1648,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;
     }
 
@@ -1708,11 +1719,11 @@ size_encoding (CT ct)
     }
 
     if (ct->c_encoding == CE_EXTERNAL)
-	return (ct->c_end - ct->c_begin);	
+	return ct->c_end - ct->c_begin;	
 
     file = NULL;
     if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
-	return (ct->c_end - ct->c_begin);
+	return ct->c_end - ct->c_begin;
 
     if (fstat (fd, &st) != NOTOK)
 	size = (long) st.st_size;
@@ -1739,7 +1750,8 @@ static int
 openBase64 (CT ct, char **file)
 {
     ssize_t cc, len;
-    int fd, own_ct_fp = 0;
+    int fd;
+    bool own_ct_fp = false;
     char *cp, *buffer = NULL;
     /* sbeck -- handle suffixes */
     CI ci;
@@ -1774,7 +1786,7 @@ openBase64 (CT ct, char **file)
 	if (ce->ce_unlink) {
 	    /* Create temporary file with filename extension. */
 	    if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
-		adios(NULL, "unable to create temporary file in %s",
+		die("unable to create temporary file in %s",
 		      get_temp_dir());
 	    }
 	} else {
@@ -1783,7 +1795,7 @@ openBase64 (CT ct, char **file)
     } else if (*file == NULL) {
 	char *tempfile;
 	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
-	    adios(NULL, "unable to create temporary file in %s",
+	    die("unable to create temporary file in %s",
 		  get_temp_dir());
 	}
 	ce->ce_file = mh_xstrdup(tempfile);
@@ -1795,7 +1807,7 @@ openBase64 (CT ct, char **file)
     }
 
     if ((len = ct->c_end - ct->c_begin) < 0)
-	adios (NULL, "internal error(1)");
+	die("internal error(1)");
 
     buffer = mh_xmalloc (len + 1);
 
@@ -1804,7 +1816,7 @@ openBase64 (CT ct, char **file)
 	    content_error (ct->c_file, ct, "unable to open for reading");
 	    return NOTOK;
 	}
-	own_ct_fp = 1;
+	own_ct_fp = true;
     }
 
     lseek (fd = fileno (ct->c_fp), (off_t) ct->c_begin, SEEK_SET);
@@ -1831,7 +1843,10 @@ openBase64 (CT ct, char **file)
     *cp = '\0';
 
     if (decodeBase64 (buffer, &decoded, &decoded_len, ct->c_type == CT_TEXT,
-                      ct->c_digested ? digest : NULL) == OK) {
+                      ct->c_digested ? digest : NULL) != OK)
+        goto clean_up;
+
+    {
         size_t i;
         unsigned char *decoded_p = decoded;
         for (i = 0; i < decoded_len; ++i) {
@@ -1845,7 +1860,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 {
@@ -1854,8 +1869,6 @@ openBase64 (CT ct, char **file)
                 }
             }
         }
-    } else {
-        goto clean_up;
     }
 
     fseek (ct->c_fp, 0L, SEEK_SET);
@@ -1921,7 +1934,8 @@ InitQuoted (CT ct)
 static int
 openQuoted (CT ct, char **file)
 {
-    int	cc, digested, len, quoted, own_ct_fp = 0;
+    int	cc, digested, len, quoted;
+    bool own_ct_fp = false;
     char *cp, *ep;
     char *bufp = NULL;
     size_t buflen;
@@ -1958,7 +1972,7 @@ openQuoted (CT ct, char **file)
 	if (ce->ce_unlink) {
 	    /* Create temporary file with filename extension. */
 	    if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
-		adios(NULL, "unable to create temporary file in %s",
+		die("unable to create temporary file in %s",
 		      get_temp_dir());
 	    }
 	} else {
@@ -1967,7 +1981,7 @@ openQuoted (CT ct, char **file)
     } else if (*file == NULL) {
 	char *tempfile;
 	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
-	    adios(NULL, "unable to create temporary file in %s",
+	    die("unable to create temporary file in %s",
 		  get_temp_dir());
 	}
 	ce->ce_file = mh_xstrdup(tempfile);
@@ -1979,23 +1993,20 @@ openQuoted (CT ct, char **file)
     }
 
     if ((len = ct->c_end - ct->c_begin) < 0)
-	adios (NULL, "internal error(2)");
+	die("internal error(2)");
 
     if (! ct->c_fp) {
 	if ((ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
 	    content_error (ct->c_file, ct, "unable to open for reading");
 	    return NOTOK;
 	}
-	own_ct_fp = 1;
+	own_ct_fp = true;
     }
 
     if ((digested = ct->c_digested))
 	MD5Init (&mdContext);
 
     quoted = 0;
-#ifdef lint
-    mask = 0;
-#endif
 
     fseek (ct->c_fp, ct->c_begin, SEEK_SET);
     while (len > 0) {
@@ -2011,7 +2022,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) {
@@ -2057,11 +2069,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,13 +2107,12 @@ openQuoted (CT ct, char **file)
 	unsigned char digest[16];
 
 	MD5Final (digest, &mdContext);
-	if (memcmp((char *) digest, (char *) ct->c_digest,
-		   sizeof(digest) / sizeof(digest[0])))
+	if (memcmp(digest, ct->c_digest,
+		   sizeof digest))
 	    content_error (NULL, ct,
 			   "content integrity suspect (digest mismatch) -- continuing");
-	else
-	    if (debugsw)
-		fprintf (stderr, "content integrity confirmed\n");
+	else if (debugsw)
+            fprintf (stderr, "content integrity confirmed\n");
     }
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
@@ -2145,7 +2155,8 @@ Init7Bit (CT ct)
 int
 open7Bit (CT ct, char **file)
 {
-    int	cc, fd, len, own_ct_fp = 0;
+    int	cc, fd, len;
+    bool own_ct_fp = false;
     char buffer[BUFSIZ];
     /* sbeck -- handle suffixes */
     char *cp;
@@ -2178,7 +2189,7 @@ open7Bit (CT ct, char **file)
 	if (ce->ce_unlink) {
 	    /* Create temporary file with filename extension. */
 	    if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
-		adios(NULL, "unable to create temporary file in %s",
+		die("unable to create temporary file in %s",
 		      get_temp_dir());
 	    }
 	} else {
@@ -2187,7 +2198,7 @@ open7Bit (CT ct, char **file)
     } else if (*file == NULL) {
 	char *tempfile;
 	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
-	    adios(NULL, "unable to create temporary file in %s",
+	    die("unable to create temporary file in %s",
 		  get_temp_dir());
 	}
 	ce->ce_file = mh_xstrdup(tempfile);
@@ -2204,7 +2215,7 @@ open7Bit (CT ct, char **file)
 
 	len = 0;
 	fprintf (ce->ce_fp, "%s: %s/%s", TYPE_FIELD, ci->ci_type, ci->ci_subtype);
-	len += strlen (TYPE_FIELD) + 2 + strlen (ci->ci_type)
+	len += LEN(TYPE_FIELD) + 2 + strlen (ci->ci_type)
 	    + 1 + strlen (ci->ci_subtype);
 	buffer = output_params(len, ci->ci_first_pm, &len, 0);
 
@@ -2236,14 +2247,14 @@ open7Bit (CT ct, char **file)
     }
 
     if ((len = ct->c_end - ct->c_begin) < 0)
-	adios (NULL, "internal error(3)");
+	die("internal error(3)");
 
     if (! ct->c_fp) {
 	if ((ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
 	    content_error (ct->c_file, ct, "unable to open for reading");
 	    return NOTOK;
 	}
-	own_ct_fp = 1;
+	own_ct_fp = true;
     }
 
     lseek (fd = fileno (ct->c_fp), (off_t) ct->c_begin, SEEK_SET);
@@ -2320,7 +2331,7 @@ openExternal (CT ct, CT cb, CE ce, char **file, int *fd)
 	goto ready_already;
     }
 
-    if (find_cache (ct, rcachesw, (int *) 0, cb->c_id,
+    if (find_cache(ct, rcachesw, NULL, cb->c_id,
 		cachefile, sizeof(cachefile)) != NOTOK) {
 	if ((ce->ce_fp = fopen (cachefile, "r"))) {
 	    ce->ce_file = mh_xstrdup(cachefile);
@@ -2330,7 +2341,7 @@ openExternal (CT ct, CT cb, CE ce, char **file, int *fd)
         admonish (cachefile, "unable to fopen for reading");
     }
 
-    *fd = fileno (ce->ce_fp);
+    *fd = ce->ce_fp ? fileno (ce->ce_fp) : -1;
     return OK;
 
 ready_already:
@@ -2406,12 +2417,10 @@ openFile (CT ct, char **file)
 	    if (ferror (gp)) {
 		admonish (ce->ce_file, "error reading");
 		(void) m_unlink (cachefile);
-	    }
-	    else
-		if (ferror (fp)) {
-		    admonish (cachefile, "error writing");
-		    (void) m_unlink (cachefile);
-		}
+	    } else if (ferror (fp)) {
+                admonish (cachefile, "error writing");
+                (void) m_unlink (cachefile);
+            }
 	    fclose (fp);
 	}
 	umask (mask);
@@ -2436,7 +2445,9 @@ InitFTP (CT ct)
 static int
 openFTP (CT ct, char **file)
 {
-    int	cachetype, caching, fd;
+    int	cachetype;
+    bool caching;
+    int fd;
     int len, buflen;
     char *bp, *ftp, *user, *pass;
     char buffer[BUFSIZ], cachefile[BUFSIZ];
@@ -2521,14 +2532,14 @@ openFTP (CT ct, char **file)
     }
 
     ce->ce_unlink = (*file == NULL);
-    caching = 0;
+    caching = false;
     cachefile[0] = '\0';
     if ((!e->eb_permission || strcasecmp (e->eb_permission, "read-write"))
 	    && find_cache (NULL, wcachesw, &cachetype, e->eb_content->c_id,
 		cachefile, sizeof(cachefile)) != NOTOK) {
 	if (*file == NULL) {
 	    ce->ce_unlink = 0;
-	    caching = 1;
+	    caching = true;
 	}
     }
 
@@ -2539,7 +2550,7 @@ openFTP (CT ct, char **file)
     else {
 	char *tempfile;
 	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
-	    adios(NULL, "unable to create temporary file in %s",
+	    die("unable to create temporary file in %s",
 		  get_temp_dir());
 	}
 	ce->ce_file = mh_xstrdup(tempfile);
@@ -2551,7 +2562,7 @@ openFTP (CT ct, char **file)
     }
 
     {
-	int child_id, i, vecp;
+	int child_id, vecp;
 	char *vec[9];
 
 	vecp = 0;
@@ -2568,8 +2579,7 @@ openFTP (CT ct, char **file)
 
 	fflush (stdout);
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-	    sleep (5);
+	child_id = fork();
 	switch (child_id) {
 	    case NOTOK:
 	        adios ("fork", "unable to");
@@ -2580,7 +2590,7 @@ openFTP (CT ct, char **file)
 		execvp (ftp, vec);
 		fprintf (stderr, "unable to exec ");
 		perror (ftp);
-		_exit (-1);
+		_exit(1);
 		/* NOTREACHED */
 
 	    default:
@@ -2617,12 +2627,10 @@ openFTP (CT ct, char **file)
 		if (ferror (gp)) {
 		    admonish (ce->ce_file, "error reading");
 		    (void) m_unlink (cachefile);
-		}
-		else
-		    if (ferror (fp)) {
-			admonish (cachefile, "error writing");
-			(void) m_unlink (cachefile);
-		    }
+		} else if (ferror (fp)) {
+                    admonish (cachefile, "error writing");
+                    (void) m_unlink (cachefile);
+                }
 		fclose (fp);
 	    }
 	    umask (mask);
@@ -2649,7 +2657,7 @@ InitMail (CT ct)
 static int
 openMail (CT ct, char **file)
 {
-    int	child_id, fd, i, vecp;
+    int child_id, fd, vecp;
     int len, buflen;
     char *bp, buffer[BUFSIZ], *vec[7];
     struct exbody *e = ct->c_ctexbody;
@@ -2705,8 +2713,7 @@ openMail (CT ct, char **file)
     vec[vecp++] = e->eb_body;
     vec[vecp] = NULL;
 
-    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-	sleep (5);
+    child_id = fork();
     switch (child_id) {
 	case NOTOK:
 	    advise ("fork", "unable to");
@@ -2716,19 +2723,19 @@ openMail (CT ct, char **file)
 	    execvp (mailproc, vec);
 	    fprintf (stderr, "unable to exec ");
 	    perror (mailproc);
-	    _exit (-1);
+	    _exit(1);
 	    /* NOTREACHED */
 
 	default:
 	    if (pidXwait (child_id, NULL) == OK)
-		advise (NULL, "request sent");
+		inform("request sent");
 	    break;
     }
 
     if (*file == NULL) {
 	char *tempfile;
 	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
-	    adios(NULL, "unable to create temporary file in %s",
+	    die("unable to create temporary file in %s",
 		  get_temp_dir());
 	}
 	ce->ce_file = mh_xstrdup(tempfile);
@@ -2745,7 +2752,7 @@ openMail (CT ct, char **file)
 
     /* showproc is for mhshow and mhstore, though mhlist -debug
      * prints it, too. */
-    mh_xfree(ct->c_showproc);
+    free(ct->c_showproc);
     ct->c_showproc = mh_xstrdup("true");
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
@@ -2772,7 +2779,9 @@ openURL (CT ct, char **file)
     CE ce = &ct->c_cefile;
     char *urlprog, *program;
     char buffer[BUFSIZ], cachefile[BUFSIZ];
-    int fd, caching, cachetype;
+    int fd;
+    bool caching;
+    int cachetype;
     struct msgs_array args = { 0, 0, NULL};
     pid_t child_id;
 
@@ -2801,14 +2810,14 @@ openURL (CT ct, char **file)
     }
 
     ce->ce_unlink = (*file == NULL);
-    caching = 0;
+    caching = false;
     cachefile[0] = '\0';
 
     if (find_cache(NULL, wcachesw, &cachetype, e->eb_content->c_id,
     		   cachefile, sizeof(cachefile)) != NOTOK) {
 	if (*file == NULL) {
 	    ce->ce_unlink = 0;
-	    caching = 1;
+	    caching = true;
 	}
     }
 
@@ -2819,7 +2828,7 @@ openURL (CT ct, char **file)
     else {
 	char *tempfile;
 	if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
-	    adios(NULL, "unable to create temporary file in %s",
+	    die("unable to create temporary file in %s",
 		  get_temp_dir());
 	}
 	ce->ce_file = mh_xstrdup(tempfile);
@@ -2844,7 +2853,7 @@ openURL (CT ct, char **file)
 	execvp(program, args.msgs);
 	fprintf(stderr, "Unable to exec ");
 	perror(program);
-	_exit(-1);
+	_exit(1);
 	/* NOTREACHED */
 
     default:
@@ -2887,7 +2896,7 @@ openURL (CT ct, char **file)
 
     fseeko(ce->ce_fp, 0, SEEK_SET);
     *file = ce->ce_file;
-    return fd;
+    return fileno(ce->ce_fp);
 }
 
 
@@ -2902,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);
@@ -2939,7 +2948,7 @@ get_leftover_mp_content (CT ct, int before /* or after */)
 {
     struct multipart *m = (struct multipart *) ct->c_ctparams;
     char *boundary;
-    int found_boundary = 0;
+    bool found_boundary = false;
     int max = BUFSIZ;
     char *bufp = NULL;
     size_t buflen;
@@ -2984,11 +2993,11 @@ get_leftover_mp_content (CT ct, int before /* or after */)
 
         if (before) {
             if (! strcmp (bufp, boundary)) {
-                found_boundary = 1;
+                found_boundary = true;
             }
         } else {
             if (! found_boundary  &&  ! strcmp (bufp, boundary)) {
-                found_boundary = 1;
+                found_boundary = true;
                 continue;
             }
         }
@@ -3042,7 +3051,8 @@ get_leftover_mp_content (CT ct, int before /* or after */)
 
 
 char *
-ct_type_str (int type) {
+ct_type_str (int type)
+{
     switch (type) {
     case CT_APPLICATION:
         return "application";
@@ -3067,7 +3077,8 @@ ct_type_str (int type) {
 
 
 char *
-ct_subtype_str (int type, int subtype) {
+ct_subtype_str (int type, int subtype)
+{
     switch (type) {
     case CT_APPLICATION:
         switch (subtype) {
@@ -3122,7 +3133,8 @@ ct_subtype_str (int type, int subtype) {
 
 
 int
-ct_str_type (const char *type) {
+ct_str_type (const char *type)
+{
     struct str2init *s2i;
 
     for (s2i = str2cts; s2i->si_key; ++s2i) {
@@ -3139,7 +3151,8 @@ ct_str_type (const char *type) {
 
 
 int
-ct_str_subtype (int type, const char *subtype) {
+ct_str_subtype (int type, const char *subtype)
+{
     struct k2v *kv;
 
     switch (type) {
@@ -3179,7 +3192,8 @@ ct_str_subtype (int type, const char *subtype) {
 
 /* Find the content type and InitFunc for the CT. */
 const struct str2init *
-get_ct_init (int type) {
+get_ct_init (int type)
+{
     const struct str2init *sp;
 
     for (sp = str2cts; sp->si_key; ++sp) {
@@ -3192,7 +3206,8 @@ get_ct_init (int type) {
 }
 
 const char *
-ce_str (int encoding) {
+ce_str (int encoding)
+{
     switch (encoding) {
     case CE_BASE64:
         return "base64";
@@ -3215,7 +3230,8 @@ ce_str (int encoding) {
 
 /* Find the content type and InitFunc for the content encoding method. */
 const struct str2init *
-get_ce_method (const char *method) {
+get_ce_method (const char *method)
+{
     struct str2init *sp;
 
     for (sp = str2ces; sp->si_key; ++sp) {
@@ -3269,7 +3285,9 @@ parse_header_attrs (const char *filename, const char *fieldname,
 
     while (*cp == ';') {
 	char *dp, *vp, *up, *nameptr, *valptr, *charset = NULL, *lang = NULL;
-	int encoded = 0, partial = 0, len = 0, index = 0;
+	bool encoded = false;
+        bool partial = false;
+        int len = 0, index = 0;
 
 	cp++;
 	while (isspace ((unsigned char) *cp))
@@ -3282,10 +3300,8 @@ 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);
 	    }
 	    return DONE;
 	}
@@ -3297,10 +3313,9 @@ parse_header_attrs (const char *filename, const char *fieldname,
 	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"
+                "    parameter %s (error detected at offset %ld)",
+                filename, fieldname, cp, (long)(dp - cp));
 	    return NOTOK;
 	}
 
@@ -3322,17 +3337,17 @@ parse_header_attrs (const char *filename, const char *fieldname,
 
 	for (vp = cp; vp < up; vp++) {
 	    if (*vp == '*' && vp < up - 1) {
-		partial = 1;
+		partial = true;
 		continue;
-	    } else if (*vp == '*' && vp == up - 1) {
-	    	encoded = 1;
+	    }
+            if (*vp == '*' && vp == up - 1) {
+	    	encoded = true;
 	    } else if (partial) {
 		if (isdigit((unsigned char) *vp))
 		    index = *vp - '0' + index * 10;
 		else {
-		    advise (NULL, "invalid parameter index in message %s's "
-			    "%s: field\n%*s(parameter %s)", filename,
-			    fieldname, strlen(invo_name) + 2, "", cp);
+                    inform("invalid parameter index in message %s's %s: field"
+                        "\n    (parameter %s)", filename, fieldname, cp);
 		    return NOTOK;
 		}
 	    } else {
@@ -3374,9 +3389,8 @@ parse_header_attrs (const char *filename, const char *fieldname,
 		    }
 		    vp++;
 		} else {
-		    advise(NULL, "missing charset in message %s's %s: "
-			   "field\n%*s(parameter %s)", filename, fieldname,
-			   strlen(invo_name) + 2, "", nameptr);
+                    inform("missing charset in message %s's %s: field\n"
+                        "    (parameter %s)", filename, fieldname, nameptr);
 		    free(nameptr);
 		    return NOTOK;
 		}
@@ -3397,11 +3411,10 @@ parse_header_attrs (const char *filename, const char *fieldname,
 		    }
 		    vp++;
 		} else {
-		    advise(NULL, "missing language tag in message %s's %s: "
-			   "field\n%*s(parameter %s)", filename, fieldname,
-			   strlen(invo_name) + 2, "", nameptr);
+                    inform("missing language tag in message %s's %s: field\n"
+                        "    (parameter %s)", filename, fieldname, nameptr);
 		    free(nameptr);
-                    mh_xfree(charset);
+                    free(charset);
 		    return NOTOK;
 		}
 
@@ -3421,13 +3434,11 @@ 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 "
-			       "%s's %s: field\n%*s(parameter %s)",
-			       filename, fieldname, strlen(invo_name) + 2,
-			       "", nameptr);
+                        inform("invalid encoded sequence in message %s's %s: field\n"
+                            "    (parameter %s)", filename, fieldname, nameptr);
 			free(nameptr);
-                        mh_xfree(charset);
-                        mh_xfree(lang);
+                        free(charset);
+                        free(lang);
 			return NOTOK;
 		    }
 		    vp += 2;
@@ -3464,14 +3475,11 @@ 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"
+                            "    (parameter %s)", filename, fieldname, nameptr);
 			free(nameptr);
-                        mh_xfree(charset);
-                        mh_xfree(lang);
+                        free(charset);
+                        free(lang);
 			return NOTOK;
 		    case '"':
 			break;
@@ -3479,7 +3487,7 @@ bad_quote:
 		    case '\\':
 			if (*++cp == '\0')
 			    goto bad_quote;
-			/* FALL THROUGH */
+			/* FALLTHRU */
 		    default:
 			len++;
 			continue;
@@ -3552,10 +3560,9 @@ bad_quote:
 	    } else {
 		for (sp2 = pp->sechead; sp2 != NULL; sp2 = sp2->next) {
 		    if (sp2->index == sp->index) {
-			advise (NULL, "duplicate index (%d) in message "
-				"%s's %s: field\n%*s(parameter %s)", sp->index,
-				filename, fieldname, strlen(invo_name) + 2, "",
-				nameptr);
+                        inform("duplicate index (%d) in message %s's %s: field"
+                            "\n    (parameter %s)", sp->index, filename,
+                            fieldname, nameptr);
 			return NOTOK;
 		    }
 		    if (sp2->index < sp->index &&
@@ -3567,10 +3574,9 @@ bad_quote:
 		}
 
 		if (sp2 == NULL) {
-		    advise(NULL, "Internal error: cannot insert partial "
-		    	   "param in message %s's %s: field\n%*s(parameter %s)",
-			   filename, fieldname, strlen(invo_name) + 2, "",
-			   nameptr);
+                    inform("Internal error: cannot insert partial param "
+                        "in message %s's %s: field\n    (parameter %s)",
+                        filename, fieldname, nameptr);
 		    return NOTOK;
 		}
 	    }
@@ -3580,9 +3586,9 @@ bad_quote:
 	     */
 
 	    if (index == 0 && encoded) {
-                mh_xfree(pp->charset);
+                free(pp->charset);
 	    	pp->charset = charset;
-                mh_xfree(pp->lang);
+                free(pp->lang);
 		pp->lang = lang;
 	    }
 	} else {
@@ -3610,10 +3616,9 @@ 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 "
-		       "message %s's %s: field\n%*s(parameter %s)", pindex - 1,
-		       filename, fieldname, strlen(invo_name) + 2, "",
-		       pp->name);
+                inform("missing section %d for parameter in message "
+                    "%s's %s: field\n    (parameter %s)", pindex - 1,
+                    filename, fieldname, pp->name);
 		return NOTOK;
 	    }
 	    tlen += sp->len;
@@ -3648,7 +3653,8 @@ bad_quote:
  */
 
 char *
-content_charset (CT ct) {
+content_charset (CT ct)
+{
     char *ret_charset = NULL;
 
     ret_charset = get_param(ct->c_ctinfo.ci_first_pm, "charset", '?', 0);
@@ -3681,8 +3687,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);
-            mh_xfree(paramout);
+	    inform("Parameter name \"%s\" is too long", params->pm_name);
+            free(paramout);
 	    return NULL;
 	}
 
@@ -3719,7 +3725,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 				 numchars, valoff);
 
 	    if (i == 0) {
-                mh_xfree(paramout);
+                free(paramout);
 		return NULL;
 	    }
 
@@ -3762,7 +3768,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.
 	 */
 
@@ -3782,7 +3788,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 	    		     strlen(params->pm_value + valoff), valoff);
 
 	if (i == 0) {
-            mh_xfree(paramout);
+            free(paramout);
 	    return NULL;
 	}
 
@@ -3883,7 +3889,7 @@ param_len(PM pm, int index, size_t valueoff, int *encode, int *cont,
 	if (! pm->pm_charset) {
 	    pm->pm_charset = mh_xstrdup(write_charset_8bit());
 	    if (strcasecmp(pm->pm_charset, "US-ASCII") == 0)
-		adios(NULL, "8-bit characters in parameter \"%s\", but "
+		die("8-bit characters in parameter \"%s\", but "
 		      "local character set is US-ASCII", pm->pm_name);
 	}
 	if (! pm->pm_lang)
@@ -3931,7 +3937,7 @@ param_len(PM pm, int index, size_t valueoff, int *encode, int *cont,
 	    case '\\':
 	    	len++;
 		maxfit--;
-	    /* FALL THROUGH */
+	    /* FALLTHRU */
 	    default:
 		len++;
 		maxfit--;
@@ -3985,7 +3991,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;
 	}
     }
@@ -4005,7 +4011,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;
 	}
     }
@@ -4039,18 +4045,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,7 +4143,8 @@ get_param(PM first, const char *name, char replace, int fetchonly)
  * necessary
  */
 
-char *get_param_value(PM pm, char replace)
+char *
+get_param_value(PM pm, char replace)
 {
     static char buffer[4096];		/* I hope no parameters are larger */
     size_t bufsize = sizeof(buffer);