h/mime.h: Delete unused isatom(c) macro.

[nmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 5dae9fd7060a61a54980185b36cdcd3877a5fd82..c17bd78598a2b9dda9be4e6e9945df5990fc16b2 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -34,13 +34,16 @@ int checksw = 0;    /* check Content-MD5 field */
  *    in a multipart.
  * 2) Suppress the warning about bogus multipart content, and report it.
  * 3) Suppress the warning about extraneous trailing ';' in header parameter
  *    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 skip_mp_cte_check;
 int suppress_bogus_mp_content_warning;
 int bogus_mp_content;
 int suppress_extraneous_trailing_semicolon_warning;

-int extraneous_trailing_semicolon;
+
+/*
+ * By default, suppress warning about multiple MIME-Version header fields.
+ */

 int suppress_multiple_mime_version_warning = 1;
 
 /* list of preferred type/subtype pairs, for -prefer */
 int suppress_multiple_mime_version_warning = 1;
 
 /* list of preferred type/subtype pairs, for -prefer */


@@ -206,6 +209,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 = 0;

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


@@ -217,7 +223,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) {


@@ -239,6 +245,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;


@@ -247,7 +260,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;
     }
 


@@ -312,8 +325,8 @@ get_content (FILE *in, char *file, int toplevel)
            compnum++;
 
            /* get copies of the buffers */
            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) {
 
            /* if necessary, get rest of field */
            while (state == FLDPLUS) {


@@ -330,7 +343,15 @@ get_content (FILE *in, char *file, int toplevel)
            continue;
 
        case BODY:
            continue;
 
        case BODY:

-           ct->c_begin = ftell (in) - strlen (buf);
+           if (name[0] == ':') {
+               /* Special case:  no blank line between header and body.  The
+                  file position indicator is on the newline at the end of the
+                  line, but it needs to be one prior to the beginning of the
+                  line.  So subtract the length of the line, bufsz, plus 1. */
+               ct->c_begin = ftell (in) - (bufsz + 1);
+           } else {
+               ct->c_begin = ftell (in) - (bufsz - 1);
+           }

            break;
 
        case FILEEOF:
            break;
 
        case FILEEOF:


@@ -392,14 +413,14 @@ 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);
            }
            if (!ct->c_vrsn) {
                ct->c_vrsn = vrsn;
            } else {
                if (! suppress_multiple_mime_version_warning)
                ct->c_file, VRSN_FIELD, cp);
            }
            if (!ct->c_vrsn) {
                ct->c_vrsn = vrsn;
            } else {
                if (! suppress_multiple_mime_version_warning)

-                   advise (NULL, "message %s has multiple %s: fields",
+                   inform("message %s has multiple %s: fields",

                            ct->c_file, VRSN_FIELD);
                free(vrsn);
            }
                            ct->c_file, VRSN_FIELD);
                free(vrsn);
            }


@@ -411,7 +432,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;
            }


@@ -442,7 +463,7 @@ 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;
            }
                        ct->c_file, ENCODING_FIELD);
                goto next_header;
            }


@@ -481,7 +502,7 @@ 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;
            }


@@ -641,19 +662,15 @@ get_ctinfo (char *cp, CT ct, int magic)
     for (dp = cp; istoken (*dp); dp++)
        continue;
     c = *dp, *dp = '\0';
     for (dp = cp; istoken (*dp); dp++)
        continue;
     c = *dp, *dp = '\0';

-    ci->ci_type = add (cp, NULL);      /* store content type */
+    ci->ci_type = mh_xstrdup(cp);      /* store content type */

     *dp = c, cp = dp;
 
     if (!*ci->ci_type) {
     *dp = c, cp = dp;
 
     if (!*ci->ci_type) {

-       advise (NULL, "invalid %s: field in message %s (empty type)",
+       inform("invalid %s: field in message %s (empty type)",

                TYPE_FIELD, ct->c_file);
        return NOTOK;
     }
                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++;


@@ -664,7 +681,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;
     }
 


@@ -679,20 +696,15 @@ get_ctinfo (char *cp, CT ct, int magic)
     for (dp = cp; istoken (*dp); dp++)
        continue;
     c = *dp, *dp = '\0';
     for (dp = cp; istoken (*dp); dp++)
        continue;
     c = *dp, *dp = '\0';

-    ci->ci_subtype = add (cp, NULL);   /* store the content subtype */
+    ci->ci_subtype = mh_xstrdup(cp);   /* store the content subtype */

     *dp = c, cp = dp;
 
     if (!*ci->ci_subtype) {
     *dp = c, cp = dp;
 
     if (!*ci->ci_subtype) {

-       advise (NULL,
-               "invalid %s: field in message %s (empty subtype for \"%s\")",
-               TYPE_FIELD, ct->c_file, ci->ci_type);
+       inform("invalid %s: field in message %s (empty subtype for \"%s\")",
+            TYPE_FIELD, ct->c_file, ci->ci_type);

        return NOTOK;
     }
        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))


