X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparse.c;h=2afb03a2f57efbb00200bad3b178677d9e202aea;hp=f4c26cc844c3458afab4250e466651b110ea6c5f;hb=770d341357b1a6890c7eea72070d0a9e3e270bf9;hpb=5a12e4b0477d3ad699f5713682d26079f2792d17 diff --git a/uip/mhparse.c b/uip/mhparse.c index f4c26cc..2afb03a 100644 --- a/uip/mhparse.c +++ b/uip/mhparse.c @@ -8,13 +8,16 @@ #include #include -#include -#include #include +#include #include #include #include #include +#include +#include +#include +#include extern int debugsw; @@ -136,7 +139,7 @@ pidcheck(int status) fflush(stdout); fflush(stderr); - exit(1); + exit(EX_SOFTWARE); return 1; } @@ -235,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); @@ -285,11 +288,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 */ @@ -763,7 +766,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++; @@ -978,8 +983,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 */ @@ -1032,7 +1037,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 */ @@ -1060,8 +1065,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 */ @@ -1104,9 +1109,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; @@ -1220,8 +1225,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 */ @@ -1277,8 +1282,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; /* @@ -1390,8 +1395,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; @@ -1547,7 +1552,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); @@ -1564,7 +1569,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) { @@ -1758,7 +1763,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); @@ -1775,7 +1780,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) { @@ -1975,7 +1980,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); @@ -2041,7 +2046,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) {