Remove dead code: FLDEOF and BODYEOF are never set

[mmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index e83932c..4885572 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -14,6 +14,10 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <sysexits.h>
 
 extern int debugsw;
 
@@ -135,7 +139,7 @@ pidcheck(int status)
 
        fflush(stdout);
        fflush(stderr);
-       exit(1);
+       exit(EX_SOFTWARE);
        return 1;
 }
 
@@ -234,8 +238,8 @@ get_content(FILE *in, char *file, int toplevel)
        HF hp;
 
        /* allocate the content structure */
-       if (!(ct = (CT) calloc(1, sizeof(*ct))))
-               adios(NULL, "out of memory");
+       if (!(ct = (CT) mh_xcalloc(1, sizeof(*ct))))
+               adios(EX_OSERR, NULL, "out of memory");
 
        ct->c_fp = in;
        ct->c_file = getcpy(file);
@@ -249,7 +253,6 @@ get_content(FILE *in, char *file, int toplevel)
                switch (state = m_getfld(state, name, buf, sizeof(buf), in)) {
                case FLD:
                case FLDPLUS:
-               case FLDEOF:
                        compnum++;
 
                        /* get copies of the buffers */
@@ -266,15 +269,10 @@ get_content(FILE *in, char *file, int toplevel)
                        /* Now add the header data to the list */
                        add_header(ct, np, vp);
 
-                       /* continue, if this isn't the last header field */
-                       if (state != FLDEOF) {
-                               ct->c_begin = ftell(in) + 1;
-                               continue;
-                       }
-                       /* else fall... */
+                       ct->c_begin = ftell(in) + 1;
+                       continue;
 
                case BODY:
-               case BODYEOF:
                        ct->c_begin = ftell(in) - strlen(buf);
                        break;
 
@@ -284,11 +282,11 @@ get_content(FILE *in, char *file, int toplevel)
 
                case LENERR:
                case FMTERR:
-                       adios(NULL, "message format error in component #%d",
+                       adios(EX_DATAERR, NULL, "message format error in component #%d",
                                        compnum);
 
                default:
-                       adios(NULL, "getfld() returned %d", state);
+                       adios(EX_SOFTWARE, NULL, "getfld() returned %d", state);
                }
 
                /* break out of the loop */
@@ -762,7 +760,9 @@ bad_quote:
                }
                if (!*vp) {
                        advise(NULL, "invalid parameter in message %s's %s: field\n%*.*s(parameter %s)", ct->c_file, TYPE_FIELD, i, i, "", *ap);
-                       return NOTOK;
+                       *ci->ci_values[ap - ci->ci_attrs] = '\0';
+                       *ci->ci_attrs[ap - ci->ci_attrs] = '\0';
+                       continue;
                }
                ap++;
 
@@ -977,8 +977,8 @@ InitText(CT ct)
        ct->c_subtype = kv->kv_value;
 
        /* allocate text character set structure */
-       if ((t = (struct text *) calloc(1, sizeof(*t))) == NULL)
-               adios(NULL, "out of memory");
+       if ((t = (struct text *) mh_xcalloc(1, sizeof(*t))) == NULL)
+               adios(EX_OSERR, NULL, "out of memory");
        ct->c_ctparams = (void *) t;
 
        /* scan for charset parameter */
@@ -1031,7 +1031,7 @@ InitMultiPart(CT ct)
        if (ct->c_encoding != CE_7BIT && ct->c_encoding != CE_8BIT
                && ct->c_encoding != CE_BINARY) {
                admonish(NULL, "\"%s/%s\" type in message %s must be encoded in 7bit, 8bit, or binary", ci->ci_type, ci->ci_subtype, ct->c_file);
-               return NOTOK;
+               ct->c_encoding = CE_7BIT;
        }
 
        /* match subtype */
@@ -1059,8 +1059,8 @@ InitMultiPart(CT ct)
        }
 
        /* allocate primary structure for multipart info */
-       if ((m = (struct multipart *) calloc(1, sizeof(*m))) == NULL)
-               adios(NULL, "out of memory");
+       if ((m = (struct multipart *) mh_xcalloc(1, sizeof(*m))) == NULL)
+               adios(EX_OSERR, NULL, "out of memory");
        ct->c_ctparams = (void *) m;
 
        /* check if boundary parameter contains only whitespace characters */
@@ -1103,9 +1103,9 @@ InitMultiPart(CT ct)
                        if (strcmp(buffer + 2, m->mp_start)!=0)
                                continue;
 next_part:
-                       if ((part = (struct part *) calloc(1, sizeof(*part)))
+                       if ((part = (struct part *) mh_xcalloc(1, sizeof(*part)))
                                        == NULL)
-                               adios(NULL, "out of memory");
+                               adios(EX_OSERR, NULL, "out of memory");
                        *next = part;
                        next = &part->mp_next;
 
@@ -1219,8 +1219,8 @@ reverse_parts(CT ct)
                i++;
 
        /* allocate array of pointers to the parts */
-       if (!(base = (struct part **) calloc((size_t) (i + 1), sizeof(*base))))
-               adios(NULL, "out of memory");
+       if (!(base = (struct part **) mh_xcalloc((size_t) (i + 1), sizeof(*base))))
+               adios(EX_OSERR, NULL, "out of memory");
        bmp = base;
 
        /* point at all the parts */
@@ -1276,8 +1276,8 @@ InitMessage(CT ct)
                char **ap, **ep;
                struct partial *p;
 
-               if ((p = (struct partial *) calloc(1, sizeof(*p))) == NULL)
-                       adios(NULL, "out of memory");
+               if ((p = (struct partial *) mh_xcalloc(1, sizeof(*p))) == NULL)
+               adios(EX_OSERR, NULL, "out of memory");
                ct->c_ctparams = (void *) p;
 
                /*
@@ -1389,8 +1389,8 @@ init_encoding(CT ct, OpenCEFunc openfnx)
 {
        CE ce;
 
-       if ((ce = (CE) calloc(1, sizeof(*ce))) == NULL)
-               adios(NULL, "out of memory");
+       if ((ce = (CE) mh_xcalloc(1, sizeof(*ce))) == NULL)
+               adios(EX_OSERR, NULL, "out of memory");
 
        ct->c_cefile     = ce;
        ct->c_ceopenfnx  = openfnx;
@@ -1546,7 +1546,7 @@ openBase64(CT ct, char **file)
                        char *file_org = strdup(ce->ce_file);
                        ce->ce_file = add(cp, ce->ce_file);
                        if (rename(file_org, ce->ce_file)) {
-                               adios(ce->ce_file, "unable to rename %s to ",
+                               adios(EX_IOERR, ce->ce_file, "unable to rename %s to ",
                                                file_org);
                        }
                        free(file_org);
@@ -1563,7 +1563,7 @@ openBase64(CT ct, char **file)
        }
 
        if ((len = ct->c_end - ct->c_begin) < 0)
-               adios(NULL, "internal error(1)");
+               adios(EX_SOFTWARE, NULL, "internal error(1)");
 
        if (!ct->c_fp) {
                if ((ct->c_fp = fopen(ct->c_file, "r")) == NULL) {
@@ -1757,7 +1757,7 @@ openQuoted(CT ct, char **file)
                        char *file_org = strdup(ce->ce_file);
                        ce->ce_file = add(cp, ce->ce_file);
                        if (rename(file_org, ce->ce_file)) {
-                               adios(ce->ce_file, "unable to rename %s to ",
+                               adios(EX_IOERR, ce->ce_file, "unable to rename %s to ",
                                                file_org);
                        }
                        free(file_org);
@@ -1774,7 +1774,7 @@ openQuoted(CT ct, char **file)
        }
 
        if ((len = ct->c_end - ct->c_begin) < 0)
-               adios(NULL, "internal error(2)");
+               adios(EX_SOFTWARE, NULL, "internal error(2)");
 
        if (!ct->c_fp) {
                if ((ct->c_fp = fopen(ct->c_file, "r")) == NULL) {
@@ -1974,7 +1974,7 @@ open7Bit(CT ct, char **file)
                        char *file_org = strdup(ce->ce_file);
                        ce->ce_file = add(cp, ce->ce_file);
                        if (rename(file_org, ce->ce_file)) {
-                               adios(ce->ce_file, "unable to rename %s to ",
+                               adios(EX_IOERR, ce->ce_file, "unable to rename %s to ",
                                                file_org);
                        }
                        free(file_org);
@@ -2040,7 +2040,7 @@ open7Bit(CT ct, char **file)
        }
 
        if ((len = ct->c_end - ct->c_begin) < 0)
-               adios(NULL, "internal error(3)");
+               adios(EX_SOFTWARE, NULL, "internal error(3)");
 
        if (!ct->c_fp) {
                if ((ct->c_fp = fopen(ct->c_file, "r")) == NULL) {