@@ -712,12 +724,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;
-       }
+        mh_xfree(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;


@@ -742,7 +752,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;
        }


@@ -769,7 +779,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;
        }


@@ -803,7 +813,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;
        }
 


@@ -820,7 +830,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;
        }
 


@@ -833,7 +843,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.


@@ -846,9 +856,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(%s)",
+                ct->c_file, TYPE_FIELD, strlen(invo_name) + 2, "", cp);

     }
 
     return OK;
     }
 
     return OK;


@@ -900,7 +909,7 @@ get_dispo (char *cp, CT ct, int buildflag)
     for (dp = cp; istoken (*dp); dp++)
        continue;
     c = *dp, *dp = '\0';
     for (dp = cp; istoken (*dp); dp++)
        continue;
     c = *dp, *dp = '\0';

-    ct->c_dispo_type = add (cp, NULL); /* store disposition type */
+    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)
     *dp = c, cp = dp;
 
     if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) == NOTOK)


@@ -914,9 +923,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(%s)",
+            ct->c_file, DISPO_FIELD, strlen(invo_name) + 2, "", cp);

     }
 
     if (buildflag)
     }
 
     if (buildflag)


@@ -944,7 +952,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;
 


@@ -957,7 +965,7 @@ invalid:
 
        case '(':
            i++;
 
        case '(':
            i++;

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

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


@@ -977,7 +985,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);

        }
     }
 
        }
     }
 


@@ -1089,19 +1097,18 @@ InitMultiPart (CT ct)
         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. */
         ct->c_encoding != CE_8BIT  &&  ct->c_encoding != CE_BINARY) {
        /* Copy the Content-Transfer-Encoding header field body so we can
           remove any trailing whitespace and leading blanks from it. */

-       char *cte = add (ct->c_celine ? ct->c_celine : "(null)", NULL);
+       char *cte = mh_xstrdup(ct->c_celine ? ct->c_celine : "(null)");

 
        bp = cte + strlen (cte) - 1;
        while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';
        for (bp = cte; *bp && isblank ((unsigned char) *bp); ++bp) continue;
 
 
        bp = cte + strlen (cte) - 1;
        while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';
        for (bp = cte; *bp && isblank ((unsigned char) *bp); ++bp) continue;
 

-       admonish (NULL,
-                 "\"%s/%s\" type in message %s must be encoded in\n"
-                 "7bit, 8bit, or binary, per RFC 2045 (6.4).  "
-                  "mhfixmsg -fixcte can fix it, or\n"
-                  "manually edit the file and change the \"%s\"\n"
-                 "Content-Transfer-Encoding to one of those.  For now",
-                 ci->ci_type, ci->ci_subtype, ct->c_file, bp);
+       inform("\"%s/%s\" type in message %s must be encoded in\n"
+           "7bit, 8bit, or binary, per RFC 2045 (6.4).  "
+           "mhfixmsg -fixcte can fix it, or\n"
+           "manually edit the file and change the \"%s\"\n"
+           "Content-Transfer-Encoding to one of those.  For now, continuing...",
+           ci->ci_type, ci->ci_subtype, ct->c_file, bp);

        free (cte);
 
        return NOTOK;
        free (cte);
 
        return NOTOK;


@@ -1124,9 +1131,8 @@ 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;
     }
 
        return NOTOK;
     }
 


@@ -1138,7 +1144,7 @@ InitMultiPart (CT ct)
     for (cp = bp; isspace ((unsigned char) *cp); cp++)
        continue;
     if (!*cp) {
     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;
     }


@@ -1208,7 +1214,7 @@ 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 = 1;
 


@@ -1222,7 +1228,7 @@ end_part:
                continue;
            *next = NULL;
            free_content (p);
                continue;
            *next = NULL;
            free_content (p);

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

        }
     }
 
        }
     }
 


@@ -1254,7 +1260,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) {


@@ -1391,9 +1397,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;
     }
 


@@ -1426,10 +1432,9 @@ InitMessage (CT ct)
                        if (sscanf (pm->pm_value, "%d", &p->pm_partno) != 1
                                || p->pm_partno < 1) {
 invalid_param:
                        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;


@@ -1445,10 +1450,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;
                }
            }


@@ -1528,7 +1531,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)


@@ -1633,9 +1636,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;
     }
 


@@ -1761,7 +1763,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;
     }
 


@@ -1783,7 +1785,7 @@ openBase64 (CT ct, char **file)
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }

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

     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {


@@ -1834,7 +1836,7 @@ openBase64 (CT ct, char **file)
         for (i = 0; i < decoded_len; ++i) {
             putc (*decoded_p++, ce->ce_fp);
         }
         for (i = 0; i < decoded_len; ++i) {
             putc (*decoded_p++, ce->ce_fp);
         }

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

         if (ferror (ce->ce_fp)) {
             content_error (ce->ce_file, ct, "error writing to");
             goto clean_up;
         if (ferror (ce->ce_fp)) {
             content_error (ce->ce_file, ct, "error writing to");
             goto clean_up;


@@ -1945,7 +1947,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;
     }
 


@@ -1967,7 +1969,7 @@ openQuoted (CT ct, char **file)
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }

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

     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {


@@ -2165,7 +2167,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;
     }
 


@@ -2187,7 +2189,7 @@ open7Bit (CT ct, char **file)
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }

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

     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {


@@ -2530,16 +2532,16 @@ openFTP (CT ct, char **file)
     }
 
     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) {
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }
     else {
        char *tempfile;
        if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }

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

     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
     }
 
     if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {


@@ -2718,7 +2720,7 @@ openMail (CT ct, char **file)
 
        default:
            if (pidXwait (child_id, NULL) == OK)
 
        default:
            if (pidXwait (child_id, NULL) == OK)

-               advise (NULL, "request sent");
+               inform("request sent");

            break;
     }
 
            break;
     }
 


@@ -2728,10 +2730,10 @@ openMail (CT ct, char **file)
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }

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

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

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

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


@@ -2742,9 +2744,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);
+    mh_xfree(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;


@@ -2811,16 +2812,16 @@ openURL (CT ct, char **file)
     }
 
     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) {
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }
     else {
        char *tempfile;
        if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
            adios(NULL, "unable to create temporary file in %s",
                  get_temp_dir());
        }

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

     }
 
     if ((ce->ce_fp = fopen(ce->ce_file, "w+")) == NULL) {
     }
 
     if ((ce->ce_fp = fopen(ce->ce_file, "w+")) == NULL) {


@@ -3280,27 +3281,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%*sparameter %s (error detected at offset %d)",
+                filename, fieldname, strlen(invo_name) + 2, "",cp, dp - cp);

            return NOTOK;
        }
 
            return NOTOK;
        }
 


@@ -3330,7 +3326,7 @@ parse_header_attrs (const char *filename, const char *fieldname,
                if (isdigit((unsigned char) *vp))
                    index = *vp - '0' + index * 10;
                else {
                if (isdigit((unsigned char) *vp))
                    index = *vp - '0' + index * 10;
                else {

-                   advise (NULL, "invalid parameter index in message %s's "
+                   inform("invalid parameter index in message %s's "

                            "%s: field\n%*s(parameter %s)", filename,
                            fieldname, strlen(invo_name) + 2, "", cp);
                    return NOTOK;
                            "%s: field\n%*s(parameter %s)", filename,
                            fieldname, strlen(invo_name) + 2, "", cp);
                    return NOTOK;


@@ -3374,7 +3370,7 @@ parse_header_attrs (const char *filename, const char *fieldname,
                    }
                    vp++;
                } else {
                    }
                    vp++;
                } else {

-                   advise(NULL, "missing charset in message %s's %s: "
+                   inform("missing charset in message %s's %s: "

                           "field\n%*s(parameter %s)", filename, fieldname,
                           strlen(invo_name) + 2, "", nameptr);
                    free(nameptr);
                           "field\n%*s(parameter %s)", filename, fieldname,
                           strlen(invo_name) + 2, "", nameptr);
                    free(nameptr);


@@ -3397,12 +3393,11 @@ parse_header_attrs (const char *filename, const char *fieldname,
                    }
                    vp++;
                } else {
                    }
                    vp++;
                } else {

-                   advise(NULL, "missing language tag in message %s's %s: "
+                   inform("missing language tag in message %s's %s: "

                           "field\n%*s(parameter %s)", filename, fieldname,
                           strlen(invo_name) + 2, "", nameptr);
                    free(nameptr);
                           "field\n%*s(parameter %s)", filename, fieldname,
                           strlen(invo_name) + 2, "", nameptr);
                    free(nameptr);

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

                    return NOTOK;
                }
 
                    return NOTOK;
                }
 


@@ -3422,15 +3417,13 @@ 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 "
+                       inform("invalid encoded sequence in message "

                               "%s's %s: field\n%*s(parameter %s)",
                               filename, fieldname, strlen(invo_name) + 2,
                               "", nameptr);
                        free(nameptr);
                               "%s's %s: field\n%*s(parameter %s)",
                               filename, fieldname, strlen(invo_name) + 2,
                               "", nameptr);
                        free(nameptr);

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

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


@@ -3467,16 +3460,12 @@ 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%*s(parameter %s)", filename,
+                            fieldname, strlen(invo_name) + 2, "", nameptr);

                        free(nameptr);
                        free(nameptr);

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

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


@@ -3484,7 +3473,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;


@@ -3528,8 +3517,11 @@ 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) {


@@ -3554,11 +3546,10 @@ 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 "
+                       inform("duplicate index (%d) in message "

                                "%s's %s: field\n%*s(parameter %s)", sp->index,
                                filename, fieldname, strlen(invo_name) + 2, "",
                                nameptr);
                                "%s's %s: field\n%*s(parameter %s)", sp->index,
                                filename, fieldname, strlen(invo_name) + 2, "",
                                nameptr);

-                       free (nameptr);

                        return NOTOK;
                    }
                    if (sp2->index < sp->index &&
                        return NOTOK;
                    }
                    if (sp2->index < sp->index &&


@@ -3570,11 +3561,10 @@ bad_quote:
                }
 
                if (sp2 == NULL) {
                }
 
                if (sp2 == NULL) {

-                   advise(NULL, "Internal error: cannot insert partial "
+                   inform("Internal error: cannot insert partial "

                           "param in message %s's %s: field\n%*s(parameter %s)",
                           filename, fieldname, strlen(invo_name) + 2, "",
                           nameptr);
                           "param in message %s's %s: field\n%*s(parameter %s)",
                           filename, fieldname, strlen(invo_name) + 2, "",
                           nameptr);

-                   free (nameptr);

                    return NOTOK;
                }
            }
                    return NOTOK;
                }
            }


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

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

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

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

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


@@ -3616,7 +3604,7 @@ 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 "
+               inform("missing section %d for parameter in "

                       "message %s's %s: field\n%*s(parameter %s)", pindex - 1,
                       filename, fieldname, strlen(invo_name) + 2, "",
                       pp->name);
                       "message %s's %s: field\n%*s(parameter %s)", pindex - 1,
                       filename, fieldname, strlen(invo_name) + 2, "",
                       pp->name);


@@ -3687,9 +3675,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);
+            mh_xfree(paramout);

            return NULL;
        }
 
            return NULL;
        }
 


@@ -3726,8 +3713,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);
+                mh_xfree(paramout);

                return NULL;
            }
 
                return NULL;
            }
 


@@ -3790,8 +3776,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);
+            mh_xfree(paramout);

            return NULL;
        }
 
            return NULL;
        }
 


@@ -3940,7 +3925,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--;


@@ -3994,7 +3979,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;
        }
     }


@@ -4014,7 +3999,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;
        }
     }


@@ -4048,18 +4033,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;
     }
 


@@ -4237,13 +4223,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;