#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 */
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,
#define n_tws un.st3.un_tws
static int talked;
-static int pdebug = 0;
static char *datesw;
static char **argp;
int
pcompile (char **vec, char *date)
{
- register char *cp;
-
- if ((cp = getenv ("MHPDEBUG")) && *cp)
- pdebug++;
-
argp = vec;
if ((datesw = date) == NULL)
datesw = "date";
if ((o->n_R_child = parse ()))
return o;
padvise (NULL, "missing disjunctive");
+ free (o);
return NULL;
header: ;
if (*cp != '-') {
padvise (NULL, "%s unexpected", cp);
+ free (n);
return NULL;
}
case AMBIGSW:
ambigsw (cp, parswit);
talked++;
+ free (n);
return NULL;
case UNKWNSW:
fprintf (stderr, "-%s unknown\n", cp);
talked++;
+ free (n);
return NULL;
case PRAND:
if ((o->n_R_child = nexp1 ()))
return o;
padvise (NULL, "missing conjunctive");
+ free (o);
return NULL;
header: ;
if ((n->n_L_child = nexp3 ()))
return n;
padvise (NULL, "missing negation");
+ free (n);
return NULL;
header: ;
n->n_header = 0;
if (!(cp = nxtarg ())) {/* allow -xyz arguments */
padvise (NULL, "missing argument to %s", argp[-2]);
+ free (n);
return NULL;
}
dp = cp;
pattern: ;
if (!gcompile (n, dp)) {
padvise (NULL, "pattern error in %s %s", argp[-2], cp);
+ free (n);
return NULL;
}
n->n_patbuf = getcpy (dp);
n->n_datef = datesw;
if (!tcompile (cp, &n->n_tws, n->n_after = i == PRAFTR)) {
padvise (NULL, "unable to parse %s %s", argp[-2], cp);
+ free (n);
return NULL;
}
return n;
{
register struct nexus *p;
- if ((p = (struct nexus *) calloc ((size_t) 1, sizeof *p)) == NULL)
+ if ((p = (struct nexus *) mh_xcalloc ((size_t) 1, sizeof *p)) == NULL)
adios (NULL, "unable to allocate component storage");
p->n_action = action;
stop;
int
-pmatches (FILE *fp, int msgnum, long start, long stop)
+pmatches (FILE *fp, int msgnum, long start, long stop, int debug)
{
if (!head)
return 1;
- if (!talked++ && pdebug)
+ if (!talked++ && debug)
PRaction (head, 0);
return (*head->n_action) (args (head));
int cclcnt;
register unsigned char *ep, *dp, *sp, *lastep = 0;
- dp = (ep = n->n_expbuf) + sizeof n->n_expbuf;
- sp = astr;
+ dp = (ep = (unsigned char *) n->n_expbuf) + sizeof n->n_expbuf;
+ sp = (unsigned char *) astr;
if (*sp == '^') {
n->n_circf = 1;
sp++;
break;
}
lf++;
- c = ' ';
+ /* Unfold by skipping the newline. */
+ c = 0;
}
}
if (c && p1 < &linebuf[LBSIZE - 1])
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;
star:
do {
lp--;
- if (advance (lp, ep))
+ if (advance ((char *) lp, (char *) ep))
return (1);
} while (lp > curlp);
return 0;
register struct tws *tw;
time (&clock);
- if (!mh_strcasecmp (ap, "today"))
+ if (!strcasecmp (ap, "today"))
return dlocaltime (&clock);
- if (!mh_strcasecmp (ap, "yesterday")) {
+ if (!strcasecmp (ap, "yesterday")) {
clock -= (long) (60 * 60 * 24);
return dlocaltime (&clock);
}
- if (!mh_strcasecmp (ap, "tomorrow")) {
+ if (!strcasecmp (ap, "tomorrow")) {
clock += (long) (60 * 60 * 24);
return dlocaltime (&clock);
}
for (i = 0; tw_ldotw[i]; i++)
- if (!mh_strcasecmp (ap, tw_ldotw[i]))
+ if (!strcasecmp (ap, tw_ldotw[i]))
break;
if (tw_ldotw[i]) {
if ((tw = dlocaltime (&clock)) == NULL)
register char *bp;
char buf[BUFSIZ], name[NAMESZ];
register struct tws *tw;
+ m_getfld_state_t gstate = 0;
NMH_UNUSED (stop);
fseek (fp, start, SEEK_SET);
- for (state = FLD, bp = NULL;;) {
- switch (state = m_getfld (state, name, buf, sizeof buf, fp)) {
+ for (bp = NULL;;) {
+ int bufsz = sizeof buf;
+ switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) {
case FLD:
- case FLDEOF:
case FLDPLUS:
if (bp != NULL)
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 (&gstate, name, buf, &bufsz, fp);
bp = add (buf, bp);
}
- if (!mh_strcasecmp (name, n->n_datef))
+ if (!strcasecmp (name, n->n_datef))
break;
- if (state != FLDEOF)
- continue;
+ continue;
case BODY:
- case BODYEOF:
case FILEEOF:
case LENERR:
case FMTERR:
}
break;
}
+ m_getfld_state_destroy (&gstate);
if ((tw = dparsetime (bp)) == NULL)
advise (NULL, "unable to parse %s field in message %d, matching...",
projects / nmh / blobdiff