Removed eom_action from m_getfld.c because it was only used by

[nmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 59f8b2218344ed55b3b42625c4b40c4ce347aa7e..754146674fbe71f88ec7da757133d2956304ed61 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -23,8 +23,6 @@
 
 extern int debugsw;
 
 
 extern int debugsw;
 

-extern pid_t xpid;     /* mhshowsbr.c  */
-

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


@@ -183,19 +181,6 @@ struct str2init str2methods[] = {
 };
 
 
 };
 
 

-int
-pidcheck (int status)
-{
-    if ((status & 0xff00) == 0xff00 || (status & 0x007f) != SIGQUIT)
-       return status;
-
-    fflush (stdout);
-    fflush (stderr);
-    done (1);
-    return 1;
-}
-
-

 /*
  * Main entry point for parsing a MIME message or file.
  * It returns the Content structure for the top level
 /*
  * Main entry point for parsing a MIME message or file.
  * It returns the Content structure for the top level


@@ -209,6 +194,7 @@ parse_mime (char *file)
     char buffer[BUFSIZ];
     FILE *fp;
     CT ct;
     char buffer[BUFSIZ];
     FILE *fp;
     CT ct;

+    size_t n;

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


@@ -222,8 +208,13 @@ parse_mime (char *file)
         }
        file = add (tfile, NULL);
 
         }
        file = add (tfile, NULL);
 

-       while (fgets (buffer, sizeof(buffer), stdin))
-           fputs (buffer, fp);
+       while ((n = fread(buffer, 1, sizeof(buffer), stdin)) > 0) {
+           if (fwrite(buffer, 1, n, fp) != n) {
+               (void) m_unlink (file);
+               advise (file, "error copying to temporary file");
+               return NULL;
+           }
+       }

        fflush (fp);
 
        if (ferror (stdin)) {
        fflush (fp);
 
        if (ferror (stdin)) {


@@ -1072,7 +1063,10 @@ InitMultiPart (CT ct)
     long last, pos;
     char *cp, *dp;
     PM pm;
     long last, pos;
     char *cp, *dp;
     PM pm;

-    char *bp, buffer[BUFSIZ];
+    char *bp;
+    char *bufp = NULL;
+    size_t buflen;
+    ssize_t gotlen;

     struct multipart *m;
     struct k2v *kv;
     struct part *part, **next;
     struct multipart *m;
     struct k2v *kv;
     struct part *part, **next;


@@ -1166,15 +1160,15 @@ InitMultiPart (CT ct)
     part = NULL;
     inout = 1;
 
     part = NULL;
     inout = 1;
 

-    while (fgets (buffer, sizeof(buffer) - 1, fp)) {
+    while ((gotlen = getline(&bufp, &buflen, fp)) != -1) {

        if (pos > last)
            break;
 
        if (pos > last)
            break;
 

-       pos += strlen (buffer);
-       if (buffer[0] != '-' || buffer[1] != '-')
+       pos += gotlen;
+       if (bufp[0] != '-' || bufp[1] != '-')

            continue;
        if (inout) {
            continue;
        if (inout) {

-           if (strcmp (buffer + 2, m->mp_start))
+           if (strcmp (bufp + 2, m->mp_start))

                continue;
 next_part:
            if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
                continue;
 next_part:
            if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)


@@ -1184,6 +1178,8 @@ next_part:
 
            if (!(p = get_content (fp, ct->c_file,
                        ct->c_subtype == MULTI_DIGEST ? -1 : 0))) {
 
            if (!(p = get_content (fp, ct->c_file,
                        ct->c_subtype == MULTI_DIGEST ? -1 : 0))) {

+               free(bufp);
+               fclose (ct->c_fp);

                ct->c_fp = NULL;
                return NOTOK;
            }
                ct->c_fp = NULL;
                return NOTOK;
            }


@@ -1193,18 +1189,18 @@ next_part:
            fseek (fp, pos, SEEK_SET);
            inout = 0;
        } else {
            fseek (fp, pos, SEEK_SET);
            inout = 0;
        } else {

-           if (strcmp (buffer + 2, m->mp_start) == 0) {
+           if (strcmp (bufp + 2, m->mp_start) == 0) {

                inout = 1;
 end_part:
                p = part->mp_part;
                inout = 1;
 end_part:
                p = part->mp_part;

-               p->c_end = ftell(fp) - (strlen(buffer) + 1);
+               p->c_end = ftell(fp) - (gotlen + 1);

                if (p->c_end < p->c_begin)
                    p->c_begin = p->c_end;
                if (inout)
                    goto next_part;
                goto last_part;
            } else {
                if (p->c_end < p->c_begin)
                    p->c_begin = p->c_end;
                if (inout)
                    goto next_part;
                goto last_part;
            } else {

-               if (strcmp (buffer + 2, m->mp_stop) == 0)
+               if (strcmp (bufp + 2, m->mp_stop) == 0)

                    goto end_part;
            }
        }
                    goto end_part;
            }
        }


@@ -1259,6 +1255,7 @@ last_part:
 
            /* 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) {

+               free(bufp);

                fclose (ct->c_fp);
                ct->c_fp = NULL;
                return NOTOK;
                fclose (ct->c_fp);
                ct->c_fp = NULL;
                return NOTOK;


@@ -1269,6 +1266,7 @@ last_part:
     get_leftover_mp_content (ct, 1);
     get_leftover_mp_content (ct, 0);
 
     get_leftover_mp_content (ct, 1);
     get_leftover_mp_content (ct, 0);
 

+    free(bufp);

     fclose (ct->c_fp);
     ct->c_fp = NULL;
     return OK;
     fclose (ct->c_fp);
     ct->c_fp = NULL;
     return OK;


@@ -1713,15 +1711,7 @@ openBase64 (CT ct, char **file)
 
     /* sbeck@cise.ufl.edu -- handle suffixes */
     ci = &ct->c_ctinfo;
 
     /* sbeck@cise.ufl.edu -- handle suffixes */
     ci = &ct->c_ctinfo;

-    snprintf (buffer, sizeof(buffer), "%s-suffix-%s/%s",
-              invo_name, ci->ci_type, ci->ci_subtype);
-    cp = context_find (buffer);
-    if (cp == NULL || *cp == '\0') {
-        snprintf (buffer, sizeof(buffer), "%s-suffix-%s", invo_name,
-                  ci->ci_type);
-        cp = context_find (buffer);
-    }
-    if (cp != NULL && *cp != '\0') {
+    if ((cp = context_find_by_type ("suffix", ci->ci_type, ci->ci_subtype))) {

        if (ce->ce_unlink) {
            /* Create temporary file with filename extension. */
            if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
        if (ce->ce_unlink) {
            /* Create temporary file with filename extension. */
            if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {


@@ -1923,7 +1913,9 @@ openQuoted (CT ct, char **file)
 {
     int        cc, digested, len, quoted, own_ct_fp = 0;
     char *cp, *ep;
 {
     int        cc, digested, len, quoted, own_ct_fp = 0;
     char *cp, *ep;

-    char buffer[BUFSIZ];
+    char *bufp = NULL;
+    size_t buflen;
+    ssize_t gotlen;

     unsigned char mask;
     CE ce = &ct->c_cefile;
     /* sbeck -- handle suffixes */
     unsigned char mask;
     CE ce = &ct->c_cefile;
     /* sbeck -- handle suffixes */


@@ -1952,15 +1944,7 @@ openQuoted (CT ct, char **file)
 
     /* sbeck@cise.ufl.edu -- handle suffixes */
     ci = &ct->c_ctinfo;
 
     /* sbeck@cise.ufl.edu -- handle suffixes */
     ci = &ct->c_ctinfo;

-    snprintf (buffer, sizeof(buffer), "%s-suffix-%s/%s",
-              invo_name, ci->ci_type, ci->ci_subtype);
-    cp = context_find (buffer);
-    if (cp == NULL || *cp == '\0') {
-        snprintf (buffer, sizeof(buffer), "%s-suffix-%s", invo_name,
-                  ci->ci_type);
-        cp = context_find (buffer);
-    }
-    if (cp != NULL && *cp != '\0') {
+    if ((cp = context_find_by_type ("suffix", ci->ci_type, ci->ci_subtype))) {

        if (ce->ce_unlink) {
            /* Create temporary file with filename extension. */
            if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
        if (ce->ce_unlink) {
            /* Create temporary file with filename extension. */
            if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {


@@ -2005,16 +1989,16 @@ openQuoted (CT ct, char **file)
 
     fseek (ct->c_fp, ct->c_begin, SEEK_SET);
     while (len > 0) {
 
     fseek (ct->c_fp, ct->c_begin, SEEK_SET);
     while (len > 0) {

-       if (fgets (buffer, sizeof(buffer) - 1, ct->c_fp) == NULL) {
+       if ((gotlen = getline(&bufp, &buflen, ct->c_fp)) == -1) {

            content_error (NULL, ct, "premature eof");
            goto clean_up;
        }
 
            content_error (NULL, ct, "premature eof");
            goto clean_up;
        }
 

-       if ((cc = strlen (buffer)) > len)
+       if ((cc = gotlen) > len)

            cc = len;
        len -= cc;
 
            cc = len;
        len -= cc;
 

-       for (ep = (cp = buffer) + cc - 1; cp <= ep; ep--)
+       for (ep = (cp = bufp) + cc - 1; cp <= ep; ep--)

            if (!isspace ((unsigned char) *ep))
                break;
        *++ep = '\n', ep++;
            if (!isspace ((unsigned char) *ep))
                break;
        *++ep = '\n', ep++;


@@ -2178,15 +2162,7 @@ open7Bit (CT ct, char **file)
 
     /* sbeck@cise.ufl.edu -- handle suffixes */
     ci = &ct->c_ctinfo;
 
     /* sbeck@cise.ufl.edu -- handle suffixes */
     ci = &ct->c_ctinfo;

-    snprintf (buffer, sizeof(buffer), "%s-suffix-%s/%s",
-              invo_name, ci->ci_type, ci->ci_subtype);
-    cp = context_find (buffer);
-    if (cp == NULL || *cp == '\0') {
-        snprintf (buffer, sizeof(buffer), "%s-suffix-%s", invo_name,
-                  ci->ci_type);
-        cp = context_find (buffer);
-    }
-    if (cp != NULL && *cp != '\0') {
+    if ((cp = context_find_by_type ("suffix", ci->ci_type, ci->ci_subtype))) {

        if (ce->ce_unlink) {
            /* Create temporary file with filename extension. */
            if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
        if (ce->ce_unlink) {
            /* Create temporary file with filename extension. */
            if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {


@@ -2478,13 +2454,6 @@ openFTP (CT ct, char **file)
        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    if (xpid) {
-       if (xpid < 0)
-           xpid = -xpid;
-       pidcheck (pidwait (xpid, NOTOK));
-       xpid = 0;
-    }
-

     /* Get the buffer ready to go */
     bp = buffer;
     buflen = sizeof(buffer);
     /* Get the buffer ready to go */
     bp = buffer;
     buflen = sizeof(buffer);


@@ -2684,13 +2653,6 @@ openMail (CT ct, char **file)
        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    if (xpid) {
-       if (xpid < 0)
-           xpid = -xpid;
-       pidcheck (pidwait (xpid, NOTOK));
-       xpid = 0;
-    }
-

     /* Get buffer ready to go */
     bp = buffer;
     buflen = sizeof(buffer);
     /* Get buffer ready to go */
     bp = buffer;
     buflen = sizeof(buffer);


@@ -2821,13 +2783,6 @@ openURL (CT ct, char **file)
        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    if (xpid) {
-       if (xpid < 0)
-           xpid = -xpid;
-       pidcheck (pidwait (xpid, NOTOK));
-       xpid = 0;
-    }
-

     ce->ce_unlink = (*file == NULL);
     caching = 0;
     cachefile[0] = '\0';
     ce->ce_unlink = (*file == NULL);
     caching = 0;
     cachefile[0] = '\0';


@@ -2996,12 +2951,15 @@ invalid_digest:
    after the last subpart that hasn't been stored anywhere else, so do
    that. */
 int
    after the last subpart that hasn't been stored anywhere else, so do
    that. */
 int

-get_leftover_mp_content (CT ct, int before /* or after */) {
+get_leftover_mp_content (CT ct, int before /* or after */)
+{

     struct multipart *m = (struct multipart *) ct->c_ctparams;
     char *boundary;
     int found_boundary = 0;
     struct multipart *m = (struct multipart *) ct->c_ctparams;
     char *boundary;
     int found_boundary = 0;

-    char buffer[BUFSIZ];

     int max = BUFSIZ;
     int max = BUFSIZ;

+    char *bufp = NULL;
+    size_t buflen;
+    ssize_t gotlen;

     int read = 0;
     char *content = NULL;
 
     int read = 0;
     char *content = NULL;
 


@@ -3034,18 +2992,18 @@ get_leftover_mp_content (CT ct, int before /* or after */) {
     }
 
     /* Back up by 1 to pick up the newline. */
     }
 
     /* Back up by 1 to pick up the newline. */

-    while (fgets (buffer, sizeof(buffer) - 1, ct->c_fp)) {
-        read += strlen (buffer);
+    while ((gotlen = getline(&bufp, &buflen, ct->c_fp)) != -1) {
+        read += gotlen;

         /* Don't look beyond beginning of first subpart (before) or
            next part (after). */
         /* Don't look beyond beginning of first subpart (before) or
            next part (after). */

-        if (read > max) buffer[read-max] = '\0';
+        if (read > max) bufp[read-max] = '\0';

 
         if (before) {
 
         if (before) {

-            if (! strcmp (buffer, boundary)) {
+            if (! strcmp (bufp, boundary)) {

                 found_boundary = 1;
             }
         } else {
                 found_boundary = 1;
             }
         } else {

-            if (! found_boundary  &&  ! strcmp (buffer, boundary)) {
+            if (! found_boundary  &&  ! strcmp (bufp, boundary)) {

                 found_boundary = 1;
                 continue;
             }
                 found_boundary = 1;
                 continue;
             }


@@ -3054,12 +3012,12 @@ get_leftover_mp_content (CT ct, int before /* or after */) {
         if ((before && ! found_boundary)  ||  (! before && found_boundary)) {
             if (content) {
                 char *old_content = content;
         if ((before && ! found_boundary)  ||  (! before && found_boundary)) {
             if (content) {
                 char *old_content = content;

-                content = concat (content, buffer, NULL);
+                content = concat (content, bufp, NULL);

                 free (old_content);
             } else {
                 content = before
                 free (old_content);
             } else {
                 content = before

-                    ?  concat ("\n", buffer, NULL)
-                    :  concat (buffer, NULL);
+                    ?  concat ("\n", bufp, NULL)
+                    :  concat (bufp, NULL);

             }
         }
 
             }
         }
 


@@ -3093,6 +3051,7 @@ get_leftover_mp_content (CT ct, int before /* or after */) {
     }
 
     free (boundary);
     }
 
     free (boundary);

+    free (bufp);

 
     return OK;
 }
 
     return OK;
 }


@@ -3892,8 +3851,12 @@ param_len(PM pm, int index, size_t valueoff, int *encode, int *cont,
         * add them now.
         */
 
         * add them now.
         */
 

-       if (! pm->pm_charset)
+       if (! pm->pm_charset) {

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

+           if (strcasecmp(pm->pm_charset, "US-ASCII") == 0)
+               adios(NULL, "8-bit characters in parameter \"%s\", but "
+                     "local character set is US-ASCII", pm->pm_name);
+       }

        if (! pm->pm_lang)
            pm->pm_lang = getcpy(NULL); /* Default to a blank lang tag */
 
        if (! pm->pm_lang)
            pm->pm_lang = getcpy(NULL); /* Default to a blank lang tag */