Make the -fcc switch to repl actually work properly, and make sure that

[nmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 7e01b050807fe93b0538b73ca42c23c9cb367e3e..85c3292443097a9f8df0b31dd0b6199f2492048c 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 */


@@ -207,6 +210,8 @@ parse_mime (char *file)
     CT ct;
     size_t n;
 
     CT ct;
     size_t n;
 

+    bogus_mp_content = 0;
+

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


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


@@ -312,8 +317,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) {


@@ -649,7 +654,7 @@ 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) {


@@ -657,7 +662,7 @@ get_ctinfo (char *cp, CT ct, int magic)
                TYPE_FIELD, ct->c_file);
        return NOTOK;
     }
                TYPE_FIELD, ct->c_file);
        return NOTOK;
     }

-    ToLower(ci->ci_type);
+    to_lower(ci->ci_type);

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


@@ -668,7 +673,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;
     }
 


@@ -683,7 +688,7 @@ 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) {


@@ -692,7 +697,7 @@ get_ctinfo (char *cp, CT ct, int magic)
                TYPE_FIELD, ct->c_file, ci->ci_type);
        return NOTOK;
     }
                TYPE_FIELD, ct->c_file, ci->ci_type);
        return NOTOK;
     }

-    ToLower(ci->ci_subtype);
+    to_lower(ci->ci_subtype);

 
 magic_skip:
     while (isspace ((unsigned char) *cp))
 
 magic_skip:
     while (isspace ((unsigned char) *cp))


@@ -831,7 +836,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.


@@ -898,7 +903,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)


@@ -975,7 +980,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);

        }
     }
 
        }
     }
 


@@ -1087,7 +1092,7 @@ 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';
 
        bp = cte + strlen (cte) - 1;
        while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';


@@ -1252,7 +1257,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) {


@@ -1759,7 +1764,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;
     }
 


@@ -1781,7 +1786,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) {


@@ -1943,7 +1948,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;
     }
 


@@ -1965,7 +1970,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) {


@@ -2163,7 +2168,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;
     }
 


@@ -2185,7 +2190,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) {


@@ -2528,16 +2533,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) {


@@ -2726,10 +2731,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;
     }
 


@@ -2741,7 +2746,7 @@ openMail (CT ct, char **file)
     /* showproc is for mhshow and mhstore, though mhlist -debug
      * prints it, too. */
     mh_xfree(ct->c_showproc);
     /* showproc is for mhshow and mhstore, though mhlist -debug
      * prints it, too. */
     mh_xfree(ct->c_showproc);

-    ct->c_showproc = add ("true", NULL);
+    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;


@@ -2808,16 +2813,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) {


@@ -3282,7 +3287,6 @@ parse_header_attrs (const char *filename, const char *fieldname,
                        "parameter list",
                        filename, fieldname);
            }
                        "parameter list",
                        filename, fieldname);
            }

-           extraneous_trailing_semicolon = 1;

            return DONE;
        }
 
            return DONE;
        }
 


@@ -3519,8 +3523,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) {


@@ -3549,7 +3556,6 @@ bad_quote:
                                "%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 &&


@@ -3565,7 +3571,6 @@ bad_quote:
                           "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;
                }
            }


@@ -4223,17 +4228,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--) {

-        /* FIXME: !iscntrl should perhaps be isprint as that allows all
-         * classes bar cntrl, whereas the cntrl class can include those
-         * in space and blank.
-         * http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap07.html */
-       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;