X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparse.c;h=f520e03de064f5382771bc19c2f0fd0cf9fa3066;hp=af460e6a0df624ea9b5b3a1b6eae9a380834f6e5;hb=1e9a7f8082f2ea4b496827be6b9ebbc4ac145839;hpb=264f6e648f566f8efaa0188fb6a9e4908329d6d6

diff --git a/uip/mhparse.c b/uip/mhparse.c
index af460e6..f520e03 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -8,14 +8,16 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <h/signals.h>
-#include <errno.h>
-#include <setjmp.h>
 #include <signal.h>
+#include <errno.h>
 #include <h/tws.h>
 #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;
 
@@ -137,7 +139,7 @@ pidcheck(int status)
 
 	fflush(stdout);
 	fflush(stderr);
-	done(1);
+	exit(EX_SOFTWARE);
 	return 1;
 }
 
@@ -237,7 +239,7 @@ get_content(FILE *in, char *file, int toplevel)
 
 	/* allocate the content structure */
 	if (!(ct = (CT) calloc(1, sizeof(*ct))))
-		adios(NULL, "out of memory");
+		adios(EX_OSERR, NULL, "out of memory");
 
 	ct->c_fp = in;
 	ct->c_file = getcpy(file);
@@ -286,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 */
@@ -764,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++;
 
@@ -980,7 +984,7 @@ InitText(CT ct)
 
 	/* allocate text character set structure */
 	if ((t = (struct text *) calloc(1, sizeof(*t))) == NULL)
-		adios(NULL, "out of memory");
+		adios(EX_OSERR, NULL, "out of memory");
 	ct->c_ctparams = (void *) t;
 
 	/* scan for charset parameter */
@@ -1033,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 */
@@ -1062,7 +1066,7 @@ InitMultiPart(CT ct)
 
 	/* allocate primary structure for multipart info */
 	if ((m = (struct multipart *) calloc(1, sizeof(*m))) == NULL)
-		adios(NULL, "out of memory");
+		adios(EX_OSERR, NULL, "out of memory");
 	ct->c_ctparams = (void *) m;
 
 	/* check if boundary parameter contains only whitespace characters */
@@ -1107,7 +1111,7 @@ InitMultiPart(CT ct)
 next_part:
 			if ((part = (struct part *) calloc(1, sizeof(*part)))
 					== NULL)
-				adios(NULL, "out of memory");
+				adios(EX_OSERR, NULL, "out of memory");
 			*next = part;
 			next = &part->mp_next;
 
@@ -1222,7 +1226,7 @@ reverse_parts(CT ct)
 
 	/* allocate array of pointers to the parts */
 	if (!(base = (struct part **) calloc((size_t) (i + 1), sizeof(*base))))
-		adios(NULL, "out of memory");
+		adios(EX_OSERR, NULL, "out of memory");
 	bmp = base;
 
 	/* point at all the parts */
@@ -1279,7 +1283,7 @@ InitMessage(CT ct)
 		struct partial *p;
 
 		if ((p = (struct partial *) calloc(1, sizeof(*p))) == NULL)
-			adios(NULL, "out of memory");
+		adios(EX_OSERR, NULL, "out of memory");
 		ct->c_ctparams = (void *) p;
 
 		/*
@@ -1392,7 +1396,7 @@ init_encoding(CT ct, OpenCEFunc openfnx)
 	CE ce;
 
 	if ((ce = (CE) calloc(1, sizeof(*ce))) == NULL)
-		adios(NULL, "out of memory");
+		adios(EX_OSERR, NULL, "out of memory");
 
 	ct->c_cefile     = ce;
 	ct->c_ceopenfnx  = openfnx;
@@ -1548,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);
@@ -1565,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) {
@@ -1759,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);
@@ -1776,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) {
@@ -1976,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);
@@ -2042,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) {