} else {
/* if it doesn't match, then unselect it */
unset_selected(mp, msgnum);
- mp->numsel--;
}
if (fp)
fclose(fp);
static char linebuf[LBSIZE + 1];
+static char decoded_linebuf[LBSIZE + 1];
/* the magic array for case-independence */
static char cc[] = {
{
struct nexus *p;
- if ((p = (struct nexus *) calloc((size_t) 1, sizeof *p)) == NULL)
- adios(EX_OSERR, NULL, "unable to allocate component storage");
+ p = (struct nexus *) mh_xcalloc((size_t) 1, sizeof *p);
p->n_action = action;
return p;
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;
}
TWSaction(params)
plist
{
- int state;
+ enum state state;
+ struct field f = {{0}};
char *bp;
- char buf[BUFSIZ], name[NAMESZ];
struct tws *tw;
fseek(fp, start, SEEK_SET);
- for (state = FLD, bp = NULL;;) {
- switch (state = m_getfld(state, name, buf, sizeof buf, fp)) {
- case FLD:
- case FLDEOF:
- case FLDPLUS:
- if (bp != NULL) {
+ for (state = FLD2, bp = NULL;;) {
+ switch (state = m_getfld2(state, &f, fp)) {
+ case FLD2:
+ if (bp) {
free(bp);
bp = NULL;
}
- bp = getcpy(buf);
- while (state == FLDPLUS) {
- state = m_getfld(state, name, buf,
- sizeof buf, fp);
- bp = add(buf, bp);
- }
- if (!mh_strcasecmp(name, n->n_datef))
+ bp = getcpy(f.value);
+ if (mh_strcasecmp(f.name, n->n_datef)==0) {
break;
- if (state != FLDEOF)
- continue;
+ }
+ continue;
- case BODY:
- case BODYEOF:
- case FILEEOF:
- case LENERR:
- case FMTERR:
- if (state == LENERR || state == FMTERR)
- advise(NULL, "format error in message %d", msgnum);
- if (bp != NULL)
+ case LENERR2:
+ case FMTERR2:
+ case IOERR2:
+ advise(NULL, "format error in message %d", msgnum);
+ /* FALL */
+
+ case BODY2:
+ case FILEEOF2:
+ if (bp) {
free(bp);
+ }
return 0;
default: