Add gcc's const function attribute.

[nmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index a2dcb88c2e49503f78da26a6e4a72bce5fd02a8c..ca01545f3ffa9720dcb35fd36695902c1ef41e53 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -1,6 +1,4 @@
-
-/*
- * mhparse.c -- routines to parse the contents of MIME messages
+/* mhparse.c -- routines to parse the contents of MIME messages

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -15,6 +13,9 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>

+#include <h/mhcachesbr.h>
+#include "../sbr/m_mktemp.h"
+#include "mhfree.h"

 #ifdef HAVE_ICONV
 # include <iconv.h>
 #endif /* HAVE_ICONV */
 #ifdef HAVE_ICONV
 # include <iconv.h>
 #endif /* HAVE_ICONV */


@@ -22,10 +23,6 @@
 
 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 */
 
 /*


@@ -57,8 +54,8 @@ int npreferred;
  */
 struct k2v SubText[] = {
     { "plain",    TEXT_PLAIN },
  */
 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! */
 };
 


@@ -109,17 +106,11 @@ static struct k2v EncodingType[] = {
 };
 
 
 };
 
 

-/* mhcachesbr.c */
-int find_cache (CT, int, int *, char *, char *, int);
-

 /* mhmisc.c */
 int part_ok (CT);
 int type_ok (CT, int);
 void content_error (char *, CT, char *, ...);
 
 /* mhmisc.c */
 int part_ok (CT);
 int type_ok (CT, int);
 void content_error (char *, CT, char *, ...);
 

-/* mhfree.c */
-void free_encoding (CT, int);
-

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


@@ -182,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 },


@@ -245,12 +236,12 @@ parse_mime (char *file)
            return NULL;
        }
        fseek (fp, 0L, SEEK_SET);
            return NULL;
        }
        fseek (fp, 0L, SEEK_SET);

-    } else if (lstat (file, &statbuf) == NOTOK) {
-       advise (file, "unable to lstat");
+    } 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. */
        return NULL;
     } else if (S_ISDIR(statbuf.st_mode)) {
        /* Don't try to parse a directory. */

-       advise (NULL, "%s is a directory", file);
+       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");


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


@@ -300,11 +291,11 @@ 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 */
     NEW0(ct);
 
     /* allocate the content structure */
     NEW0(ct);


@@ -316,10 +307,11 @@ get_content (FILE *in, char *file, int toplevel)
      * Parse the header fields for this
      * content into a linked list.
      */
      * 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++;
        case FLD:
        case FLDPLUS:
            compnum++;


@@ -331,7 +323,7 @@ get_content (FILE *in, char *file, int toplevel)
            /* 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 */
            }
 


@@ -343,12 +335,25 @@ get_content (FILE *in, char *file, int toplevel)
            continue;
 
        case BODY:
            continue;
 
        case BODY:

+            /* There are two cases.  The unusual one is when there is no
+             * blank line between the headers and the body.  This is
+             * indicated by the name of the header starting with `:'.
+             *
+             * For both cases, normal first, `1' is the desired c_begin
+             * file position for the start of the body, and `2' is the
+             * file position when buf is returned.
+             *
+             *     f o o :   b a r \n \n b o d y \n    bufsz = 6
+             *                          1          2   move -5
+             *     f o o :   b a r \n b o d y \n       bufsz = 4
+             *                       1       2         move -4
+             *
+             * For the normal case, bufsz includes the
+             * header-terminating `\n', even though it is not in buf,
+             * but bufsz isn't affected when it's missing in the unusual
+             * case. */

            if (name[0] == ':') {
            if (name[0] == ':') {

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

            } else {
                ct->c_begin = ftell (in) - (bufsz - 1);
            }
            } else {
                ct->c_begin = ftell (in) - (bufsz - 1);
            }


@@ -413,14 +418,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);
            }


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


@@ -463,7 +468,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;
            }


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


@@ -661,12 +666,14 @@ 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';
+    c = *dp;
+    *dp = '\0';

     ci->ci_type = mh_xstrdup(cp);      /* store content type */
     ci->ci_type = mh_xstrdup(cp);      /* store content type */

-    *dp = c, cp = dp;
+    *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;
     }


@@ -695,14 +702,15 @@ 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';
+    c = *dp;
+    *dp = '\0';

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

-    *dp = c, cp = dp;
+    *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;
     }
     to_lower(ci->ci_subtype);
        return NOTOK;
     }
     to_lower(ci->ci_subtype);


@@ -728,7 +736,7 @@ magic_skip:
         mh_xfree(ct->c_id);
         ct->c_id = NULL;
        if (!(dp = strchr(ct->c_id = ++cp, '>'))) {
         mh_xfree(ct->c_id);
         ct->c_id = NULL;
        if (!(dp = strchr(ct->c_id = ++cp, '>'))) {

-           advise (NULL, "invalid ID in message %s", ct->c_file);
+           inform("invalid ID in message %s", ct->c_file);

            return NOTOK;
        }
        c = *dp;
            return NOTOK;
        }
        c = *dp;


@@ -753,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;
        }


@@ -780,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;
        }


@@ -814,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;
        }
 


@@ -831,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;
        }
 


@@ -857,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;


@@ -910,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';
+    c = *dp;
+    *dp = '\0';

     ct->c_dispo_type = mh_xstrdup(cp); /* store disposition type */
     ct->c_dispo_type = mh_xstrdup(cp); /* store disposition type */

-    *dp = c, cp = dp;
+    *dp = c;
+    cp = dp;

 
     if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) == NOTOK)
        return NOTOK;
 
     if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) == NOTOK)
        return NOTOK;


@@ -925,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)


@@ -955,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;
 


@@ -1094,7 +1102,7 @@ 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) {
      */
     if (! skip_mp_cte_check  &&  ct->c_encoding != CE_7BIT  &&
         ct->c_encoding != CE_8BIT  &&  ct->c_encoding != CE_BINARY) {


@@ -1106,13 +1114,12 @@ InitMultiPart (CT ct)
        while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';
        for (bp = cte; *bp && isblank ((unsigned char) *bp); ++bp) continue;
 
        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;


@@ -1135,9 +1142,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;
     }
 


@@ -1149,7 +1155,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;
     }


@@ -1219,7 +1225,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;
 


@@ -1293,7 +1299,7 @@ last_part:
  * ease of choosing/displaying it later on.  from a mail message on
  * nmh-workers, from kenh:
  *  "Stock" MH 6.8.5 did not have a reverse_parts() function, but I
  * ease of choosing/displaying it later on.  from a mail message on
  * nmh-workers, from kenh:
  *  "Stock" MH 6.8.5 did not have a reverse_parts() function, but I

- *  see code in mhn that did the same thing...  Acccording to the RCS
+ *  see code in mhn that did the same thing...  According to the RCS

  *  logs, that code was around from the initial checkin of mhn.c by
  *  John Romine in 1992, which is as far back as we have."
  */
  *  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."
  */


@@ -1402,9 +1408,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;
     }
 


@@ -1437,10 +1443,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;


@@ -1456,10 +1461,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;
                }
            }


@@ -1644,9 +1647,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;
     }
 


@@ -1839,7 +1841,10 @@ openBase64 (CT ct, char **file)
     *cp = '\0';
 
     if (decodeBase64 (buffer, &decoded, &decoded_len, ct->c_type == CT_TEXT,
     *cp = '\0';
 
     if (decodeBase64 (buffer, &decoded, &decoded_len, ct->c_type == CT_TEXT,

-                      ct->c_digested ? digest : NULL) == OK) {
+                      ct->c_digested ? digest : NULL) != OK)
+        goto clean_up;
+
+    {

         size_t i;
         unsigned char *decoded_p = decoded;
         for (i = 0; i < decoded_len; ++i) {
         size_t i;
         unsigned char *decoded_p = decoded;
         for (i = 0; i < decoded_len; ++i) {


@@ -1853,7 +1858,7 @@ openBase64 (CT ct, char **file)
 
         if (ct->c_digested) {
             if (memcmp(digest, ct->c_digest,
 
         if (ct->c_digested) {
             if (memcmp(digest, ct->c_digest,

-                       sizeof(digest) / sizeof(digest[0]))) {
+                       sizeof digest)) {

                 content_error (NULL, ct,
                                "content integrity suspect (digest mismatch) -- continuing");
             } else {
                 content_error (NULL, ct,
                                "content integrity suspect (digest mismatch) -- continuing");
             } else {


@@ -1862,8 +1867,6 @@ openBase64 (CT ct, char **file)
                 }
             }
         }
                 }
             }
         }

-    } else {
-        goto clean_up;

     }
 
     fseek (ct->c_fp, 0L, SEEK_SET);
     }
 
     fseek (ct->c_fp, 0L, SEEK_SET);


@@ -2019,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) {


@@ -2065,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. */


@@ -2105,12 +2108,11 @@ openQuoted (CT ct, char **file)
 
        MD5Final (digest, &mdContext);
        if (memcmp((char *) digest, (char *) ct->c_digest,
 
        MD5Final (digest, &mdContext);
        if (memcmp((char *) digest, (char *) ct->c_digest,

-                  sizeof(digest) / sizeof(digest[0])))
+                  sizeof digest))

            content_error (NULL, ct,
                           "content integrity suspect (digest mismatch) -- continuing");
            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);


@@ -2338,7 +2340,7 @@ openExternal (CT ct, CT cb, CE ce, char **file, int *fd)
         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:


@@ -2414,12 +2416,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);


@@ -2625,12 +2625,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);


@@ -2729,7 +2727,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;
     }
 


@@ -2895,7 +2893,7 @@ 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);

 }
 
 
 }
 
 


@@ -2910,7 +2908,7 @@ readDigest (CT ct, char *cp)
 
     size_t len;
     if (decodeBase64 (cp, &digest, &len, 0, NULL) == OK) {
 
     size_t len;
     if (decodeBase64 (cp, &digest, &len, 0, NULL) == OK) {

-        const size_t maxlen = sizeof ct->c_digest / sizeof ct->c_digest[0];
+        const size_t maxlen = sizeof ct->c_digest;

 
         if (strlen ((char *) digest) <= maxlen) {
             memcpy (ct->c_digest, digest, maxlen);
 
         if (strlen ((char *) digest) <= maxlen) {
             memcpy (ct->c_digest, digest, maxlen);


@@ -3290,10 +3288,8 @@ 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);

            }
            return DONE;
        }
            }
            return DONE;
        }


@@ -3305,10 +3301,9 @@ parse_header_attrs (const char *filename, const char *fieldname,
        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;
        }
 


@@ -3332,15 +3327,15 @@ parse_header_attrs (const char *filename, const char *fieldname,
            if (*vp == '*' && vp < up - 1) {
                partial = 1;
                continue;
            if (*vp == '*' && vp < up - 1) {
                partial = 1;
                continue;

-           } else if (*vp == '*' && vp == up - 1) {
+           }
+            if (*vp == '*' && vp == up - 1) {

                encoded = 1;
            } else if (partial) {
                if (isdigit((unsigned char) *vp))
                    index = *vp - '0' + index * 10;
                else {
                encoded = 1;
            } else if (partial) {
                if (isdigit((unsigned char) *vp))
                    index = *vp - '0' + index * 10;
                else {

-                   advise (NULL, "invalid parameter index in message %s's "
-                           "%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 {


@@ -3382,9 +3377,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;
                }


@@ -3405,9 +3399,8 @@ 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);
                     mh_xfree(charset);
                    return NOTOK;
                    free(nameptr);
                     mh_xfree(charset);
                    return NOTOK;


@@ -3429,10 +3422,8 @@ 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);
                         mh_xfree(charset);
                         mh_xfree(lang);
                        free(nameptr);
                         mh_xfree(charset);
                         mh_xfree(lang);


@@ -3472,11 +3463,8 @@ 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);
                         mh_xfree(charset);
                         mh_xfree(lang);
                        free(nameptr);
                         mh_xfree(charset);
                         mh_xfree(lang);


@@ -3560,10 +3548,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);
+                        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 &&


@@ -3575,10 +3562,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);
+                    inform("Internal error: cannot insert partial param "
+                        "in message %s's %s: field\n    (parameter %s)",
+                        filename, fieldname, nameptr);

                    return NOTOK;
                }
            }
                    return NOTOK;
                }
            }


@@ -3618,10 +3604,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;


@@ -3689,7 +3674,7 @@ 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);
+           inform("Parameter name \"%s\" is too long", params->pm_name);

             mh_xfree(paramout);
            return NULL;
        }
             mh_xfree(paramout);
            return NULL;
        }


@@ -3770,7 +3755,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.
         */
 


@@ -3993,7 +3978,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;
        }
     }


@@ -4013,7 +3998,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;
        }
     }


@@ -4053,13 +4038,13 @@ normal_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;
        }
     }
 
     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;
     }