context_replace.c: Move interface to own file.

[nmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index a3a80f9a1b4b0242c5b395a382df5ca7664d37ba..9b8eb973f3e1b765b57973188d35f5a9ec5a6490 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -1,32 +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.
  */
 
  *
  * 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 <fcntl.h>

-#include <h/signals.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 */
 #ifdef HAVE_ICONV
 # include <iconv.h>
 #endif /* HAVE_ICONV */

+#include "sbr/base64.h"

 
 
 extern int debugsw;
 
 
 
 extern int debugsw;
 

-/* cache policies */
-extern int rcachesw;   /* mhcachesbr.c */
-extern int wcachesw;   /* mhcachesbr.c */
-

 int checksw = 0;       /* check Content-MD5 field */
 
 /*
 int checksw = 0;       /* check Content-MD5 field */
 
 /*


@@ -35,21 +37,30 @@ 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
  *    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;
+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.
+ */
+bool suppress_multiple_mime_version_warning = true;
+
+/* list of preferred type/subtype pairs, for -prefer */
+mime_type_subtype mime_preference[NPREFS];
+int npreferred;
+

 
 /*
  * Structures for TEXT messages
  */
 struct k2v SubText[] = {
     { "plain",    TEXT_PLAIN },
 
 /*
  * Structures for TEXT messages
  */
 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! */
 };
 
     { NULL,       TEXT_UNKNOWN }    /* this one must be last! */
 };
 


@@ -100,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);
-int type_ok (CT, int);
-void content_error (char *, CT, char *, ...);
-
-/* mhfree.c */
-void free_encoding (CT, int);
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */


@@ -121,6 +121,7 @@ static int InitGeneric (CT);
 static int InitText (CT);
 static int InitMultiPart (CT);
 static void reverse_parts (CT);
 static int InitText (CT);
 static int InitMultiPart (CT);
 static void reverse_parts (CT);

+static void prefer_parts(CT ct);

 static int InitMessage (CT);
 static int InitApplication (CT);
 static int init_encoding (CT, OpenCEFunc);
 static int InitMessage (CT);
 static int InitApplication (CT);
 static int init_encoding (CT, OpenCEFunc);


@@ -144,7 +145,6 @@ static int openURL (CT, char **);
 static int parse_header_attrs (const char *, const char *, char **, PM *,
                               PM *, char **);
 static size_t param_len(PM, int, size_t, int *, int *, size_t *);
 static int parse_header_attrs (const char *, const char *, char **, PM *,
                               PM *, char **);
 static size_t param_len(PM, int, size_t, int *, int *, size_t *);

-static size_t encode_param(PM, char *, size_t, size_t, size_t, int);

 static size_t normal_param(PM, char *, size_t, size_t, size_t);
 static int get_dispo (char *, CT, int);
 
 static size_t normal_param(PM, char *, size_t, size_t, size_t);
 static int get_dispo (char *, CT, int);
 


@@ -173,7 +173,7 @@ struct str2init str2ces[] = {
 /*
  * NOTE WELL: si_key MUST NOT have value of NOTOK
  *
 /*
  * 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 },
  */
 struct str2init str2methods[] = {
     { "afs",         1,        InitFile },


@@ -200,6 +200,9 @@ parse_mime (char *file)
     FILE *fp;
     CT ct;
     size_t n;
     FILE *fp;
     CT ct;
     size_t n;

+    struct stat statbuf;
+
+    bogus_mp_content = false;

 
     /*
      * Check if file is actually standard input
 
     /*
      * Check if file is actually standard input


@@ -211,7 +214,7 @@ parse_mime (char *file)
                   get_temp_dir());
             return NULL;
         }
                   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) {
 
        while ((n = fread(buffer, 1, sizeof(buffer), stdin)) > 0) {
            if (fwrite(buffer, 1, n, fp) != n) {


@@ -233,6 +236,13 @@ parse_mime (char *file)
            return NULL;
        }
        fseek (fp, 0L, SEEK_SET);
            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;
     } else if ((fp = fopen (file, "r")) == NULL) {
        advise (file, "unable to read");
        return NULL;


@@ -241,7 +251,7 @@ parse_mime (char *file)
     if (!(ct = get_content (fp, file, 1))) {
        if (is_stdin)
            (void) m_unlink (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;
     }
 
        return NULL;
     }
 


@@ -281,40 +291,39 @@ static CT
 get_content (FILE *in, char *file, int toplevel)
 {
     int compnum, state;
 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;
     char *np, *vp;
     CT ct;
     HF hp;

-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;

 
     /* allocate the content structure */
 
     /* allocate the content structure */

-    if (!(ct = (CT) mh_xcalloc (1, sizeof(*ct))))
-       adios (NULL, "out of memory");
-
+    NEW0(ct);

     ct->c_fp = in;
     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.
      */
     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;
     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++;
 
            /* get copies of the buffers */
        case FLD:
        case FLDPLUS:
            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) {
                bufsz = sizeof buf;
 
            /* 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 */
            }
 
                vp = add (buf, vp);     /* add to previous value */
            }
 


@@ -326,7 +335,28 @@ get_content (FILE *in, char *file, int toplevel)
            continue;
 
        case BODY:
            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:
            break;
 
        case FILEEOF:


@@ -335,10 +365,10 @@ get_content (FILE *in, char *file, int toplevel)
 
        case LENERR:
        case FMTERR:
 
        case LENERR:
        case FMTERR:

-           adios (NULL, "message format error in component #%d", compnum);
+           die("message format error in component #%d", compnum);

 
        default:
 
        default:

-           adios (NULL, "getfld() returned %d", state);
+           die("getfld() returned %d", state);

        }
 
        /* break out of the loop */
        }
 
        /* break out of the loop */


@@ -359,16 +389,12 @@ get_content (FILE *in, char *file, int toplevel)
        if (!strcasecmp (hp->name, VRSN_FIELD)) {
            int ucmp;
            char c, *cp, *dp;
        if (!strcasecmp (hp->name, VRSN_FIELD)) {
            int ucmp;
            char c, *cp, *dp;

+           char *vrsn;

 
 

-           if (ct->c_vrsn) {
-               advise (NULL, "message %s has multiple %s: fields",
-                       ct->c_file, VRSN_FIELD);
-               goto next_header;
-           }
-           ct->c_vrsn = add (hp->value, NULL);
+           vrsn = mh_xstrdup(FENDNULL(hp->value));

 
            /* Now, cleanup this field */
 
            /* Now, cleanup this field */

-           cp = ct->c_vrsn;
+           cp = vrsn;

 
            while (isspace ((unsigned char) *cp))
                cp++;
 
            while (isspace ((unsigned char) *cp))
                cp++;


@@ -392,9 +418,17 @@ get_content (FILE *in, char *file, int toplevel)
            ucmp = !strcasecmp (cp, VRSN_VALUE);
            *dp = c;
            if (!ucmp) {
            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);
            }
                ct->c_file, VRSN_FIELD, cp);
            }

