X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5ccbd49adba7e6d48f4094fa6eade7a7fb8ec4cf..51cc0e72151fcfe46271dda33398a3a6ce1b41b9:/uip/picksbr.c

diff --git a/uip/picksbr.c b/uip/picksbr.c
index b92c053a..d03e72be 100644
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -78,9 +78,10 @@ static struct swit parswit[] = {
 
 
 static char linebuf[LBSIZE + 1];
+static char decoded_linebuf[LBSIZE + 1];
 
 /* the magic array for case-independence */
-static char cc[] = {
+static unsigned char cc[] = {
 	0000,0001,0002,0003,0004,0005,0006,0007,
 	0010,0011,0012,0013,0014,0015,0016,0017,
 	0020,0021,0022,0023,0024,0025,0026,0027,
@@ -701,7 +702,8 @@ plist
 			break;
 		    }
 		    lf++;
-		    c = ' ';
+		    /* Unfold by skipping the newline. */
+		    c = 0;
 		}
 	    }
 	    if (c && p1 < &linebuf[LBSIZE - 1])
@@ -713,6 +715,13 @@ 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))
 		return 1;
@@ -938,7 +947,8 @@ plist
 
     fseek (fp, start, SEEK_SET);
     for (state = FLD, bp = NULL;;) {
-	switch (state = m_getfld (state, name, buf, sizeof buf, fp)) {
+	int bufsz = sizeof buf;
+	switch (state = m_getfld (state, name, buf, &bufsz, fp)) {
 	    case FLD: 
 	    case FLDEOF: 
 	    case FLDPLUS: 
@@ -946,7 +956,8 @@ plist
 		    free (bp), bp = NULL;
 		bp = add (buf, NULL);
 		while (state == FLDPLUS) {
-		    state = m_getfld (state, name, buf, sizeof buf, fp);
+		    bufsz = sizeof buf;
+		    state = m_getfld (state, name, buf, &bufsz, fp);
 		    bp = add (buf, bp);
 		}
 		if (!mh_strcasecmp (name, n->n_datef))