X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpick.c;h=3ac9e1101e7d3cb25a47c09038bf79a11398ab80;hp=984d80bdf20bf4581ce47ff78bdc962bd10cac1e;hb=1e99819ed105950cd584c71fa4b2e36b038be102;hpb=4e6362c1749f16f1b09fb04d5951a03c1d9aa9cd

diff --git a/uip/pick.c b/uip/pick.c
index 984d80b..3ac9e11 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -1243,38 +1243,36 @@ static int
 TWSaction(params)
 plist
 {
-	int state;
+	enum state state;
+	struct field f = {{0}};
 	char *bp;
-	char buf[BUFSIZ], name[NAMESZ];
 	struct tws *tw;
 
 	fseek(fp, start, SEEK_SET);
-	for (state = FLD, bp = NULL;;) {
-		switch (state = m_getfld(state, name, buf, sizeof buf, fp)) {
-		case FLD:
-		case FLDPLUS:
-			if (bp != NULL) {
+	for (state = FLD2, bp = NULL;;) {
+		switch (state = m_getfld2(state, &f, fp)) {
+		case FLD2:
+			if (bp) {
 				free(bp);
 				bp = NULL;
 			}
-			bp = getcpy(buf);
-			while (state == FLDPLUS) {
-				state = m_getfld(state, name, buf,
-						sizeof buf, fp);
-				bp = add(buf, bp);
-			}
-			if (!mh_strcasecmp(name, n->n_datef))
+			bp = getcpy(f.value);
+			if (mh_strcasecmp(f.name, n->n_datef)==0) {
 				break;
+			}
 			continue;
 
-		case BODY:
-		case FILEEOF:
-		case LENERR:
-		case FMTERR:
-			if (state == LENERR || state == FMTERR)
-				advise(NULL, "format error in message %d", msgnum);
-			if (bp != NULL)
+		case LENERR2:
+		case FMTERR2:
+		case ERR2:
+			advise(NULL, "format error in message %d", msgnum);
+			/* FALL */
+
+		case BODY2:
+		case FILEEOF2:
+			if (bp) {
 				free(bp);
+			}
 			return 0;
 
 		default: