X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparse.c;h=a478b4271f98ff3c4a31aa40ba3d9220fc772e18;hp=04333f49b2f069943312b8f9ea9f9d090a692351;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=a87df3543d3bc128ba4079d1f95638476ba5ca50

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 04333f4..a478b42 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))
@@ -232,16 +232,16 @@ static CT
 get_content(FILE *in, char *file, int toplevel)
 {
 	enum state state;
-	struct field f = free_field;
+	struct field f = {{0}};
 	int compnum;
 	CT ct;
 	HF hp;
 
 	/* allocate the content structure */
-	ct = (CT) mh_xcalloc(1, sizeof(*ct));
+	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;
 
 	/*
@@ -250,11 +250,17 @@ get_content(FILE *in, char *file, int toplevel)
 	*/
 	for (compnum = 1, state = FLD2;;) {
 		switch (state = m_getfld2(state, &f, in)) {
+		case LENERR2:
+			state = FLD2;
+			/* FALL */
 		case FLD2:
+			if (compnum == 1) {
+				ct->crlf = f.value[f.valuelen-2] == '\r';
+			}
 			compnum++;
 
 			/* add the header data to the list */
-			add_header(ct, getcpy(f.name), getcpy(f.value));
+			add_header(ct, mh_xstrdup(f.name), mh_xstrdup(f.value));
 
 			ct->c_begin = ftell(in) + 1;
 			continue;
@@ -267,11 +273,13 @@ get_content(FILE *in, char *file, int toplevel)
 			ct->c_begin = ftell(in);
 			break;
 
-		case LENERR2:
 		case FMTERR2:
+			advise(NULL, "message format error in component #%d", compnum);
+			state = FLD2;
+			continue;
+
 		case IOERR2:
-			adios(EX_DATAERR, NULL, "message format error in component #%d",
-					compnum);
+			adios(EX_IOERR, "m_getfld2", "io error");
 
 		default:
 			adios(EX_SOFTWARE, NULL, "getfld() returned %d", state);
@@ -298,7 +306,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;
@@ -370,7 +378,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++;
@@ -462,7 +470,7 @@ add_header(CT ct, char *name, char *value)
 	HF hp;
 
 	/* allocate header field structure */
-	hp = mh_xmalloc(sizeof(*hp));
+	hp = mh_xcalloc(1, sizeof(*hp));
 
 	/* link data into header structure */
 	hp->name = name;
@@ -517,24 +525,24 @@ 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';
 				newbuf = concat(prefix, insertion, suffix,
 						"\n", NULL);
-				free(suffix);
+				mh_free0(&suffix);
 			} else {
 				/* Append to end. */
 				newbuf = concat(buf, insertion, "\n", NULL);
 			}
 
-			free(prefix);
-			free(insertion);
-			free(buf);
+			mh_free0(&prefix);
+			mh_free0(&insertion);
+			mh_free0(&buf);
 		}
 
-		free(name_plus_equal);
+		mh_free0(&name_plus_equal);
 	}
 
 	return newbuf;
@@ -545,14 +553,20 @@ 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;
 
-	free(name_suffix_plus_quote);
+	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;
 
@@ -564,7 +578,7 @@ extract_name_value(char *name_suffix, char *value) {
 		for (; *cp != '"'; ++cp)
 			;
 
-		extracted_name_value = mh_xmalloc(cp - name_suffix_begin + 1);
+		extracted_name_value = mh_xcalloc(cp - name_suffix_begin + 1, sizeof(char));
 		memcpy(extracted_name_value, name_suffix_begin,
 				cp - name_suffix_begin);
 		extracted_name_value[cp - name_suffix_begin] = '\0';
@@ -590,7 +604,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++;
@@ -614,7 +628,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) {
@@ -636,7 +650,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;
 	}
 
@@ -650,7 +664,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) {
@@ -707,7 +721,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++;
@@ -764,8 +778,7 @@ bad_quote:
 	*/
 	if (magic && *cp == '<') {
 		if (ct->c_id) {
-			free(ct->c_id);
-			ct->c_id = NULL;
+			mh_free0(&(ct->c_id));
 		}
 		if (!(dp = strchr(ct->c_id = ++cp, '>'))) {
 			advise(NULL, "invalid ID in message %s", ct->c_file);
@@ -845,7 +858,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
@@ -912,9 +925,9 @@ invalid:
 	if (istype) {
 		if ((dp = ci->ci_comment)) {
 			ci->ci_comment = concat(dp, " ", buffer, NULL);
-			free(dp);
+			mh_free0(&dp);
 		} else {
-			ci->ci_comment = getcpy(buffer);
+			ci->ci_comment = mh_xstrdup(buffer);
 		}
 	}
 
@@ -963,7 +976,7 @@ InitText(CT ct)
 	ct->c_subtype = kv->kv_value;
 
 	/* allocate text character set structure */
-	t = (struct text *) mh_xcalloc(1, sizeof(*t));
+	t = mh_xcalloc(1, sizeof(*t));
 	ct->c_ctparams = (void *) t;
 
 	/* scan for charset parameter */
@@ -974,7 +987,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)) {
@@ -1015,7 +1028,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;
 	}
 
@@ -1044,7 +1057,7 @@ InitMultiPart(CT ct)
 	}
 
 	/* allocate primary structure for multipart info */
-	m = (struct multipart *) mh_xcalloc(1, sizeof(*m));
+	m = mh_xcalloc(1, sizeof(*m));
 	ct->c_ctparams = (void *) m;
 
 	/* check if boundary parameter contains only whitespace characters */
@@ -1062,8 +1075,14 @@ InitMultiPart(CT ct)
 	*++dp = '\0';
 
 	/* record boundary separators */
-	m->mp_start = concat(bp, "\n", NULL);
-	m->mp_stop = concat(bp, "--\n", NULL);
+	if (!ct->crlf) {
+		m->mp_start = concat(bp, "\n", NULL);
+		m->mp_stop = concat(bp, "--\n", NULL);
+	} else {
+		m->mp_start = concat(bp, "\r\n", NULL);
+		m->mp_stop = concat(bp, "--\r\n", NULL);
+	}
+
 
 	if (!ct->c_fp && (ct->c_fp = fopen(ct->c_file, "r")) == NULL) {
 		advise(ct->c_file, "unable to open for reading");
@@ -1087,7 +1106,7 @@ InitMultiPart(CT ct)
 			if (strcmp(buffer + 2, m->mp_start)!=0)
 				continue;
 next_part:
-			part = (struct part *) mh_xcalloc(1, sizeof(*part));
+			part = mh_xcalloc(1, sizeof(*part));
 			*next = part;
 			next = &part->mp_next;
 
@@ -1130,7 +1149,7 @@ end_part:
 				continue;
 			*next = NULL;
 			free_content(p);
-			free((char *) part);
+			mh_free0(&part);
 		}
 	}
 
@@ -1161,7 +1180,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) {
@@ -1201,7 +1220,7 @@ reverse_parts(CT ct)
 		i++;
 
 	/* allocate array of pointers to the parts */
-	base = (struct part **) mh_xcalloc((size_t) (i + 1), sizeof(*base));
+	base = mh_xcalloc(i + 1, sizeof(*base));
 	bmp = base;
 
 	/* point at all the parts */
@@ -1219,7 +1238,7 @@ reverse_parts(CT ct)
 	*next = NULL;
 
 	/* free array of pointers */
-	free((char *) base);
+	mh_free0(&base);
 }
 
 
@@ -1233,9 +1252,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 */
@@ -1257,7 +1276,7 @@ InitMessage(CT ct)
 		char **ap, **ep;
 		struct partial *p;
 
-		p = (struct partial *) mh_xcalloc(1, sizeof(*p));
+		p = mh_xcalloc(1, sizeof(*p));
 		ct->c_ctparams = (void *) p;
 
 		/*
@@ -1266,7 +1285,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")) {
@@ -1369,7 +1388,7 @@ init_encoding(CT ct, OpenCEFunc openfnx)
 {
 	CE ce;
 
-	ce = (CE) mh_xcalloc(1, sizeof(*ce));
+	ce = mh_xcalloc(1, sizeof(*ce));
 
 	ct->c_cefile     = ce;
 	ct->c_ceopenfnx  = openfnx;
@@ -1499,10 +1518,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;
 	}
 
@@ -1522,13 +1541,13 @@ 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 ",
 						file_org);
 			}
-			free(file_org);
+			mh_free0(&file_org);
 
 		} else {
 			ce->ce_file = add(cp, ce->ce_file);
@@ -1710,10 +1729,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;
 	}
 
@@ -1733,13 +1752,13 @@ 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 ",
 						file_org);
 			}
-			free(file_org);
+			mh_free0(&file_org);
 
 		} else {
 			ce->ce_file = add(cp, ce->ce_file);
@@ -1927,10 +1946,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;
 	}
 
@@ -1950,13 +1969,13 @@ 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 ",
 						file_org);
 			}
-			free(file_org);
+			mh_free0(&file_org);
 
 		} else {
 			ce->ce_file = add(cp, ce->ce_file);