Move etc/gen-ctype-checked into an Automake primary so dependency information

[nmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 0dcd1333d499e027070a754034b9b41ac21aef53..c9574efd04898c2ab62fa2387bec28c0dba920a8 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -36,6 +36,12 @@ int checksw = 0;     /* check Content-MD5 field */
  */
 char *tmp;
 
  */
 char *tmp;
 

+/*
+ * Instruct parser not to detect invalid Content-Transfer-Encoding
+ * in a multipart.
+ */
+int skip_mp_cte_check;
+

 /*
  * Structures for TEXT messages
  */
 /*
  * Structures for TEXT messages
  */


@@ -95,7 +101,7 @@ void free_encoding (CT, int);
  * static prototypes
  */
 static CT get_content (FILE *, char *, int);
  * static prototypes
  */
 static CT get_content (FILE *, char *, int);

-static int get_comment (CT, unsigned char **, int);
+static int get_comment (CT, char **, int);

 
 static int InitGeneric (CT);
 static int InitText (CT);
 
 static int InitGeneric (CT);
 static int InitText (CT);


@@ -335,8 +341,7 @@ get_content (FILE *in, char *file, int toplevel)
        /* Get MIME-Version field */
        if (!mh_strcasecmp (hp->name, VRSN_FIELD)) {
            int ucmp;
        /* Get MIME-Version field */
        if (!mh_strcasecmp (hp->name, VRSN_FIELD)) {
            int ucmp;

-           char c;
-           unsigned char *cp, *dp;
+           char c, *cp, *dp;

 
            if (ct->c_vrsn) {
                advise (NULL, "message %s has multiple %s: fields",
 
            if (ct->c_vrsn) {
                advise (NULL, "message %s has multiple %s: fields",


@@ -348,12 +353,12 @@ get_content (FILE *in, char *file, int toplevel)
            /* Now, cleanup this field */
            cp = ct->c_vrsn;
 
            /* Now, cleanup this field */
            cp = ct->c_vrsn;
 

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

                cp++;
            for (dp = strchr(cp, '\n'); dp; dp = strchr(dp, '\n'))
                *dp++ = ' ';
            for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)
                cp++;
            for (dp = strchr(cp, '\n'); dp; dp = strchr(dp, '\n'))
                *dp++ = ' ';
            for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)

-               if (!isspace (*dp))
+               if (!isspace ((unsigned char) *dp))

                    break;
            *++dp = '\0';
            if (debugsw)
                    break;
            *++dp = '\0';
            if (debugsw)


@@ -403,8 +408,7 @@ get_content (FILE *in, char *file, int toplevel)
        }
        else if (!mh_strcasecmp (hp->name, ENCODING_FIELD)) {
        /* Get Content-Transfer-Encoding field */
        }
        else if (!mh_strcasecmp (hp->name, ENCODING_FIELD)) {
        /* Get Content-Transfer-Encoding field */

-           char c;
-           unsigned char *cp, *dp;
+           char c, *cp, *dp;

            struct str2init *s2i;
 
            /*
            struct str2init *s2i;
 
            /*


@@ -420,7 +424,7 @@ get_content (FILE *in, char *file, int toplevel)
            /* get copy of this field */
            ct->c_celine = cp = add (hp->value, NULL);
 
            /* get copy of this field */
            ct->c_celine = cp = add (hp->value, NULL);
 

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

                cp++;
            for (dp = cp; istoken (*dp); dp++)
                continue;
                cp++;
            for (dp = cp; istoken (*dp); dp++)
                continue;


@@ -445,8 +449,7 @@ get_content (FILE *in, char *file, int toplevel)
        }
        else if (!mh_strcasecmp (hp->name, MD5_FIELD)) {
        /* Get Content-MD5 field */
        }
        else if (!mh_strcasecmp (hp->name, MD5_FIELD)) {
        /* Get Content-MD5 field */

-           unsigned char *cp, *dp;
-           char *ep;
+           char *cp, *dp, *ep;

 
            if (!checksw)
                goto next_header;
 
            if (!checksw)
                goto next_header;


@@ -459,12 +462,12 @@ get_content (FILE *in, char *file, int toplevel)
 
            ep = cp = add (hp->value, NULL);    /* get a copy */
 
 
            ep = cp = add (hp->value, NULL);    /* get a copy */
 

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

                cp++;
            for (dp = strchr(cp, '\n'); dp; dp = strchr(dp, '\n'))
                *dp++ = ' ';
            for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)
                cp++;
            for (dp = strchr(cp, '\n'); dp; dp = strchr(dp, '\n'))
                *dp++ = ' ';
            for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)

-               if (!isspace (*dp))
+               if (!isspace ((unsigned char) *dp))

                    break;
            *++dp = '\0';
            if (debugsw)
                    break;
            *++dp = '\0';
            if (debugsw)


@@ -475,7 +478,7 @@ get_content (FILE *in, char *file, int toplevel)
                goto out;
            }
 
                goto out;
            }
 

-           for (dp = cp; *dp && !isspace (*dp); dp++)
+           for (dp = cp; *dp && !isspace ((unsigned char) *dp); dp++)

                continue;
            *dp = '\0';
 
                continue;
            *dp = '\0';
 


@@ -578,7 +581,7 @@ add_header (CT ct, char *name, char *value)
    filename="foo".  If it doesn't and value does, use value from
    that. */
 static char *
    filename="foo".  If it doesn't and value does, use value from
    that. */
 static char *

-incl_name_value (unsigned char *buf, char *name, char *value) {
+incl_name_value (char *buf, char *name, char *value) {

     char *newbuf = buf;
 
     /* Assume that name is non-null. */
     char *newbuf = buf;
 
     /* Assume that name is non-null. */


@@ -587,12 +590,11 @@ incl_name_value (unsigned char *buf, char *name, char *value) {
 
        if (! strstr (buf, name_plus_equal)) {
            char *insertion;
 
        if (! strstr (buf, name_plus_equal)) {
            char *insertion;

-           unsigned char *cp;
-           char *prefix, *suffix;
+           char *cp, *prefix, *suffix;

 
            /* Trim trailing space, esp. newline. */
            for (cp = &buf[strlen (buf) - 1];
 
            /* Trim trailing space, esp. newline. */
            for (cp = &buf[strlen (buf) - 1];

-                cp >= buf && isspace (*cp);
+                cp >= buf && isspace ((unsigned char) *cp);

                 --cp) {
                *cp = '\0';
            }
                 --cp) {
                *cp = '\0';
            }


@@ -658,11 +660,10 @@ extract_name_value (char *name_suffix, char *value) {
  * directives.  Fills in the information of the CTinfo structure.
  */
 int
  * directives.  Fills in the information of the CTinfo structure.
  */
 int

-get_ctinfo (unsigned char *cp, CT ct, int magic)
+get_ctinfo (char *cp, CT ct, int magic)

 {
     int        i;
 {
     int        i;

-    unsigned char *dp;
-    char **ap, **ep;
+    char *dp, **ap, **ep;

     char c;
     CI ci;
 
     char c;
     CI ci;
 


@@ -672,7 +673,7 @@ get_ctinfo (unsigned char *cp, CT ct, int magic)
     /* store copy of Content-Type line */
     cp = ct->c_ctline = add (cp, NULL);
 
     /* store copy of Content-Type line */
     cp = ct->c_ctline = add (cp, NULL);
 

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

        cp++;
 
     /* change newlines to spaces */
        cp++;
 
     /* change newlines to spaces */


@@ -681,7 +682,7 @@ get_ctinfo (unsigned char *cp, CT ct, int magic)
 
     /* trim trailing spaces */
     for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)
 
     /* trim trailing spaces */
     for (dp = cp + strlen (cp) - 1; dp >= cp; dp--)

-       if (!isspace (*dp))
+       if (!isspace ((unsigned char) *dp))

            break;
     *++dp = '\0';
 
            break;
     *++dp = '\0';
 


@@ -705,10 +706,10 @@ get_ctinfo (unsigned char *cp, CT ct, int magic)
 
     /* down case the content type string */
     for (dp = ci->ci_type; *dp; dp++)
 
     /* down case the content type string */
     for (dp = ci->ci_type; *dp; dp++)

-       if (isalpha(*dp) && isupper (*dp))
-           *dp = tolower (*dp);
+       if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
+           *dp = tolower ((unsigned char) *dp);

 
 

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

        cp++;
 
     if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
        cp++;
 
     if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)


@@ -721,7 +722,7 @@ get_ctinfo (unsigned char *cp, CT ct, int magic)
     }
 
     cp++;
     }
 
     cp++;

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

        cp++;
 
     if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
        cp++;
 
     if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)


@@ -742,11 +743,11 @@ get_ctinfo (unsigned char *cp, CT ct, int magic)
 
     /* down case the content subtype string */
     for (dp = ci->ci_subtype; *dp; dp++)
 
     /* down case the content subtype string */
     for (dp = ci->ci_subtype; *dp; dp++)

-       if (isalpha(*dp) && isupper (*dp))
-           *dp = tolower (*dp);
+       if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
+           *dp = tolower ((unsigned char) *dp);

 
 magic_skip:
 
 magic_skip:

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

        cp++;
 
     if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
        cp++;
 
     if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)


@@ -757,8 +758,7 @@ magic_skip:
      */
     ep = (ap = ci->ci_attrs) + NPARMS;
     while (*cp == ';') {
      */
     ep = (ap = ci->ci_attrs) + NPARMS;
     while (*cp == ';') {

-       char *vp;
-       unsigned char *up;
+       char *vp, *up;

 
        if (ap >= ep) {
            advise (NULL,
 
        if (ap >= ep) {
            advise (NULL,


@@ -768,7 +768,7 @@ magic_skip:
        }
 
        cp++;
        }
 
        cp++;

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

            cp++;
 
        if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
            cp++;
 
        if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)


@@ -782,11 +782,11 @@ magic_skip:
        }
 
        /* down case the attribute name */
        }
 
        /* down case the attribute name */

-       for (dp = cp; istoken (*dp); dp++)
-           if (isalpha(*dp) && isupper (*dp))
-               *dp = tolower (*dp);
+       for (dp = cp; istoken ((unsigned char) *dp); dp++)
+           if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
+               *dp = tolower ((unsigned char) *dp);

 
 

-       for (up = dp; isspace (*dp);)
+       for (up = dp; isspace ((unsigned char) *dp);)

            dp++;
        if (dp == cp || *dp != '=') {
            advise (NULL,
            dp++;
        if (dp == cp || *dp != '=') {
            advise (NULL,


@@ -797,7 +797,7 @@ magic_skip:
 
        vp = (*ap = add (cp, NULL)) + (up - cp);
        *vp = '\0';
 
        vp = (*ap = add (cp, NULL)) + (up - cp);
        *vp = '\0';

-       for (dp++; isspace (*dp);)
+       for (dp++; isspace ((unsigned char) *dp);)

            dp++;
 
        /* now add the attribute value */
            dp++;
 
        /* now add the attribute value */


@@ -842,7 +842,7 @@ bad_quote:
        }
        ap++;
 
        }
        ap++;
 

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

            cp++;
 
        if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
            cp++;
 
        if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)


@@ -870,7 +870,7 @@ bad_quote:
        *dp++ = c;
        cp = dp;
 
        *dp++ = c;
        cp = dp;
 

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

            cp++;
     }
 
            cp++;
     }
 


@@ -897,7 +897,7 @@ bad_quote:
        *dp++ = c;
        cp = dp;
 
        *dp++ = c;
        cp = dp;
 

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

            cp++;
     }
 
            cp++;
     }
 


@@ -924,7 +924,7 @@ bad_quote:
        *dp++ = c;
        cp = dp;
 
        *dp++ = c;
        cp = dp;
 

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

            cp++;
     }
 
            cp++;
     }
 


@@ -959,11 +959,10 @@ bad_quote:
 
 
 static int
 
 
 static int

-get_comment (CT ct, unsigned char **ap, int istype)
+get_comment (CT ct, char **ap, int istype)

 {
     int i;
 {
     int i;

-    char *bp;
-    unsigned char *cp;
+    char *bp, *cp;

     char c, buffer[BUFSIZ], *dp;
     CI ci;
 
     char c, buffer[BUFSIZ], *dp;
     CI ci;
 


@@ -1013,7 +1012,7 @@ invalid:
        }
     }
 
        }
     }
 

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

        cp++;
 
     *ap = cp;
        cp++;
 
     *ap = cp;


@@ -1105,8 +1104,7 @@ InitMultiPart (CT ct)
 {
     int        inout;
     long last, pos;
 {
     int        inout;
     long last, pos;

-    unsigned char *cp, *dp;
-    char **ap, **ep;
+    char *cp, *dp, **ap, **ep;

     char *bp, buffer[BUFSIZ];
     struct multipart *m;
     struct k2v *kv;
     char *bp, buffer[BUFSIZ];
     struct multipart *m;
     struct k2v *kv;


@@ -1119,15 +1117,15 @@ InitMultiPart (CT ct)
      * The encoding for multipart messages must be either
      * 7bit, 8bit, or binary (per RFC2045).
      */
      * The encoding for multipart messages must be either
      * 7bit, 8bit, or binary (per RFC2045).
      */

-    if (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) {

        /* 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);
 
        bp = cte + strlen (cte) - 1;
        /* 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);
 
        bp = cte + strlen (cte) - 1;

-       while (bp >= cte && isspace (*bp)) *bp-- = '\0';
-       for (bp = cte; *bp && isblank (*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"
 
        admonish (NULL,
                  "\"%s/%s\" type in message %s must be encoded in\n"


@@ -1172,7 +1170,7 @@ InitMultiPart (CT ct)
     ct->c_ctparams = (void *) m;
 
     /* check if boundary parameter contains only whitespace characters */
     ct->c_ctparams = (void *) m;
 
     /* check if boundary parameter contains only whitespace characters */

-    for (cp = bp; isspace (*cp); 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",
        continue;
     if (!*cp) {
        advise (NULL, "invalid \"boundary\" parameter for \"%s/%s\" type in message %s's %s: field",


@@ -1182,7 +1180,7 @@ InitMultiPart (CT ct)
 
     /* remove trailing whitespace from boundary parameter */
     for (cp = bp, dp = cp + strlen (cp) - 1; dp > cp; dp--)
 
     /* remove trailing whitespace from boundary parameter */
     for (cp = bp, dp = cp + strlen (cp) - 1; dp > cp; dp--)

-       if (!isspace (*dp))
+       if (!isspace ((unsigned char) *dp))

            break;
     *++dp = '\0';
 
            break;
     *++dp = '\0';
 


@@ -1731,8 +1729,7 @@ openBase64 (CT ct, char **file)
     int fd, len, skip, own_ct_fp = 0;
     uint32_t bits;
     unsigned char value, b;
     int fd, len, skip, own_ct_fp = 0;
     uint32_t bits;
     unsigned char value, b;

-    unsigned char *cp, *ep;
-    char buffer[BUFSIZ];
+    char *cp, *ep, buffer[BUFSIZ];

     /* sbeck -- handle suffixes */
     CI ci;
     CE ce;
     /* sbeck -- handle suffixes */
     CI ci;
     CE ce;


@@ -1828,13 +1825,13 @@ openBase64 (CT ct, char **file)
            for (ep = (cp = buffer) + cc; cp < ep; cp++) {
                switch (*cp) {
                default:
            for (ep = (cp = buffer) + cc; cp < ep; cp++) {
                switch (*cp) {
                default:

-                   if (isspace (*cp))
+                   if (isspace ((unsigned char) *cp))

                        break;
                        break;

-                   if (skip || (*cp & 0x80)
-                       || (value = b642nib[*cp & 0x7f]) > 0x3f) {
+                   if (skip || (((unsigned char) *cp) & 0x80)
+                       || (value = b642nib[((unsigned char) *cp) & 0x7f]) > 0x3f) {

                        if (debugsw) {
                            fprintf (stderr, "*cp=0x%x pos=%ld skip=%d\n",
                        if (debugsw) {
                            fprintf (stderr, "*cp=0x%x pos=%ld skip=%d\n",

-                               *cp,
+                               (unsigned char) *cp,

                                (long) (lseek (fd, (off_t) 0, SEEK_CUR) - (ep - cp)),
                                skip);
                        }
                                (long) (lseek (fd, (off_t) 0, SEEK_CUR) - (ep - cp)),
                                skip);
                        }


@@ -1965,7 +1962,7 @@ static int
 openQuoted (CT ct, char **file)
 {
     int        cc, digested, len, quoted, own_ct_fp = 0;
 openQuoted (CT ct, char **file)
 {
     int        cc, digested, len, quoted, own_ct_fp = 0;

-    unsigned char *cp, *ep;
+    char *cp, *ep;

     char buffer[BUFSIZ];
     unsigned char mask;
     CE ce;
     char buffer[BUFSIZ];
     unsigned char mask;
     CE ce;


@@ -2057,7 +2054,7 @@ openQuoted (CT ct, char **file)
        len -= cc;
 
        for (ep = (cp = buffer) + cc - 1; cp <= ep; ep--)
        len -= cc;
 
        for (ep = (cp = buffer) + cc - 1; cp <= ep; ep--)

-           if (!isspace (*ep))
+           if (!isspace ((unsigned char) *ep))

                break;
        *++ep = '\n', ep++;
 
                break;
        *++ep = '\n', ep++;
 


@@ -2066,13 +2063,13 @@ openQuoted (CT ct, char **file)
                /* in an escape sequence */
                if (quoted == 1) {
                    /* at byte 1 of an escape sequence */
                /* in an escape sequence */
                if (quoted == 1) {
                    /* at byte 1 of an escape sequence */

-                   mask = hex2nib[*cp & 0x7f];
+                   mask = hex2nib[((unsigned char) *cp) & 0x7f];

                    /* next is byte 2 */
                    quoted = 2;
                } else {
                    /* at byte 2 of an escape sequence */
                    mask <<= 4;
                    /* next is byte 2 */
                    quoted = 2;
                } else {
                    /* at byte 2 of an escape sequence */
                    mask <<= 4;

-                   mask |= hex2nib[*cp & 0x7f];
+                   mask |= hex2nib[((unsigned char) *cp) & 0x7f];

                    putc (mask, ce->ce_fp);
                    if (digested)
                        MD5Update (&mdContext, &mask, 1);
                    putc (mask, ce->ce_fp);
                    if (digested)
                        MD5Update (&mdContext, &mask, 1);


@@ -2099,7 +2096,8 @@ openQuoted (CT ct, char **file)
                if (cp + 1 >= ep || cp + 2 >= ep) {
                    /* We don't have 2 bytes left, so this is an invalid
                     * escape sequence; just show the raw bytes (below). */
                if (cp + 1 >= ep || cp + 2 >= ep) {
                    /* We don't have 2 bytes left, so this is an invalid
                     * escape sequence; just show the raw bytes (below). */

-               } else if (isxdigit (cp[1]) && isxdigit (cp[2])) {
+               } else if (isxdigit ((unsigned char) cp[1]) &&
+                                       isxdigit ((unsigned char) cp[2])) {

                    /* Next 2 bytes are hex digits, making this a valid escape
                     * sequence; let's decode it (above). */
                    quoted = 1;
                    /* Next 2 bytes are hex digits, making this a valid escape
                     * sequence; let's decode it (above). */
                    quoted = 1;


@@ -2628,7 +2626,7 @@ openFTP (CT ct, char **file)
 
        fflush (stdout);
 
 
        fflush (stdout);
 

-       for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+       for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)

            sleep (5);
        switch (child_id) {
            case NOTOK:
            sleep (5);
        switch (child_id) {
            case NOTOK:


@@ -2770,7 +2768,7 @@ openMail (CT ct, char **file)
     vec[vecp++] = e->eb_body;
     vec[vecp] = NULL;
 
     vec[vecp++] = e->eb_body;
     vec[vecp] = NULL;
 

-    for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)

        sleep (5);
     switch (child_id) {
        case NOTOK:
        sleep (5);
     switch (child_id) {
        case NOTOK: