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

diff --git a/uip/mhparse.c b/uip/mhparse.c
index f520e03..1cbefed 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -231,15 +231,14 @@ 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;
 
 	/* allocate the content structure */
-	if (!(ct = (CT) calloc(1, sizeof(*ct))))
-		adios(EX_OSERR, NULL, "out of memory");
+	ct = (CT) mh_xcalloc(1, sizeof(*ct));
 
 	ct->c_fp = in;
 	ct->c_file = getcpy(file);
@@ -249,53 +248,34 @@ get_content(FILE *in, char *file, int toplevel)
 	** 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:
-		case FLDEOF:
+	for (compnum = 1, state = FLD2;;) {
+		switch (state = m_getfld2(state, &f, in)) {
+		case FLD2:
 			compnum++;
 
-			/* get copies of the buffers */
-			np = getcpy(name);
-			vp = getcpy(buf);
+			/* add the header data to the list */
+			add_header(ct, getcpy(f.name), getcpy(f.value));
 
-			/* 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);
-
-			/* 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);
+		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:
+		case LENERR2:
+		case FMTERR2:
+		case ERR2:
 			adios(EX_DATAERR, NULL, "message format error in component #%d",
 					compnum);
 
 		default:
 			adios(EX_SOFTWARE, NULL, "getfld() returned %d", state);
 		}
-
-		/* break out of the loop */
 		break;
 	}
 
@@ -983,8 +963,7 @@ InitText(CT ct)
 	ct->c_subtype = kv->kv_value;
 
 	/* allocate text character set structure */
-	if ((t = (struct text *) calloc(1, sizeof(*t))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	t = (struct text *) mh_xcalloc(1, sizeof(*t));
 	ct->c_ctparams = (void *) t;
 
 	/* scan for charset parameter */
@@ -1065,8 +1044,7 @@ InitMultiPart(CT ct)
 	}
 
 	/* allocate primary structure for multipart info */
-	if ((m = (struct multipart *) calloc(1, sizeof(*m))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	m = (struct multipart *) mh_xcalloc(1, sizeof(*m));
 	ct->c_ctparams = (void *) m;
 
 	/* check if boundary parameter contains only whitespace characters */
@@ -1109,9 +1087,7 @@ InitMultiPart(CT ct)
 			if (strcmp(buffer + 2, m->mp_start)!=0)
 				continue;
 next_part:
-			if ((part = (struct part *) calloc(1, sizeof(*part)))
-					== NULL)
-				adios(EX_OSERR, NULL, "out of memory");
+			part = (struct part *) mh_xcalloc(1, sizeof(*part));
 			*next = part;
 			next = &part->mp_next;
 
@@ -1225,8 +1201,7 @@ reverse_parts(CT ct)
 		i++;
 
 	/* allocate array of pointers to the parts */
-	if (!(base = (struct part **) calloc((size_t) (i + 1), sizeof(*base))))
-		adios(EX_OSERR, NULL, "out of memory");
+	base = (struct part **) mh_xcalloc((size_t) (i + 1), sizeof(*base));
 	bmp = base;
 
 	/* point at all the parts */
@@ -1282,8 +1257,7 @@ InitMessage(CT ct)
 		char **ap, **ep;
 		struct partial *p;
 
-		if ((p = (struct partial *) calloc(1, sizeof(*p))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+		p = (struct partial *) mh_xcalloc(1, sizeof(*p));
 		ct->c_ctparams = (void *) p;
 
 		/*
@@ -1395,8 +1369,7 @@ init_encoding(CT ct, OpenCEFunc openfnx)
 {
 	CE ce;
 
-	if ((ce = (CE) calloc(1, sizeof(*ce))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	ce = (CE) mh_xcalloc(1, sizeof(*ce));
 
 	ct->c_cefile     = ce;
 	ct->c_ceopenfnx  = openfnx;