+           if (!ct->c_vrsn) {
+               ct->c_vrsn = vrsn;
+           } else {
+               if (! suppress_multiple_mime_version_warning)
+                   inform("message %s has multiple %s: fields",
+                           ct->c_file, VRSN_FIELD);
+               free(vrsn);
+           }

        }
        else if (!strcasecmp (hp->name, TYPE_FIELD)) {
        /* Get Content-Type field */
        }
        else if (!strcasecmp (hp->name, TYPE_FIELD)) {
        /* Get Content-Type field */


@@ -403,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) {
 
            /* 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;
            }
                        ct->c_file, TYPE_FIELD);
                goto next_header;
            }


@@ -434,13 +468,13 @@ get_content (FILE *in, char *file, int toplevel)
             * Content-Transfer-Encoding field
             */
            if (ct->c_celine) {
             * 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_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++;
 
            while (isspace ((unsigned char) *cp))
                cp++;


@@ -473,12 +507,12 @@ get_content (FILE *in, char *file, int toplevel)
                goto next_header;
 
            if (ct->c_digested) {
                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;
            }
 
                        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++;
 
            while (isspace ((unsigned char) *cp))
                cp++;


@@ -573,7 +607,7 @@ add_header (CT ct, char *name, char *value)
     HF hp;
 
     /* allocate header field structure */
     HF hp;
 
     /* allocate header field structure */

-    hp = mh_xmalloc (sizeof(*hp));
+    NEW(hp);

 
     /* link data into header structure */
     hp->name = name;
 
     /* link data into header structure */
     hp->name = name;


@@ -608,7 +642,7 @@ get_ctinfo (char *cp, CT ct, int magic)
     ci = &ct->c_ctinfo;
 
     /* store copy of Content-Type line */
     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++;
 
     while (isspace ((unsigned char) *cp))      /* trim leading spaces */
        cp++;


@@ -632,20 +666,18 @@ get_ctinfo (char *cp, CT ct, int magic)
 
     for (dp = cp; istoken (*dp); dp++)
        continue;
 
     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) {
 
     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;
     }
                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++;
 
     while (isspace ((unsigned char) *cp))
        cp++;


@@ -656,7 +688,7 @@ get_ctinfo (char *cp, CT ct, int magic)
 
     if (*cp != '/') {
        if (!magic)
 
     if (*cp != '/') {
        if (!magic)

-           ci->ci_subtype = add ("", NULL);
+           ci->ci_subtype = mh_xstrdup("");

        goto magic_skip;
     }
 
        goto magic_skip;
     }
 


@@ -670,21 +702,18 @@ get_ctinfo (char *cp, CT ct, int magic)
 
     for (dp = cp; istoken (*dp); dp++)
        continue;
 
     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) {
 
     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;
     }
        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))
 
 magic_skip:
     while (isspace ((unsigned char) *cp))


@@ -704,12 +733,10 @@ magic_skip:
      * Get any <Content-Id> given in buffer
      */
     if (magic && *cp == '<') {
      * Get any <Content-Id> given in buffer
      */
     if (magic && *cp == '<') {

-       if (ct->c_id) {
-           free (ct->c_id);
-           ct->c_id = NULL;
-       }
+        free(ct->c_id);
+        ct->c_id = NULL;

        if (!(dp = strchr(ct->c_id = ++cp, '>'))) {
        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;
            return NOTOK;
        }
        c = *dp;


@@ -734,7 +761,7 @@ magic_skip:
            if (*dp == ']')
                break;
        if (dp < cp) {
            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;
        }
            ct->c_descr = NULL;
            return NOTOK;
        }


@@ -761,7 +788,7 @@ magic_skip:
            if (*dp == '}')
                break;
        if (dp < cp) {
            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;
        }
            ct->c_dispo = NULL;
            return NOTOK;
        }


@@ -795,7 +822,7 @@ magic_skip:
            cp++;
 
        if (dp == cp) {
            cp++;
 
        if (dp == cp) {

-           advise (NULL, "invalid null transfer encoding specification");
+           inform("invalid null transfer encoding specification");

            return NOTOK;
        }
 
            return NOTOK;
        }
 


@@ -812,7 +839,7 @@ magic_skip:
        }
 
        if (ct->c_reqencoding == CE_UNKNOWN) {
        }
 
        if (ct->c_reqencoding == CE_UNKNOWN) {

-           advise (NULL, "invalid CTE specification: \"%s\"", dp);
+           inform("invalid CTE specification: \"%s\"", dp);

            return NOTOK;
        }
 
            return NOTOK;
        }
 


@@ -825,7 +852,7 @@ magic_skip:
      */
     if (*cp) {
         if (magic) {
      */
     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.
 
             /* If there is a Content-Disposition header and it doesn't
                have a *filename=, extract it from the magic contents.


@@ -838,9 +865,8 @@ magic_skip:
            }
         }
        else
            }
         }
        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;
     }
 
     return OK;


@@ -865,7 +891,7 @@ get_dispo (char *cp, CT ct, int buildflag)
      * time.
      */
 
      * time.
      */
 

-    dispoheader = cp = add(cp, NULL);
+    dispoheader = cp = mh_xstrdup(FENDNULL(cp));

 
     while (isspace ((unsigned char) *cp))      /* trim leading spaces */
        cp++;
 
     while (isspace ((unsigned char) *cp))      /* trim leading spaces */
        cp++;


@@ -891,9 +917,11 @@ get_dispo (char *cp, CT ct, int buildflag)
 
     for (dp = cp; istoken (*dp); dp++)
        continue;
 
     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;
 
     if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) == NOTOK)
        return NOTOK;


@@ -906,9 +934,8 @@ get_dispo (char *cp, CT ct, int buildflag)
            return NOTOK;
        }
     } else if (*cp) {
            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)
     }
 
     if (buildflag)


@@ -936,7 +963,7 @@ get_comment (const char *filename, const char *fieldname, char **ap,
        switch (c = *cp++) {
        case '\0':
 invalid:
        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;
 
                filename, fieldname);
        return NOTOK;
 


@@ -949,7 +976,7 @@ invalid:
 
        case '(':
            i++;
 
        case '(':
            i++;

-           /* and fall... */
+           /* FALLTHRU */

        default:
            *bp++ = c;
            continue;
        default:
            *bp++ = c;
            continue;


@@ -969,7 +996,7 @@ invalid:
            *commentp = concat (dp, " ", buffer, NULL);
            free (dp);
        } else {
            *commentp = concat (dp, " ", buffer, NULL);
            free (dp);
        } else {

-           *commentp = add (buffer, NULL);
+           *commentp = mh_xstrdup(buffer);

        }
     }
 
        }
     }
 


@@ -1019,8 +1046,7 @@ InitText (CT ct)
     ct->c_subtype = ct_str_subtype (CT_TEXT, ci->ci_subtype);
 
     /* allocate text character set structure */
     ct->c_subtype = ct_str_subtype (CT_TEXT, ci->ci_subtype);
 
     /* allocate text character set structure */

-    if ((t = (struct text *) mh_xcalloc (1, sizeof(*t))) == NULL)
-       adios (NULL, "out of memory");
+    NEW0(t);

     ct->c_ctparams = (void *) t;
 
     /* scan for charset parameter */
     ct->c_ctparams = (void *) t;
 
     /* scan for charset parameter */


@@ -1046,7 +1072,7 @@ InitText (CT ct)
     if (chset != NULL && !check_charset (chset, strlen (chset))) {
        snprintf (buffer, sizeof(buffer), "%s-charset-%s", invo_name, chset);
        if ((cp = context_find (buffer)))
     if (chset != NULL && !check_charset (chset, strlen (chset))) {
        snprintf (buffer, sizeof(buffer), "%s-charset-%s", invo_name, chset);
        if ((cp = context_find (buffer)))

-           ct->c_termproc = getcpy (cp);
+           ct->c_termproc = mh_xstrdup(cp);

     }
 
     return OK;
     }
 
     return OK;


@@ -1060,7 +1086,7 @@ InitText (CT ct)
 static int
 InitMultiPart (CT ct)
 {
 static int
 InitMultiPart (CT ct)
 {

-    int        inout;
+    bool inout;

     long last, pos;
     char *cp, *dp;
     PM pm;
     long last, pos;
     char *cp, *dp;
     PM pm;


@@ -1076,24 +1102,24 @@ InitMultiPart (CT ct)
 
     /*
      * The encoding for multipart messages must be either
 
     /*
      * 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. */
      */
     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';
 
        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).  One workaround "
-                 "is to\nmanually 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;
        free (cte);
 
        return NOTOK;


@@ -1116,22 +1142,20 @@ InitMultiPart (CT ct)
 
     /* complain if boundary parameter is missing */
     if (!pm) {
 
     /* 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;
     }
 
     /* allocate primary structure for multipart info */
        return NOTOK;
     }
 
     /* allocate primary structure for multipart info */

-    if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)
-       adios (NULL, "out of memory");
+    NEW0(m);

     ct->c_ctparams = (void *) m;
 
     /* check if boundary parameter contains only whitespace characters */
     for (cp = bp; isspace ((unsigned char) *cp); cp++)
        continue;
     if (!*cp) {
     ct->c_ctparams = (void *) m;
 
     /* check if boundary parameter contains only whitespace characters */
     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;
     }
                ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
        return NOTOK;
     }


