X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparse.c;h=8e8b3605cb1134d8fbbbd939c81fc9f01fb693e6;hp=f04a3482017a0d5fced7a45d7ea6424921f4d852;hb=79cbafe7268202d5b9c231b2d25472c152caa709;hpb=d4c34b4439a9dbd89664de460ed37ecddc260fb1

diff --git a/uip/mhparse.c b/uip/mhparse.c
index f04a348..8e8b360 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -166,7 +166,7 @@ parse_mime(char *file)
 			advise("mhparse", "unable to create temporary file");
 			return NULL;
 		}
-		file = getcpy(tfile);
+		file = mh_xstrdup(tfile);
 		chmod(file, 0600);
 
 		while (fgets(buffer, sizeof(buffer), stdin))
@@ -231,9 +231,9 @@ parse_mime(char *file)
 static CT
 get_content(FILE *in, char *file, int toplevel)
 {
-	int compnum, state;
-	char buf[BUFSIZ], name[NAMESZ];
-	char *np, *vp;
+	enum state state;
+	struct field f = {{0}};
+	int compnum;
 	CT ct;
 	HF hp;
 
@@ -241,54 +241,46 @@ get_content(FILE *in, char *file, int toplevel)
 	ct = mh_xcalloc(1, sizeof(*ct));
 
 	ct->c_fp = in;
-	ct->c_file = getcpy(file);
+	ct->c_file = mh_xstrdup(file);
 	ct->c_begin = ftell(ct->c_fp) + 1;
 
 	/*
 	** Parse the header fields for this
 	** content into a linked list.
 	*/
-	for (compnum = 1, state = FLD;;) {
-		switch (state = m_getfld(state, name, buf, sizeof(buf), in)) {
-		case FLD:
-		case FLDPLUS:
+	for (compnum = 1, state = FLD2;;) {
+		switch (state = m_getfld2(state, &f, in)) {
+		case LENERR2:
+			state = FLD2;
+			/* FALL */
+		case FLD2:
 			compnum++;
 
-			/* get copies of the buffers */
-			np = getcpy(name);
-			vp = getcpy(buf);
-
-			/* if necessary, get rest of field */
-			while (state == FLDPLUS) {
-				state = m_getfld(state, name, buf,
-						sizeof(buf), in);
-				vp = add(buf, vp);  /* add to previous value */
-			}
-
-			/* Now add the header data to the list */
-			add_header(ct, np, vp);
+			/* add the header data to the list */
+			add_header(ct, mh_xstrdup(f.name), mh_xstrdup(f.value));
 
 			ct->c_begin = ftell(in) + 1;
 			continue;
 
-		case BODY:
-			ct->c_begin = ftell(in) - strlen(buf);
+		case BODY2:
+			ct->c_begin = ftell(in) - strlen(f.value);
 			break;
 
-		case FILEEOF:
+		case FILEEOF2:
 			ct->c_begin = ftell(in);
 			break;
 
-		case LENERR:
-		case FMTERR:
-			adios(EX_DATAERR, NULL, "message format error in component #%d",
-					compnum);
+		case FMTERR2:
+			advise(NULL, "message format error in component #%d", compnum);
+			state = FLD2;
+			continue;
+
+		case IOERR2:
+			adios(EX_IOERR, "m_getfld2", "io error");
 
 		default:
 			adios(EX_SOFTWARE, NULL, "getfld() returned %d", state);
 		}
-
-		/* break out of the loop */
 		break;
 	}
 
@@ -311,7 +303,7 @@ get_content(FILE *in, char *file, int toplevel)
 				advise(NULL, "message %s has multiple %s: fields", ct->c_file, VRSN_FIELD);
 				goto next_header;
 			}
-			ct->c_vrsn = getcpy(hp->value);
+			ct->c_vrsn = mh_xstrdup(hp->value);
 
 			/* Now, cleanup this field */
 			cp = ct->c_vrsn;
@@ -383,7 +375,7 @@ get_content(FILE *in, char *file, int toplevel)
 			}
 
 			/* get copy of this field */
-			ct->c_celine = cp = getcpy(hp->value);
+			ct->c_celine = cp = mh_xstrdup(hp->value);
 
 			while (isspace(*cp))
 				cp++;
@@ -530,7 +522,7 @@ incl_name_value(unsigned char *buf, char *name, char *value) {
 			** Insert at first semicolon, if any.
 			** If none, append to end.
 			*/
-			prefix = getcpy(buf);
+			prefix = mh_xstrdup(buf);
 			if ((cp = strchr(prefix, ';'))) {
 				suffix = concat(cp, NULL);
 				*cp = '\0';
@@ -558,13 +550,19 @@ incl_name_value(unsigned char *buf, char *name, char *value) {
 ** one, return the entire value.  Note that, for example, a name_suffix
 ** of name will match filename="foo", and return foo.
 */
-static char *
+char *
 extract_name_value(char *name_suffix, char *value) {
-	char *extracted_name_value = value;
-	char *name_suffix_plus_quote = concat(name_suffix, "=\"", NULL);
-	char *name_suffix_equals = strstr(value, name_suffix_plus_quote);
+	char *extracted_name_value;
+	char *name_suffix_plus_quote;
+	char *name_suffix_equals;
 	char *cp;
 
+	if (!value) {
+		return value;
+	}
+	extracted_name_value = value;
+	name_suffix_plus_quote = concat(name_suffix, "=\"", NULL);
+	name_suffix_equals = strstr(value, name_suffix_plus_quote);
 	mh_free0(&name_suffix_plus_quote);
 	if (name_suffix_equals) {
 		char *name_suffix_begin;
@@ -603,7 +601,7 @@ get_ctinfo(unsigned char *cp, CT ct, int magic)
 	i = strlen(invo_name) + 2;
 
 	/* store copy of Content-Type line */
-	cp = ct->c_ctline = getcpy(cp);
+	cp = ct->c_ctline = mh_xstrdup(cp);
 
 	while (isspace(*cp))  /* trim leading spaces */
 		cp++;
@@ -627,7 +625,7 @@ get_ctinfo(unsigned char *cp, CT ct, int magic)
 	for (dp = cp; istoken(*dp); dp++)
 		continue;
 	c = *dp, *dp = '\0';
-	ci->ci_type = getcpy(cp);  /* store content type */
+	ci->ci_type = mh_xstrdup(cp);  /* store content type */
 	*dp = c, cp = dp;
 
 	if (!*ci->ci_type) {
@@ -649,7 +647,7 @@ get_ctinfo(unsigned char *cp, CT ct, int magic)
 
 	if (*cp != '/') {
 		if (!magic)
-			ci->ci_subtype = getcpy("");
+			ci->ci_subtype = mh_xstrdup("");
 		goto magic_skip;
 	}
 
@@ -663,7 +661,7 @@ get_ctinfo(unsigned char *cp, CT ct, int magic)
 	for (dp = cp; istoken(*dp); dp++)
 		continue;
 	c = *dp, *dp = '\0';
-	ci->ci_subtype = getcpy(cp);  /* store the content subtype */
+	ci->ci_subtype = mh_xstrdup(cp);  /* store the content subtype */
 	*dp = c, cp = dp;
 
 	if (!*ci->ci_subtype) {
@@ -720,7 +718,7 @@ magic_skip:
 			return NOTOK;
 		}
 
-		vp = (*ap = getcpy(cp)) + (up - cp);
+		vp = (*ap = mh_xstrdup(cp)) + (up - cp);
 		*vp = '\0';
 		for (dp++; isspace(*dp);)
 			dp++;
@@ -857,7 +855,7 @@ bad_quote:
 	*/
 	if (*cp) {
 		if (magic) {
-			ci->ci_magic = getcpy(cp);
+			ci->ci_magic = mh_xstrdup(cp);
 
 			/*
 			** If there is a Content-Disposition header and
@@ -926,7 +924,7 @@ invalid:
 			ci->ci_comment = concat(dp, " ", buffer, NULL);
 			mh_free0(&dp);
 		} else {
-			ci->ci_comment = getcpy(buffer);
+			ci->ci_comment = mh_xstrdup(buffer);
 		}
 	}
 
@@ -986,7 +984,7 @@ InitText(CT ct)
 	/* check if content specified a character set */
 	if (*ap) {
 		/* store its name */
-		ct->c_charset = getcpy(norm_charmap(*ep));
+		ct->c_charset = mh_xstrdup(norm_charmap(*ep));
 		/* match character set or set to CHARSET_UNKNOWN */
 		for (kv = Charset; kv->kv_key; kv++) {
 			if (!mh_strcasecmp(*ep, kv->kv_key)) {
@@ -1027,7 +1025,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);
+		admonish(NULL, "\"%s/%s\" type in message %s should be encoded in 7bit, 8bit, or binary", ci->ci_type, ci->ci_subtype, ct->c_file);
 		ct->c_encoding = CE_7BIT;
 	}
 
@@ -1173,7 +1171,7 @@ last_part:
 			p = part->mp_part;
 
 			sprintf(pp, "%d", partnum);
-			p->c_partno = getcpy(partnam);
+			p->c_partno = mh_xstrdup(partnam);
 
 			/* initialize the content of the subparts */
 			if (p->c_ctinitfnx && (*p->c_ctinitfnx) (p) == NOTOK) {
@@ -1245,9 +1243,9 @@ InitMessage(CT ct)
 	struct k2v *kv;
 	CI ci = &ct->c_ctinfo;
 
-	if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT)) {
-		admonish(NULL, "\"%s/%s\" type in message %s should be encoded in 7bit or 8bit", ci->ci_type, ci->ci_subtype, ct->c_file);
-		return NOTOK;
+	if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT) && (ct->c_encoding != CE_BINARY)) {
+		admonish(NULL, "\"%s/%s\" type in message %s should be encoded in 7bit, 8bit, or binary", ci->ci_type, ci->ci_subtype, ct->c_file);
+		ct->c_encoding = CE_7BIT;
 	}
 
 	/* check for missing subtype */
@@ -1278,7 +1276,7 @@ InitMessage(CT ct)
 		*/
 		for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
 			if (!mh_strcasecmp(*ap, "id")) {
-				p->pm_partid = getcpy(*ep);
+				p->pm_partid = mh_xstrdup(*ep);
 				continue;
 			}
 			if (!mh_strcasecmp(*ap, "number")) {
@@ -1511,10 +1509,10 @@ openBase64(CT ct, char **file)
 	}
 
 	if (*file == NULL) {
-		ce->ce_file = getcpy(m_mktemp(tmp, NULL, NULL));
+		ce->ce_file = mh_xstrdup(m_mktemp(tmp, NULL, NULL));
 		ce->ce_unlink = 1;
 	} else {
-		ce->ce_file = getcpy(*file);
+		ce->ce_file = mh_xstrdup(*file);
 		ce->ce_unlink = 0;
 	}
 
@@ -1534,7 +1532,7 @@ openBase64(CT ct, char **file)
 			** Temporary file already exists, so we rename to
 			** version with extension.
 			*/
-			char *file_org = strdup(ce->ce_file);
+			char *file_org = mh_xstrdup(ce->ce_file);
 			ce->ce_file = add(cp, ce->ce_file);
 			if (rename(file_org, ce->ce_file)) {
 				adios(EX_IOERR, ce->ce_file, "unable to rename %s to ",
@@ -1722,10 +1720,10 @@ openQuoted(CT ct, char **file)
 	}
 
 	if (*file == NULL) {
-		ce->ce_file = getcpy(m_mktemp(tmp, NULL, NULL));
+		ce->ce_file = mh_xstrdup(m_mktemp(tmp, NULL, NULL));
 		ce->ce_unlink = 1;
 	} else {
-		ce->ce_file = getcpy(*file);
+		ce->ce_file = mh_xstrdup(*file);
 		ce->ce_unlink = 0;
 	}
 
@@ -1745,7 +1743,7 @@ openQuoted(CT ct, char **file)
 			** Temporary file already exists, so we rename to
 			** version with extension.
 			*/
-			char *file_org = strdup(ce->ce_file);
+			char *file_org = mh_xstrdup(ce->ce_file);
 			ce->ce_file = add(cp, ce->ce_file);
 			if (rename(file_org, ce->ce_file)) {
 				adios(EX_IOERR, ce->ce_file, "unable to rename %s to ",
@@ -1939,10 +1937,10 @@ open7Bit(CT ct, char **file)
 	}
 
 	if (*file == NULL) {
-		ce->ce_file = getcpy(m_mktemp(tmp, NULL, NULL));
+		ce->ce_file = mh_xstrdup(m_mktemp(tmp, NULL, NULL));
 		ce->ce_unlink = 1;
 	} else {
-		ce->ce_file = getcpy(*file);
+		ce->ce_file = mh_xstrdup(*file);
 		ce->ce_unlink = 0;
 	}
 
@@ -1962,7 +1960,7 @@ open7Bit(CT ct, char **file)
 			** Temporary file already exists, so we rename to
 			** version with extension.
 			*/
-			char *file_org = strdup(ce->ce_file);
+			char *file_org = mh_xstrdup(ce->ce_file);
 			ce->ce_file = add(cp, ce->ce_file);
 			if (rename(file_org, ce->ce_file)) {
 				adios(EX_IOERR, ce->ce_file, "unable to rename %s to ",