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

diff --git a/uip/picksbr.c b/uip/picksbr.c
index b92c053a..7b64f819 100644
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -17,39 +17,30 @@
 #endif
 #include <time.h>
 
-static struct swit parswit[] = {
-#define	PRAND                   0
-    { "and", 0 },
-#define	PROR                    1
-    { "or", 0 },
-#define	PRNOT                   2
-    { "not", 0 },
-#define	PRLBR                   3
-    { "lbrace", 0 },
-#define	PRRBR                   4
-    { "rbrace", 0 },
-#define	PRCC                    5
-    { "cc  pattern", 0 },
-#define	PRDATE                  6
-    { "date  pattern", 0 },
-#define	PRFROM                  7
-    { "from  pattern", 0 },
-#define	PRSRCH                  8
-    { "search  pattern", 0 },
-#define	PRSUBJ                  9
-    { "subject  pattern", 0 },
-#define	PRTO                   10
-    { "to  pattern", 0 },
-#define	PROTHR                 11
-    { "-othercomponent  pattern", 15 },
-#define	PRAFTR                 12
-    { "after date", 0 },
-#define	PRBEFR                 13
-    { "before date", 0 },
-#define	PRDATF                 14
-    { "datefield field", 5 },
-    { NULL, 0 }
-};
+#define PARSE_SWITCHES \
+    X("and", 0, PRAND) \
+    X("or", 0, PROR) \
+    X("not", 0, PRNOT) \
+    X("lbrace", 0, PRLBR) \
+    X("rbrace", 0, PRRBR) \
+    X("cc  pattern", 0, PRCC) \
+    X("date  pattern", 0, PRDATE) \
+    X("from  pattern", 0, PRFROM) \
+    X("search  pattern", 0, PRSRCH) \
+    X("subject  pattern", 0, PRSUBJ) \
+    X("to  pattern", 0, PRTO) \
+    X("-othercomponent  pattern", 15, PROTHR) \
+    X("after date", 0, PRAFTR) \
+    X("before date", 0, PRBEFR) \
+    X("datefield field", 5, PRDATF) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(PARSE);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(PARSE, parswit);
+#undef X
 
 /* DEFINITIONS FOR PATTERN MATCHING */
 
@@ -78,9 +69,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 +693,8 @@ plist
 			break;
 		    }
 		    lf++;
-		    c = ' ';
+		    /* Unfold by skipping the newline. */
+		    c = 0;
 		}
 	    }
 	    if (c && p1 < &linebuf[LBSIZE - 1])
@@ -713,6 +706,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;