@@ -1155,7 +1179,7 @@ InitMultiPart (CT ct)
     last = ct->c_end;
     next = &m->mp_parts;
     part = NULL;
     last = ct->c_end;
     next = &m->mp_parts;
     part = NULL;

-    inout = 1;
+    inout = true;

 
     while ((gotlen = getline(&bufp, &buflen, fp)) != -1) {
        if (pos > last)
 
     while ((gotlen = getline(&bufp, &buflen, fp)) != -1) {
        if (pos > last)


@@ -1168,8 +1192,7 @@ InitMultiPart (CT ct)
            if (strcmp (bufp + 2, m->mp_start))
                continue;
 next_part:
            if (strcmp (bufp + 2, m->mp_start))
                continue;
 next_part:

-           if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
-               adios (NULL, "out of memory");
+           NEW0(part);

            *next = part;
            next = &part->mp_next;
 
            *next = part;
            next = &part->mp_next;
 


@@ -1183,10 +1206,10 @@ next_part:
            part->mp_part = p;
            pos = p->c_begin;
            fseek (fp, pos, SEEK_SET);
            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) {
        } 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);
 end_part:
                p = part->mp_part;
                p->c_end = ftell(fp) - (gotlen + 1);


@@ -1195,17 +1218,16 @@ end_part:
                if (inout)
                    goto next_part;
                goto last_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) {
        }
     }
 
     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;
 
     if (!inout && part) {
        p = part->mp_part;


@@ -1217,14 +1239,16 @@ end_part:
                continue;
            *next = NULL;
            free_content (p);
                continue;
            *next = NULL;
            free_content (p);

-           free ((char *) part);
+           free(part);

        }
     }
 
 last_part:
     /* reverse the order of the parts for multipart/alternative */
        }
     }
 
 last_part:
     /* reverse the order of the parts for multipart/alternative */

-    if (ct->c_subtype == MULTI_ALTERNATE)
+    if (ct->c_subtype == MULTI_ALTERNATE) {

        reverse_parts (ct);
        reverse_parts (ct);

+       prefer_parts (ct);
+    }

 
     /*
      * label all subparts with part number, and
 
     /*
      * label all subparts with part number, and


@@ -1247,7 +1271,7 @@ last_part:
            p = part->mp_part;
 
            sprintf (pp, "%d", partnum);
            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) {
 
            /* initialize the content of the subparts */
            if (p->c_ctinitfnx && (*p->c_ctinitfnx) (p) == NOTOK) {


@@ -1270,9 +1294,15 @@ last_part:
 
 
 /*
 
 
 /*

- * reverse the order of the parts of a multipart/alternative
+ * reverse the order of the parts of a multipart/alternative,
+ * presumably to put the "most favored" alternative first, for
+ * 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...  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."

  */
  */

-

 static void
 reverse_parts (CT ct)
 {
 static void
 reverse_parts (CT ct)
 {


@@ -1289,6 +1319,60 @@ reverse_parts (CT ct)
     }
 }
 
     }
 }
 

+static void
+move_preferred_part(CT ct, mime_type_subtype *pref)
+{
+    struct multipart *m = (struct multipart *) ct->c_ctparams;
+    struct part *part, *prev, *head, *nhead, *ntail;
+    struct part h, n;
+    CI ci;
+
+    /* move the matching part(s) to the head of the list:  walk the
+     * list of parts, move matching parts to a new list (maintaining
+     * their order), and finally, concatenate the old list onto the
+     * new.
+     */
+
+    head = &h;
+    nhead = &n;
+
+    head->mp_next = m->mp_parts;
+    nhead->mp_next = NULL;
+    ntail = nhead;
+
+    prev = head;
+    part = head->mp_next;
+    while (part != NULL) {
+       ci = &part->mp_part->c_ctinfo;
+       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;
+           ntail = part;
+           part = prev->mp_next;
+       } else {
+           prev = part;
+           part = prev->mp_next;
+       }
+    }
+    ntail->mp_next = head->mp_next;
+    m->mp_parts = nhead->mp_next;
+}
+
+/*
+ * move parts that match the user's preferences (-prefer) to the head
+ * of the line.  process preferences in reverse so first one given
+ * ends up first in line
+ */
+static void
+prefer_parts(CT ct)
+{
+    int i;
+    for (i = 0; i < npreferred; i++)
+       move_preferred_part(ct, mime_preference + i);
+}

 
 
 
 
 
 


@@ -1297,7 +1381,8 @@ reverse_parts (CT ct)
    example, a text/plain part before a text/html part in a
    multipart/alternative part, for example, where it belongs. */
 void
    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;
     if (ct->c_type == CT_MULTIPART) {
         struct multipart *m = (struct multipart *) ct->c_ctparams;
         struct part *part;


@@ -1324,9 +1409,9 @@ InitMessage (CT ct)
     CI ci = &ct->c_ctinfo;
 
     if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT)) {
     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;
     }
 
        return NOTOK;
     }
 


@@ -1346,24 +1431,22 @@ InitMessage (CT ct)
                PM pm;
                struct partial *p;
 
                PM pm;
                struct partial *p;
 

-               if ((p = (struct partial *) mh_xcalloc (1, sizeof(*p))) == NULL)
-                   adios (NULL, "out of memory");
+               NEW0(p);

                ct->c_ctparams = (void *) p;
 
                /* scan for parameters "id", "number", and "total" */
                for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
                    if (!strcasecmp (pm->pm_name, "id")) {
                ct->c_ctparams = (void *) p;
 
                /* 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:
                        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;
                            return NOTOK;
                        }
                        continue;


@@ -1379,10 +1462,8 @@ invalid_param:
                if (!p->pm_partid
                        || !p->pm_partno
                        || (p->pm_maxno && p->pm_partno > p->pm_maxno)) {
                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;
                }
            }
                    return NOTOK;
                }
            }


@@ -1395,8 +1476,7 @@ invalid_param:
                CT p;
                FILE *fp;
 
                CT p;
                FILE *fp;
 

-               if ((e = (struct exbody *) mh_xcalloc (1, sizeof(*e))) == NULL)
-                   adios (NULL, "out of memory");
+               NEW0(e);

                ct->c_ctparams = (void *) e;
 
                if (!ct->c_fp
                ct->c_ctparams = (void *) e;
 
                if (!ct->c_fp


@@ -1420,14 +1500,14 @@ invalid_param:
                        && p->c_ceopenfnx == openMail) {
                    int cc, size;
                    char *bp;
                        && p->c_ceopenfnx == openMail) {
                    int cc, size;
                    char *bp;

-                   
+

                    if ((size = ct->c_end - p->c_begin) <= 0) {
                        if (!e->eb_subject)
                            content_error (NULL, ct,
                                           "empty body for access-type=mail-server");
                        goto no_body;
                    }
                    if ((size = ct->c_end - p->c_begin) <= 0) {
                        if (!e->eb_subject)
                            content_error (NULL, ct,
                                           "empty body for access-type=mail-server");
                        goto no_body;
                    }

-                   
+

                    e->eb_body = bp = mh_xmalloc ((unsigned) size);
                    fseek (p->c_fp, p->c_begin, SEEK_SET);
                    while (size > 0)
                    e->eb_body = bp = mh_xmalloc ((unsigned) size);
                    fseek (p->c_fp, p->c_begin, SEEK_SET);
                    while (size > 0)


@@ -1436,7 +1516,7 @@ invalid_param:
                                adios ("failed", "fread");
 
                            case OK:
                                adios ("failed", "fread");
 
                            case OK:

-                               adios (NULL, "unexpected EOF from fread");
+                               die("unexpected EOF from fread");

 
                            default:
                                bp += cc, size -= cc;
 
                            default:
                                bp += cc, size -= cc;


@@ -1463,7 +1543,7 @@ no_body:
                    case CT_MESSAGE:
                        if (p->c_subtype != MESSAGE_RFC822)
                            break;
                    case CT_MESSAGE:
                        if (p->c_subtype != MESSAGE_RFC822)
                            break;

-                       /* else fall... */
+                       /* FALLTHRU */

                    default:
                        e->eb_partno = ct->c_partno;
                        if (p->c_ctinitfnx)
                    default:
                        e->eb_partno = ct->c_partno;
                        if (p->c_ctinitfnx)


@@ -1568,9 +1648,8 @@ params_external (CT ct, int composing)
     }
 
     if (!e->eb_access) {
     }
 
     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;
     }
 
        return NOTOK;
     }
 


@@ -1636,16 +1715,15 @@ size_encoding (CT ct)
     if (ce->ce_file) {
        if (stat (ce->ce_file, &st) != NOTOK)
            return (long) st.st_size;
     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)
     }
 
     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)
 
     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;
 
     if (fstat (fd, &st) != NOTOK)
        size = (long) st.st_size;


@@ -1661,26 +1739,6 @@ size_encoding (CT ct)
  * BASE64
  */
 
  * BASE64
  */
 

-static unsigned char b642nib[0x80] = {
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0x3e, 0xff, 0xff, 0xff, 0x3f,
-    0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
-    0x3c, 0x3d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 
-    0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
-    0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
-    0x17, 0x18, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 
-    0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-    0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
-    0x31, 0x32, 0x33, 0xff, 0xff, 0xff, 0xff, 0xff
-};
-
-

 static int
 InitBase64 (CT ct)
 {
 static int
 InitBase64 (CT ct)
 {


@@ -1691,15 +1749,16 @@ InitBase64 (CT ct)
 static int
 openBase64 (CT ct, char **file)
 {
 static int
 openBase64 (CT ct, char **file)
 {

-    int        bitno, cc, digested;
-    int fd, len, skip, own_ct_fp = 0, text = ct->c_type == CT_TEXT;
-    uint32_t bits;
-    unsigned char value, b;
-    char *cp, *ep, buffer[BUFSIZ];
+    ssize_t cc, len;
+    int fd;
+    bool own_ct_fp = false;
+    char *cp, *buffer = NULL;

     /* sbeck -- handle suffixes */
     CI ci;
     CE ce = &ct->c_cefile;
     /* sbeck -- handle suffixes */
     CI ci;
     CE ce = &ct->c_cefile;

-    MD5_CTX mdContext;
+    unsigned char *decoded;
+    size_t decoded_len;
+    unsigned char digest[16];

 
     if (ce->ce_fp) {
        fseek (ce->ce_fp, 0L, SEEK_SET);
 
     if (ce->ce_fp) {
        fseek (ce->ce_fp, 0L, SEEK_SET);


@@ -1717,7 +1776,7 @@ openBase64 (CT ct, char **file)
     if (*file == NULL) {
        ce->ce_unlink = 1;
     } else {
     if (*file == NULL) {
        ce->ce_unlink = 1;
     } else {

-       ce->ce_file = add (*file, NULL);
+       ce->ce_file = mh_xstrdup(*file);

        ce->ce_unlink = 0;
     }
 
        ce->ce_unlink = 0;
     }
 


@@ -1727,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) {
        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 {
                      get_temp_dir());
            }
        } else {


@@ -1736,10 +1795,10 @@ openBase64 (CT ct, char **file)
     } else if (*file == NULL) {
        char *tempfile;
        if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
     } 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());
        }
                  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) {
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {


@@ -1748,26 +1807,22 @@ openBase64 (CT ct, char **file)
     }
 
     if ((len = ct->c_end - ct->c_begin) < 0)
     }
 
     if ((len = ct->c_end - ct->c_begin) < 0)

-       adios (NULL, "internal error(1)");
+       die("internal error(1)");
+
+    buffer = mh_xmalloc (len + 1);

 
     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;
        }
 
     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);
-
-    bitno = 18;
-    bits = 0L;
-    skip = 0;

 
     lseek (fd = fileno (ct->c_fp), (off_t) ct->c_begin, SEEK_SET);
 
     lseek (fd = fileno (ct->c_fp), (off_t) ct->c_begin, SEEK_SET);

+    cp = buffer;

     while (len > 0) {
     while (len > 0) {

-       switch (cc = read (fd, buffer, sizeof(buffer) - 1)) {
+       switch (cc = read (fd, cp, len)) {

        case NOTOK:
            content_error (ct->c_file, ct, "error reading from");
            goto clean_up;
        case NOTOK:
            content_error (ct->c_file, ct, "error reading from");
            goto clean_up;


@@ -1780,75 +1835,42 @@ openBase64 (CT ct, char **file)
            if (cc > len)
                cc = len;
            len -= cc;
            if (cc > len)
                cc = len;
            len -= cc;

+            cp += cc;
+        }
+    }

 
 

-           for (ep = (cp = buffer) + cc; cp < ep; cp++) {
-               switch (*cp) {
-               default:
-                   if (isspace ((unsigned char) *cp))
-                       break;
-                   if (skip || (((unsigned char) *cp) & 0x80)
-                       || (value = b642nib[((unsigned char) *cp) & 0x7f]) > 0x3f) {
-                       if (debugsw) {
-                           fprintf (stderr, "*cp=0x%x pos=%ld skip=%d\n",
-                               (unsigned char) *cp,
-                               (long) (lseek (fd, (off_t) 0, SEEK_CUR) - (ep - cp)),
-                               skip);
-                       }
-                       content_error (NULL, ct,
-                                      "invalid BASE64 encoding -- continuing");
-                       continue;
-                   }
-
-                   bits |= value << bitno;
-test_end:
-                   if ((bitno -= 6) < 0) {
-                       b = (bits >> 16) & 0xff;
-                       if (!text || b != '\r')
-                           putc ((char) b, ce->ce_fp);
-                       if (digested)
-                           MD5Update (&mdContext, &b, 1);
-                       if (skip < 2) {
-                           b = (bits >> 8) & 0xff;
-                           if (! text || b != '\r')
-                               putc ((char) b, ce->ce_fp);
-                           if (digested)
-                               MD5Update (&mdContext, &b, 1);
-                           if (skip < 1) {
-                               b = bits & 0xff;
-                               if (! text || b != '\r')
-                                   putc ((char) b, ce->ce_fp);
-                               if (digested)
-                                   MD5Update (&mdContext, &b, 1);
-                           }
-                       }
+    /* decodeBase64() requires null-terminated input. */
+    *cp = '\0';

 
 

-                       if (ferror (ce->ce_fp)) {
-                           content_error (ce->ce_file, ct,
-                                          "error writing to");
-                           goto clean_up;
-                       }
-                       bitno = 18, bits = 0L, skip = 0;
-                   }
-                   break;
+    if (decodeBase64 (buffer, &decoded, &decoded_len, ct->c_type == CT_TEXT,
+                      ct->c_digested ? digest : NULL) != OK)
+        goto clean_up;

 
 

-               case '=':
-                   if (++skip > 3)
-                       goto self_delimiting;
-                   goto test_end;
-               }
-           }
-       }
-    }
-
-    if (bitno != 18) {
-       if (debugsw)
-           fprintf (stderr, "premature ending (bitno %d)\n", bitno);
+    {
+        size_t i;
+        unsigned char *decoded_p = decoded;
+        for (i = 0; i < decoded_len; ++i) {
+            putc (*decoded_p++, ce->ce_fp);
+        }
+        free(decoded);
+        if (ferror (ce->ce_fp)) {
+            content_error (ce->ce_file, ct, "error writing to");
+            goto clean_up;
+        }

 
 

-       content_error (NULL, ct, "invalid BASE64 encoding");
-       goto clean_up;
+        if (ct->c_digested) {
+            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");
+                }
+            }
+        }

     }
 
     }
 

-self_delimiting:

     fseek (ct->c_fp, 0L, SEEK_SET);
 
     if (fflush (ce->ce_fp)) {
     fseek (ct->c_fp, 0L, SEEK_SET);
 
     if (fflush (ce->ce_fp)) {


@@ -1856,19 +1878,6 @@ self_delimiting:
        goto clean_up;
     }
 
        goto clean_up;
     }
 

-    if (digested) {
-       unsigned char digest[16];
-
-       MD5Final (digest, &mdContext);
-       if (memcmp((char *) digest, (char *) ct->c_digest,
-                  sizeof(digest) / sizeof(digest[0])))
-           content_error (NULL, ct,
-                          "content integrity suspect (digest mismatch) -- continuing");
-       else
-           if (debugsw)
-               fprintf (stderr, "content integrity confirmed\n");
-    }
-

     fseek (ce->ce_fp, 0L, SEEK_SET);
 
 ready_to_go:
     fseek (ce->ce_fp, 0L, SEEK_SET);
 
 ready_to_go:


@@ -1877,6 +1886,7 @@ ready_to_go:
       fclose (ct->c_fp);
       ct->c_fp = NULL;
     }
       fclose (ct->c_fp);
       ct->c_fp = NULL;
     }

+    free (buffer);

     return fileno (ce->ce_fp);
 
 clean_up:
     return fileno (ce->ce_fp);
 
 clean_up:


@@ -1885,6 +1895,7 @@ clean_up:
       ct->c_fp = NULL;
     }
     free_encoding (ct, 0);
       ct->c_fp = NULL;
     }
     free_encoding (ct, 0);

+    free (buffer);

     return NOTOK;
 }
 
     return NOTOK;
 }
 


@@ -1902,18 +1913,18 @@ static char hex2nib[0x80] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
     0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
     0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-    0x00, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x00, 
+    0x00, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x00,

     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-    0x00, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, 
+    0x00, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00,

     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
 
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
 

-static int 
+static int

 InitQuoted (CT ct)
 {
     return init_encoding (ct, openQuoted);
 InitQuoted (CT ct)
 {
     return init_encoding (ct, openQuoted);


@@ -1923,7 +1934,8 @@ InitQuoted (CT ct)
 static int
 openQuoted (CT ct, char **file)
 {
 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;
     char *cp, *ep;
     char *bufp = NULL;
     size_t buflen;


@@ -1950,7 +1962,7 @@ openQuoted (CT ct, char **file)
     if (*file == NULL) {
        ce->ce_unlink = 1;
     } else {
     if (*file == NULL) {
        ce->ce_unlink = 1;
     } else {

-       ce->ce_file = add (*file, NULL);
+       ce->ce_file = mh_xstrdup(*file);

        ce->ce_unlink = 0;
     }
 
        ce->ce_unlink = 0;
     }
 


@@ -1960,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) {
        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 {
                      get_temp_dir());
            }
        } else {


@@ -1969,10 +1981,10 @@ openQuoted (CT ct, char **file)
     } else if (*file == NULL) {
        char *tempfile;
        if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
     } 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());
        }
                  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) {
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {


@@ -1981,23 +1993,20 @@ openQuoted (CT ct, char **file)
     }
 
     if ((len = ct->c_end - ct->c_begin) < 0)
     }
 
     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;
        }
 
     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;
     }
 
     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) {
 
     fseek (ct->c_fp, ct->c_begin, SEEK_SET);
     while (len > 0) {


@@ -2013,7 +2022,8 @@ openQuoted (CT ct, char **file)
        for (ep = (cp = bufp) + cc - 1; cp <= ep; ep--)
            if (!isspace ((unsigned char) *ep))
                break;
        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) {
 
        for (; cp < ep; cp++) {
            if (quoted > 0) {


@@ -2059,11 +2069,10 @@ openQuoted (CT ct, char **file)
                     * sequence; let's decode it (above). */
                    quoted = 1;
                    continue;
                     * 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. */
            }
 
            /* Just show the raw byte. */


@@ -2098,13 +2107,12 @@ openQuoted (CT ct, char **file)
        unsigned char digest[16];
 
        MD5Final (digest, &mdContext);
        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");
            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);
     }
 
     fseek (ce->ce_fp, 0L, SEEK_SET);


@@ -2147,7 +2155,8 @@ Init7Bit (CT ct)
 int
 open7Bit (CT ct, char **file)
 {
 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;
     char buffer[BUFSIZ];
     /* sbeck -- handle suffixes */
     char *cp;


@@ -2170,7 +2179,7 @@ open7Bit (CT ct, char **file)
     if (*file == NULL) {
        ce->ce_unlink = 1;
     } else {
     if (*file == NULL) {
        ce->ce_unlink = 1;
     } else {

-       ce->ce_file = add (*file, NULL);
+       ce->ce_file = mh_xstrdup(*file);

        ce->ce_unlink = 0;
     }
 
        ce->ce_unlink = 0;
     }
 


@@ -2180,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) {
        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 {
                      get_temp_dir());
            }
        } else {


@@ -2189,10 +2198,10 @@ open7Bit (CT ct, char **file)
     } else if (*file == NULL) {
        char *tempfile;
        if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
     } 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());
        }
                  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) {
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {


@@ -2206,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 = 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);
 
            + 1 + strlen (ci->ci_subtype);
        buffer = output_params(len, ci->ci_first_pm, &len, 0);
 


@@ -2238,14 +2247,14 @@ open7Bit (CT ct, char **file)
     }
 
     if ((len = ct->c_end - ct->c_begin) < 0)
     }
 
     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;
        }
 
     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);
     }
 
     lseek (fd = fileno (ct->c_fp), (off_t) ct->c_begin, SEEK_SET);


@@ -2322,18 +2331,17 @@ openExternal (CT ct, CT cb, CE ce, char **file, int *fd)
        goto ready_already;
     }
 
        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"))) {
                cachefile, sizeof(cachefile)) != NOTOK) {
        if ((ce->ce_fp = fopen (cachefile, "r"))) {

-           ce->ce_file = getcpy (cachefile);
+           ce->ce_file = mh_xstrdup(cachefile);

            ce->ce_unlink = 0;
            goto ready_already;
            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);
+    *fd = ce->ce_fp ? fileno (ce->ce_fp) : -1;

     return OK;
 
 ready_already:
     return OK;
 
 ready_already:


@@ -2377,7 +2385,7 @@ openFile (CT ct, char **file)
        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    ce->ce_file = getcpy (e->eb_name);
+    ce->ce_file = mh_xstrdup(e->eb_name);

     ce->ce_unlink = 0;
 
     if ((ce->ce_fp = fopen (ce->ce_file, "r")) == NULL) {
     ce->ce_unlink = 0;
 
     if ((ce->ce_fp = fopen (ce->ce_file, "r")) == NULL) {


@@ -2409,12 +2417,10 @@ openFile (CT ct, char **file)
            if (ferror (gp)) {
                admonish (ce->ce_file, "error reading");
                (void) m_unlink (cachefile);
            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);
            fclose (fp);
        }
        umask (mask);


@@ -2439,7 +2445,9 @@ InitFTP (CT ct)
 static int
 openFTP (CT ct, char **file)
 {
 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];
     int len, buflen;
     char *bp, *ftp, *user, *pass;
     char buffer[BUFSIZ], cachefile[BUFSIZ];


@@ -2509,7 +2517,7 @@ openFTP (CT ct, char **file)
     /*
      * Now, check the answer
      */
     /*
      * Now, check the answer
      */

-    if (!getanswer (buffer))
+    if (!read_yes_or_no_if_tty (buffer))

        return NOTOK;
 
     if (e->eb_flags) {
        return NOTOK;
 
     if (e->eb_flags) {


@@ -2518,34 +2526,34 @@ openFTP (CT ct, char **file)
                  LocalName (1));
        pass = buffer;
     } else {
                  LocalName (1));
        pass = buffer;
     } else {

-       ruserpass (e->eb_site, &username, &password);
+       ruserpass (e->eb_site, &username, &password, 0);

        user = username;
        pass = password;
     }
 
     ce->ce_unlink = (*file == NULL);
        user = username;
        pass = password;
     }
 
     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;
     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;

        }
     }
 
     if (*file)
        }
     }
 
     if (*file)

