Merge

[mmh] / uip / pick.c

diff --git a/uip/pick.c b/uip/pick.c
index 819d81a..8ae58a4 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -381,6 +381,7 @@ static struct swit parswit[] = {
 
 
 static char linebuf[LBSIZE + 1];
+static char decoded_linebuf[LBSIZE + 1];
 
 /* the magic array for case-independence */
 static char cc[] = {
@@ -1016,8 +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;
+               }
+
                if (n->n_circf) {
-                       if (advance(p1, p2))
+                       if (advance(p1, p2)) 
                                return 1;
                        continue;
                }