if (folder)
adios(EX_USAGE, NULL, "only one folder at a time!");
else
- folder = getcpy(expandfol(cp));
+ folder = mh_xstrdup(expandfol(cp));
} else
app_msgarg(&msgs, cp);
}
} else {
/* if it doesn't match, then unselect it */
unset_selected(mp, msgnum);
- mp->numsel--;
}
if (fp)
fclose(fp);
padvise(NULL, "pattern error in %s %s", argp[-2], cp);
return NULL;
}
- n->n_patbuf = getcpy(dp);
+ n->n_patbuf = mh_xstrdup(dp);
return n;
case PROTHR:
{
struct nexus *p;
- if ((p = (struct nexus *) mh_xcalloc((size_t) 1, sizeof *p)) == NULL)
- adios(EX_OSERR, NULL, "unable to allocate component storage");
+ p = mh_xcalloc(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;
+ /*
+ ** 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;
}
for (state = FLD, bp = NULL;;) {
switch (state = m_getfld(state, name, buf, sizeof buf, fp)) {
case FLD:
- case FLDEOF:
case FLDPLUS:
if (bp != NULL) {
- free(bp);
- bp = NULL;
+ mh_free0(&bp);
}
- bp = getcpy(buf);
+ bp = mh_xstrdup(buf);
while (state == FLDPLUS) {
state = m_getfld(state, name, buf,
sizeof buf, fp);
}
if (!mh_strcasecmp(name, n->n_datef))
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)
- free(bp);
+ mh_free0(&bp);
return 0;
default:
: (twsort(tw, &n->n_tws) < 0);
if (bp != NULL)
- free(bp);
+ mh_free0(&bp);
return state;
}