-       ce->ce_file = add (*file, NULL);
+       ce->ce_file = mh_xstrdup(*file);

     else if (caching)
     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) {
     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());
        }
                  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) {
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {


@@ -2554,7 +2562,7 @@ openFTP (CT ct, char **file)
     }
 
     {
     }
 
     {

-       int child_id, i, vecp;
+       int child_id, vecp;

        char *vec[9];
 
        vecp = 0;
        char *vec[9];
 
        vecp = 0;


@@ -2571,8 +2579,7 @@ openFTP (CT ct, char **file)
 
        fflush (stdout);
 
 
        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");
        switch (child_id) {
            case NOTOK:
                adios ("fork", "unable to");


@@ -2583,7 +2590,7 @@ openFTP (CT ct, char **file)
                execvp (ftp, vec);
                fprintf (stderr, "unable to exec ");
                perror (ftp);
                execvp (ftp, vec);
                fprintf (stderr, "unable to exec ");
                perror (ftp);

-               _exit (-1);
+               _exit(1);

                /* NOTREACHED */
 
            default:
                /* NOTREACHED */
 
            default:


@@ -2620,12 +2627,10 @@ openFTP (CT ct, char **file)
                if (ferror (gp)) {
                    admonish (ce->ce_file, "error reading");
                    (void) m_unlink (cachefile);
                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);
                fclose (fp);
            }
            umask (mask);


@@ -2652,7 +2657,7 @@ InitMail (CT ct)
 static int
 openMail (CT ct, char **file)
 {
 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;
     int len, buflen;
     char *bp, buffer[BUFSIZ], *vec[7];
     struct exbody *e = ct->c_ctexbody;


@@ -2696,7 +2701,7 @@ openMail (CT ct, char **file)
                    e->eb_subject ? e->eb_subject : e->eb_body);
 
     /* Now, check answer */
                    e->eb_subject ? e->eb_subject : e->eb_body);
 
     /* Now, check answer */

-    if (!getanswer (buffer))
+    if (!read_yes_or_no_if_tty (buffer))

        return NOTOK;
 
     vecp = 0;
        return NOTOK;
 
     vecp = 0;


@@ -2708,8 +2713,7 @@ openMail (CT ct, char **file)
     vec[vecp++] = e->eb_body;
     vec[vecp] = NULL;
 
     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");
     switch (child_id) {
        case NOTOK:
            advise ("fork", "unable to");


@@ -2719,25 +2723,25 @@ openMail (CT ct, char **file)
            execvp (mailproc, vec);
            fprintf (stderr, "unable to exec ");
            perror (mailproc);
            execvp (mailproc, vec);
            fprintf (stderr, "unable to exec ");
            perror (mailproc);

-           _exit (-1);
+           _exit(1);

            /* NOTREACHED */
 
        default:
            if (pidXwait (child_id, NULL) == OK)
            /* 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) {
            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());
        }
                  get_temp_dir());
        }

-       ce->ce_file = add (tempfile, NULL);
+       ce->ce_file = mh_xstrdup(tempfile);

        ce->ce_unlink = 1;
     } else {
        ce->ce_unlink = 1;
     } else {

-       ce->ce_file = add (*file, NULL);
+       ce->ce_file = mh_xstrdup(*file);

        ce->ce_unlink = 0;
     }
 
        ce->ce_unlink = 0;
     }
 


@@ -2748,9 +2752,8 @@ openMail (CT ct, char **file)
 
     /* showproc is for mhshow and mhstore, though mhlist -debug
      * prints it, too. */
 
     /* 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);
+    free(ct->c_showproc);
+    ct->c_showproc = mh_xstrdup("true");

 
     fseek (ce->ce_fp, 0L, SEEK_SET);
     *file = ce->ce_file;
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
     *file = ce->ce_file;


@@ -2776,7 +2779,9 @@ openURL (CT ct, char **file)
     CE ce = &ct->c_cefile;
     char *urlprog, *program;
     char buffer[BUFSIZ], cachefile[BUFSIZ];
     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;
 
     struct msgs_array args = { 0, 0, NULL};
     pid_t child_id;
 


@@ -2805,28 +2810,28 @@ openURL (CT ct, char **file)
     }
 
     ce->ce_unlink = (*file == NULL);
     }
 
     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;
     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;

        }
     }
 
     if (*file)
        }
     }
 
     if (*file)

-       ce->ce_file = add(*file, NULL);
+        ce->ce_file = mh_xstrdup(*file);

     else if (caching)
     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) {
     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());
        }
                  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) {
     }
 
     if ((ce->ce_fp = fopen(ce->ce_file, "w+")) == NULL) {


@@ -2848,7 +2853,7 @@ openURL (CT ct, char **file)
        execvp(program, args.msgs);
        fprintf(stderr, "Unable to exec ");
        perror(program);
        execvp(program, args.msgs);
        fprintf(stderr, "Unable to exec ");
        perror(program);

-       _exit(-1);
+       _exit(1);

        /* NOTREACHED */
 
     default:
        /* NOTREACHED */
 
     default:


@@ -2891,82 +2896,47 @@ openURL (CT ct, char **file)
 
     fseeko(ce->ce_fp, 0, SEEK_SET);
     *file = ce->ce_file;
 
     fseeko(ce->ce_fp, 0, SEEK_SET);
     *file = ce->ce_file;

-    return fd;
+    return fileno(ce->ce_fp);

 }
 
 }
 

+
+/*
+ * Stores MD5 digest (in cp, from Content-MD5 header) in ct->c_digest.  It
+ * has to be base64 decoded.
+ */

 static int
 readDigest (CT ct, char *cp)
 {
 static int
 readDigest (CT ct, char *cp)
 {

-    int        bitno, skip;
-    uint32_t bits;
-    char *bp = cp;
-    unsigned char *dp, value, *ep;
-
-    bitno = 18;
-    bits = 0L;
-    skip = 0;
-
-    for (ep = (dp = ct->c_digest)
-                + sizeof(ct->c_digest) / sizeof(ct->c_digest[0]); *cp; cp++)
-       switch (*cp) {
-           default:
-               if (skip
-                       || (*cp & 0x80)
-                       || (value = b642nib[*cp & 0x7f]) > 0x3f) {
-                   if (debugsw)
-                       fprintf (stderr, "invalid BASE64 encoding\n");
-                   return NOTOK;
-               }
+    unsigned char *digest;

 
 

-               bits |= value << bitno;
-test_end:
-               if ((bitno -= 6) < 0) {
-                   if (dp + (3 - skip) > ep)
-                       goto invalid_digest;
-                   *dp++ = (bits >> 16) & 0xff;
-                   if (skip < 2) {
-                       *dp++ = (bits >> 8) & 0xff;
-                       if (skip < 1)
-                           *dp++ = bits & 0xff;
-                   }
-                   bitno = 18;
-                   bits = 0L;
-                   skip = 0;
-               }
-               break;
+    size_t len;
+    if (decodeBase64 (cp, &digest, &len, 0, NULL) == OK) {
+        const size_t maxlen = sizeof ct->c_digest;

 
 

-           case '=':
-               if (++skip > 3)
-                   goto self_delimiting;
-               goto test_end;
-       }
-    if (bitno != 18) {
-       if (debugsw)
-           fprintf (stderr, "premature ending (bitno %d)\n", bitno);
+        if (strlen ((char *) digest) <= maxlen) {
+            memcpy (ct->c_digest, digest, maxlen);

 
 

-       return NOTOK;
-    }
-self_delimiting:
-    if (dp != ep) {
-invalid_digest:
-       if (debugsw) {
-           while (*cp)
-               cp++;
-           fprintf (stderr, "invalid MD5 digest (got %d octets)\n",
-                    (int)(cp - bp));
-       }
+            if (debugsw) {
+                size_t i;

 
 

-       return NOTOK;
-    }
+                fprintf (stderr, "MD5 digest=");
+                for (i = 0; i < maxlen; ++i) {
+                    fprintf (stderr, "%02x", ct->c_digest[i] & 0xff);
+                }
+                fprintf (stderr, "\n");
+            }

 
 

-    if (debugsw) {
-       fprintf (stderr, "MD5 digest=");
-       for (dp = ct->c_digest; dp < ep; dp++)
-           fprintf (stderr, "%02x", *dp & 0xff);
-       fprintf (stderr, "\n");
+            return OK;
+        }
+        if (debugsw) {
+            fprintf (stderr, "invalid MD5 digest (got %d octets)\n",
+                     (int) strlen ((char *) digest));
+        }
+
+        return NOTOK;

     }
 
     }
 

-    return OK;
+    return NOTOK;

 }
 
 
 }
 
 


@@ -2978,7 +2948,7 @@ get_leftover_mp_content (CT ct, int before /* or after */)
 {
     struct multipart *m = (struct multipart *) ct->c_ctparams;
     char *boundary;
 {
     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;
     int max = BUFSIZ;
     char *bufp = NULL;
     size_t buflen;


@@ -3023,11 +2993,11 @@ get_leftover_mp_content (CT ct, int before /* or after */)
 
         if (before) {
             if (! strcmp (bufp, boundary)) {
 
         if (before) {
             if (! strcmp (bufp, boundary)) {

-                found_boundary = 1;
+                found_boundary = true;

             }
         } else {
             if (! found_boundary  &&  ! strcmp (bufp, boundary)) {
             }
         } else {
             if (! found_boundary  &&  ! strcmp (bufp, boundary)) {

-                found_boundary = 1;
+                found_boundary = true;

                 continue;
             }
         }
                 continue;
             }
         }


@@ -3081,7 +3051,8 @@ get_leftover_mp_content (CT ct, int before /* or after */)
 
 
 char *
 
 
 char *

-ct_type_str (int type) {
+ct_type_str (int type)
+{

     switch (type) {
     case CT_APPLICATION:
         return "application";
     switch (type) {
     case CT_APPLICATION:
         return "application";


@@ -3106,7 +3077,8 @@ ct_type_str (int type) {
 
 
 char *
 
 
 char *

-ct_subtype_str (int type, int subtype) {
+ct_subtype_str (int type, int subtype)
+{

     switch (type) {
     case CT_APPLICATION:
         switch (subtype) {
     switch (type) {
     case CT_APPLICATION:
         switch (subtype) {


@@ -3161,7 +3133,8 @@ ct_subtype_str (int type, int subtype) {
 
 
 int
 
 
 int

-ct_str_type (const char *type) {
+ct_str_type (const char *type)
+{

     struct str2init *s2i;
 
     for (s2i = str2cts; s2i->si_key; ++s2i) {
     struct str2init *s2i;
 
     for (s2i = str2cts; s2i->si_key; ++s2i) {


@@ -3178,7 +3151,8 @@ ct_str_type (const char *type) {
 
 
 int
 
 
 int

-ct_str_subtype (int type, const char *subtype) {
+ct_str_subtype (int type, const char *subtype)
+{

     struct k2v *kv;
 
     switch (type) {
     struct k2v *kv;
 
     switch (type) {


@@ -3218,7 +3192,8 @@ ct_str_subtype (int type, const char *subtype) {
 
 /* Find the content type and InitFunc for the CT. */
 const struct str2init *
 
 /* 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) {
     const struct str2init *sp;
 
     for (sp = str2cts; sp->si_key; ++sp) {


@@ -3231,7 +3206,8 @@ get_ct_init (int type) {
 }
 
 const char *
 }
 
 const char *

-ce_str (int encoding) {
+ce_str (int encoding)
+{

     switch (encoding) {
     case CE_BASE64:
         return "base64";
     switch (encoding) {
     case CE_BASE64:
         return "base64";


@@ -3254,7 +3230,8 @@ ce_str (int encoding) {
 
 /* Find the content type and InitFunc for the content encoding method. */
 const struct str2init *
 
 /* 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) {
     struct str2init *sp;
 
     for (sp = str2ces; sp->si_key; ++sp) {


@@ -3308,7 +3285,9 @@ parse_header_attrs (const char *filename, const char *fieldname,
 
     while (*cp == ';') {
        char *dp, *vp, *up, *nameptr, *valptr, *charset = NULL, *lang = NULL;
 
     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))
 
        cp++;
        while (isspace ((unsigned char) *cp))


@@ -3321,27 +3300,22 @@ parse_header_attrs (const char *filename, const char *fieldname,
 
        if (*cp == 0) {
            if (! suppress_extraneous_trailing_semicolon_warning) {
 
        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++)
            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 != '=') {
 
        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;
        }
 
            return NOTOK;
        }
 


@@ -3363,17 +3337,17 @@ parse_header_attrs (const char *filename, const char *fieldname,
 
        for (vp = cp; vp < up; vp++) {
            if (*vp == '*' && vp < up - 1) {
 
        for (vp = cp; vp < up; vp++) {
            if (*vp == '*' && vp < up - 1) {

-               partial = 1;
+               partial = true;

                continue;
                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 {
            } 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 {
                    return NOTOK;
                }
            } else {


@@ -3415,9 +3389,8 @@ parse_header_attrs (const char *filename, const char *fieldname,
                    }
                    vp++;
                } else {
                    }
                    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;
                }
                    free(nameptr);
                    return NOTOK;
                }


@@ -3438,12 +3411,10 @@ parse_header_attrs (const char *filename, const char *fieldname,
                    }
                    vp++;
                } else {
                    }
                    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);
                    free(nameptr);

-                   if (charset)
-                       free(charset);
+                    free(charset);

                    return NOTOK;
                }
 
                    return NOTOK;
                }
 


@@ -3463,15 +3434,11 @@ parse_header_attrs (const char *filename, const char *fieldname,
                                !isxdigit((unsigned char) *(vp + 1)) ||
                                *(vp + 2) == '\0' ||
                                !isxdigit((unsigned char) *(vp + 2))) {
                                !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);
                        free(nameptr);

-                       if (charset)
-                           free(charset);
-                       if (lang)
-                           free(lang);
+                        free(charset);
+                        free(lang);

                        return NOTOK;
                    }
                    vp += 2;
                        return NOTOK;
                    }
                    vp += 2;


@@ -3508,16 +3475,11 @@ parse_header_attrs (const char *filename, const char *fieldname,
                    switch (*cp++) {
                    case '\0':
 bad_quote:
                    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);
                        free(nameptr);

-                       if (charset)
-                           free(charset);
-                       if (lang)
-                           free(lang);
+                        free(charset);
+                        free(lang);

                        return NOTOK;
                    case '"':
                        break;
                        return NOTOK;
                    case '"':
                        break;


@@ -3525,7 +3487,7 @@ bad_quote:
                    case '\\':
                        if (*++cp == '\0')
                            goto bad_quote;
                    case '\\':
                        if (*++cp == '\0')
                            goto bad_quote;

-                       /* FALL THROUGH */
+                       /* FALLTHRU */

                    default:
                        len++;
                        continue;
                    default:
                        len++;
                        continue;


@@ -3569,13 +3531,15 @@ bad_quote:
 
        if (partial) {
            for (pp = phead; pp != NULL; pp = pp->next) {
 
        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;
                    break;

+                }

            }
 
            if (pp == NULL) {
            }
 
            if (pp == NULL) {

-               pp = mh_xmalloc(sizeof(*pp));
-               memset(pp, 0, sizeof(*pp));
+               NEW0(pp);

                pp->name = nameptr;
                pp->next = phead;
                phead = pp;
                pp->name = nameptr;
                pp->next = phead;
                phead = pp;


@@ -3585,8 +3549,7 @@ bad_quote:
             * Insert this into the section linked list
             */
 
             * Insert this into the section linked list
             */
 

-           sp = mh_xmalloc(sizeof(*sp));
-           memset(sp, 0, sizeof(*sp));
+           NEW0(sp);

            sp->value = valptr;
            sp->index = index;
            sp->len = len;
            sp->value = valptr;
            sp->index = index;
            sp->len = len;


@@ -3597,11 +3560,9 @@ bad_quote:
            } else {
                for (sp2 = pp->sechead; sp2 != NULL; sp2 = sp2->next) {
                    if (sp2->index == sp->index) {
            } 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);
-                       free (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 &&
                        return NOTOK;
                    }
                    if (sp2->index < sp->index &&


@@ -3613,11 +3574,9 @@ bad_quote:
                }
 
                if (sp2 == NULL) {
                }
 
                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);
-                   free (nameptr);
+                    inform("Internal error: cannot insert partial param "
+                        "in message %s's %s: field\n    (parameter %s)",
+                        filename, fieldname, nameptr);

                    return NOTOK;
                }
            }
                    return NOTOK;
                }
            }


@@ -3627,11 +3586,9 @@ bad_quote:
             */
 
            if (index == 0 && encoded) {
             */
 
            if (index == 0 && encoded) {

-               if (pp->charset)
-                   free(pp->charset);
+                free(pp->charset);

                pp->charset = charset;
                pp->charset = charset;

-               if (pp->lang)
-                   free(pp->lang);
+                free(pp->lang);

                pp->lang = lang;
            }
        } else {
                pp->lang = lang;
            }
        } else {


@@ -3659,10 +3616,9 @@ bad_quote:
        int pindex = 0;
        for (sp = pp->sechead; sp != NULL; sp = sp->next) {
            if (sp->index != pindex++) {
        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;
                return NOTOK;
            }
            tlen += sp->len;


@@ -3697,12 +3653,13 @@ bad_quote:
  */
 
 char *
  */
 
 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);
 
     char *ret_charset = NULL;
 
     ret_charset = get_param(ct->c_ctinfo.ci_first_pm, "charset", '?', 0);
 

-    return ret_charset ? ret_charset : getcpy ("US-ASCII");
+    return ret_charset ? ret_charset : mh_xstrdup("US-ASCII");

 }
 
 
 }
 
 


@@ -3730,9 +3687,8 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
            continue;
 
        if (strlen(params->pm_name) > CPERLIN) {
            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);
+            free(paramout);

            return NULL;
        }
 
            return NULL;
        }
 


@@ -3769,8 +3725,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
                                 numchars, valoff);
 
            if (i == 0) {
                                 numchars, valoff);
 
            if (i == 0) {

-               if (paramout)
-                   free(paramout);
+                free(paramout);

                return NULL;
            }
 
                return NULL;
            }
 


@@ -3813,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.
         */
 
         * we're working on a new one.
         */
 


@@ -3833,8 +3788,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
                             strlen(params->pm_value + valoff), valoff);
 
        if (i == 0) {
                             strlen(params->pm_value + valoff), valoff);
 
        if (i == 0) {

-           if (paramout)
-               free(paramout);
+            free(paramout);

            return NULL;
        }
 
            return NULL;
        }
 


@@ -3933,13 +3887,13 @@ param_len(PM pm, int index, size_t valueoff, int *encode, int *cont,
         */
 
        if (! pm->pm_charset) {
         */
 
        if (! pm->pm_charset) {

-           pm->pm_charset = getcpy(write_charset_8bit());
+           pm->pm_charset = mh_xstrdup(write_charset_8bit());

            if (strcasecmp(pm->pm_charset, "US-ASCII") == 0)
            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)
                      "local character set is US-ASCII", pm->pm_name);
        }
        if (! pm->pm_lang)

-           pm->pm_lang = getcpy(NULL); /* Default to a blank lang tag */
+           pm->pm_lang = mh_xstrdup("");       /* Default to a blank lang tag */

 
        len++;          /* For the encoding marker */
        maxfit--;
 
        len++;          /* For the encoding marker */
        maxfit--;


@@ -3983,7 +3937,7 @@ param_len(PM pm, int index, size_t valueoff, int *encode, int *cont,
            case '\\':
                len++;
                maxfit--;
            case '\\':
                len++;
                maxfit--;

-           /* FALL THROUGH */
+           /* FALLTHRU */

            default:
                len++;
                maxfit--;
            default:
                len++;
                maxfit--;


@@ -4010,7 +3964,7 @@ param_len(PM pm, int index, size_t valueoff, int *encode, int *cont,
  * Output an encoded parameter string.
  */
 
  * Output an encoded parameter string.
  */
 

-static size_t
+size_t

 encode_param(PM pm, char *output, size_t len, size_t valuelen,
              size_t valueoff, int index)
 {
 encode_param(PM pm, char *output, size_t len, size_t valuelen,
              size_t valueoff, int index)
 {


@@ -4037,7 +3991,7 @@ encode_param(PM pm, char *output, size_t len, size_t valuelen,
        output += n;
        outlen += n;
        if (output > endptr) {
        output += n;
        outlen += n;
        if (output > endptr) {

-           advise(NULL, "Internal error: parameter buffer overflow");
+           inform("Internal error: parameter buffer overflow");

            return 0;
        }
     }
            return 0;
        }
     }


@@ -4057,7 +4011,7 @@ encode_param(PM pm, char *output, size_t len, size_t valuelen,
            outlen++;
        }
        if (output > endptr) {
            outlen++;
        }
        if (output > endptr) {

-           advise(NULL, "Internal error: parameter buffer overflow");
+           inform("Internal error: parameter buffer overflow");

            return 0;
        }
     }
            return 0;
        }
     }


@@ -4091,18 +4045,19 @@ normal_param(PM pm, char *output, size_t len, size_t valuelen,
        case '"':
            *output++ = '\\';
            outlen++;
        case '"':
            *output++ = '\\';
            outlen++;

+           /* FALLTHRU */

        default:
            *output++ = *p++;
            outlen++;
        }
        if (output > endptr) {
        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) {
            return 0;
        }
     }
 
     if (output - 2 > endptr) {

-       advise(NULL, "Internal error: parameter buffer overflow");
+       inform("Internal error: parameter buffer overflow");

        return 0;
     }
 
        return 0;
     }
 


@@ -4119,10 +4074,9 @@ normal_param(PM pm, char *output, size_t len, size_t valuelen,
 PM
 add_param(PM *first, PM *last, char *name, char *value, int nocopy)
 {
 PM
 add_param(PM *first, PM *last, char *name, char *value, int nocopy)
 {

-    PM pm = mh_xmalloc(sizeof(*pm));
-
-    memset(pm, 0, sizeof(*pm));
+    PM pm;

 
 

+    NEW0(pm);

     pm->pm_name = nocopy ? name : getcpy(name);
     pm->pm_value = nocopy ? value : getcpy(value);
 
     pm->pm_name = nocopy ? name : getcpy(name);
     pm->pm_value = nocopy ? value : getcpy(value);
 


@@ -4176,8 +4130,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;
        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;
     }
        }
        first = first->pm_next;
     }


@@ -4190,7 +4143,8 @@ get_param(PM first, const char *name, char replace, int fetchonly)
  * necessary
  */
 
  * 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);
 {
     static char buffer[4096];          /* I hope no parameters are larger */
     size_t bufsize = sizeof(buffer);


@@ -4260,7 +4214,7 @@ char *get_param_value(PM pm, char replace)
            }
            if (utf8) {
                for (++p, --inbytes;
            }
            if (utf8) {
                for (++p, --inbytes;

-                    inbytes > 0 && (((unsigned char) *q) & 0xc0) == 0x80;
+                    inbytes > 0 && (((unsigned char) *p) & 0xc0) == 0x80;

                     ++p, --inbytes)
                    continue;
            } else {
                     ++p, --inbytes)
                    continue;
            } else {


@@ -4282,13 +4236,13 @@ noiconv:
 #endif /* HAVE_ICONV */
 
     /*
 #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--) {
      */
 
     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;
            *q = *p;
        else
            *q = replace;