X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpicksbr.c;h=91893e3cbf89f71138e39b0405d785bddf51a94b;hb=80bf776d0a4587c477bb8a248b9dbe1a31e74575;hp=a00f335ead1f099acc0ff390c26b0af7ff9755f0;hpb=43d85eaa38c25385082958d831fc926c5e619eac;p=mmh

diff --git a/uip/picksbr.c b/uip/picksbr.c
index a00f335..91893e3 100644
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -2,8 +2,6 @@
 /*
  * picksbr.c -- routines to help pick along...
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -14,16 +12,10 @@
 #include <h/picksbr.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 static struct swit parswit[] = {
 #define	PRAND                   0
@@ -86,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,
@@ -183,23 +176,23 @@ static struct nexus *head;
 /*
  * prototypes for date routines
  */
-static struct tws *tws_parse();
-static struct tws *tws_special();
+static struct tws *tws_parse(char *, int);
+static struct tws *tws_special(char *);
 
 /*
  * static prototypes
  */
-static void PRaction();
-static int gcompile();
-static int advance();
-static int cclass();
-static int tcompile();
-
-static struct nexus *parse();
-static struct nexus *exp1();
-static struct nexus *exp2();
-static struct nexus *exp3();
-static struct nexus *newnexus();
+static void PRaction(struct nexus *, int);
+static int gcompile(struct nexus *, char *);
+static int advance(char *, char *);
+static int cclass(unsigned char *, int, int);
+static int tcompile(char *, struct tws *, int);
+
+static struct nexus *parse(void);
+static struct nexus *nexp1(void);
+static struct nexus *nexp2(void);
+static struct nexus *nexp3(void);
+static struct nexus *newnexus(int (*)());
 
 static int ORaction();
 static int ANDaction();
@@ -239,7 +232,7 @@ parse (void)
     register char  *cp;
     register struct nexus *n, *o;
 
-    if ((n = exp1 ()) == NULL || (cp = nxtarg ()) == NULL)
+    if ((n = nexp1 ()) == NULL || (cp = nxtarg ()) == NULL)
 	return n;
 
     if (*cp != '-') {
@@ -275,12 +268,12 @@ header: ;
 }
 
 static struct nexus *
-exp1 (void)
+nexp1 (void)
 {
     register char *cp;
     register struct nexus *n, *o;
 
-    if ((n = exp2 ()) == NULL || (cp = nxtarg ()) == NULL)
+    if ((n = nexp2 ()) == NULL || (cp = nxtarg ()) == NULL)
 	return n;
 
     if (*cp != '-') {
@@ -303,7 +296,7 @@ exp1 (void)
 	case PRAND: 
 	    o = newnexus (ANDaction);
 	    o->n_L_child = n;
-	    if ((o->n_R_child = exp1 ()))
+	    if ((o->n_R_child = nexp1 ()))
 		return o;
 	    padvise (NULL, "missing conjunctive");
 	    return NULL;
@@ -317,7 +310,7 @@ header: ;
 
 
 static struct nexus *
-exp2 (void)
+nexp2 (void)
 {
     register char *cp;
     register struct nexus *n;
@@ -327,7 +320,7 @@ exp2 (void)
 
     if (*cp != '-') {
 	prvarg ();
-	return exp3 ();
+	return nexp3 ();
     }
 
     if (*++cp == '-')
@@ -344,7 +337,7 @@ exp2 (void)
 
 	case PRNOT: 
 	    n = newnexus (NOTaction);
-	    if ((n->n_L_child = exp3 ()))
+	    if ((n->n_L_child = nexp3 ()))
 		return n;
 	    padvise (NULL, "missing negation");
 	    return NULL;
@@ -352,12 +345,12 @@ exp2 (void)
 header: ;
 	default: 
 	    prvarg ();
-	    return exp3 ();
+	    return nexp3 ();
     }
 }
 
 static struct nexus *
-exp3 (void)
+nexp3 (void)
 {
     int i;
     register char *cp, *dp;
@@ -448,7 +441,7 @@ exp3 (void)
 		padvise (NULL, "missing argument to %s", argp[-2]);
 		return NULL;
 	    }
-	    return exp3 ();
+	    return nexp3 ();
 
 	case PRAFTR: 
 	case PRBEFR: 
@@ -538,7 +531,8 @@ PRaction (struct nexus *n, int level)
 		dasctime (&n->n_tws, TW_NULL));
 	return;
     }
-    fprintf (stderr, "UNKNOWN(0x%x)\n", (unsigned int) (*n->n_action));
+    fprintf (stderr, "UNKNOWN(0x%x)\n",
+	     (unsigned int)(unsigned long) (*n->n_action));
 }
 
 
@@ -667,6 +661,7 @@ plist
     long pos = start;
     register char *p1, *p2, *ebp, *cbp;
     char ibuf[BUFSIZ];
+    NMH_UNUSED (msgnum);
 
     fseek (fp, start, SEEK_SET);
     body = 0;
@@ -707,7 +702,8 @@ plist
 			break;
 		    }
 		    lf++;
-		    c = ' ';
+		    /* Unfold by skipping the newline. */
+		    c = 0;
 		}
 	    }
 	    if (c && p1 < &linebuf[LBSIZE - 1])
@@ -719,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;
@@ -940,6 +943,7 @@ plist
     register char *bp;
     char buf[BUFSIZ], name[NAMESZ];
     register struct tws *tw;
+    NMH_UNUSED (stop);
 
     fseek (fp, start, SEEK_SET);
     for (state = FLD, bp = NULL;;) {