X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpick.c;h=984d80bdf20bf4581ce47ff78bdc962bd10cac1e;hp=8448d968bc8ee654c1eb9e86f71bcfe699c2c81e;hb=4dc39c08f07428ff5f39acd7b0ddee30e0a004f6;hpb=f16ae6eedeacce086d513e10461938c1650e265e

diff --git a/uip/pick.c b/uip/pick.c
index 8448d96..984d80b 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -1017,15 +1017,17 @@ plist
 		p1 = linebuf;
 		p2 = n->n_expbuf;
 
-		/* Attempt to decode as a MIME header.  If it's the last header,
-		 * body will be 1 and lf will be at least 1. */
-		if ((body == 0 || lf > 0)  &&
-		     decode_rfc2047 (linebuf, decoded_linebuf, sizeof decoded_linebuf)) {
-				p1 = decoded_linebuf;
+		/*
+		** Attempt to decode as a MIME header.  If it's the
+		** last header, body will be 1 and lf will be at least 1.
+		*/
+		if ((body == 0 || lf > 0) && decode_rfc2047(linebuf,
+				decoded_linebuf, sizeof decoded_linebuf)) {
+			p1 = decoded_linebuf;
 		}
 
 		if (n->n_circf) {
-			if (advance(p1, p2))
+			if (advance(p1, p2)) 
 				return 1;
 			continue;
 		}
@@ -1250,7 +1252,6 @@ plist
 	for (state = FLD, bp = NULL;;) {
 		switch (state = m_getfld(state, name, buf, sizeof buf, fp)) {
 		case FLD:
-		case FLDEOF:
 		case FLDPLUS:
 			if (bp != NULL) {
 				free(bp);
@@ -1264,11 +1265,9 @@ plist
 			}
 			if (!mh_strcasecmp(name, n->n_datef))
 				break;
-			if (state != FLDEOF)
-				continue;
+			continue;
 
 		case BODY:
-		case BODYEOF:
 		case FILEEOF:
 		case LENERR:
 		case FMTERR: