X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhparse.c;h=b144c375a2cf43e4c9f65304d06ee893eb9048c6;hb=5ed626079bc1aaba6d0daea2b32c43cb463244bb;hp=2afb03a2f57efbb00200bad3b178677d9e202aea;hpb=72795bfcbe9f7fee8927b1a4942c0230b0f857a8;p=mmh

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 2afb03a..b144c37 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -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;
 
@@ -249,53 +249,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;
 	}