X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fwhom.c;h=e1aab77f93f22813a52738d904dd1eaf1ed32032;hp=d313f05656097d0621b3e609404131abc029e75a;hb=1e99819ed105950cd584c71fa4b2e36b038be102;hpb=4e6362c1749f16f1b09fb04d5951a03c1d9aa9cd

diff --git a/uip/whom.c b/uip/whom.c
index d313f05..e1aab77 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -203,9 +203,9 @@ main(int argc, char **argv)
 static int
 process(char *file)
 {
-        int state, compnum;
-	char *cp = NULL;
-	char buf[BUFSIZ], name[NAMESZ];
+	enum state state;
+	struct field f = {{0}};
+	int compnum;
 	FILE *in;
 
 
@@ -213,31 +213,19 @@ process(char *file)
 		adios(EX_IOERR, file, "unable to open");
 	}
 
-	for (compnum = 1, state = FLD;;) {
-		switch (state = m_getfld(state, name, buf, sizeof(buf), in)) {
-		case FLD:
-			compnum++;
-			proc_hdr(name, buf);
+	for (compnum=1, state=FLD2;; compnum++) {
+		switch (state = m_getfld2(state, &f, in)) {
+		case FLD2:
+			proc_hdr(f.name, f.value);
 			continue;
 
-		case FLDPLUS:
-			compnum++;
-			cp = getcpy(buf);
-			while (state == FLDPLUS) {
-				state = m_getfld(state, name, buf,
-						sizeof(buf), in);
-				cp = add(buf, cp);
-			}
-			proc_hdr(name, cp);
-			free(cp);
-			continue;
-
-		case BODY:
-		case FILEEOF:
+		case BODY2:
+		case FILEEOF2:
 			break;
 
-		case LENERR:
-		case FMTERR:
+		case LENERR2:
+		case FMTERR2:
+		case ERR2:
 			adios(EX_DATAERR, NULL, "message format error in component #%d",
 					compnum);