X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpick.c;h=5df2861a2c19b6ca03f4c483a4fe9cb70342d561;hp=1df59b186f3fae1d7ad09b6a559f581d9a136855;hb=04a3dfc70394a517a79340a7d3ecd9c6a23d0bee;hpb=bd02210b2be64956a952f925a2dcd35fb42f6136

diff --git a/uip/pick.c b/uip/pick.c
index 1df59b1..5df2861 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -1241,37 +1241,33 @@ 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) {
 				mh_free0(&bp);
 			}
-			bp = mh_xstrdup(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 = mh_xstrdup(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)
-				mh_free0(&bp);
+		case LENERR2:
+		case FMTERR2:
+		case IOERR2:
+			advise(NULL, "format error in message %d", msgnum);
+			/* FALL */
+
+		case BODY2:
+		case FILEEOF2:
+			mh_free0(&bp);
 			return 0;
 
 		default: