X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fscan.c;h=92dadf69f2754f778e89515c2c2138340a167c56;hb=f8960957ae53f962fe12e5a5eb4c01eb54cb4228;hp=6fbd5790bdd2d0bc8058452aae69bc8564fc2aef;hpb=6b80b3bb772e2cf9186cf964bf78109b677e1bef;p=mmh diff --git a/uip/scan.c b/uip/scan.c index 6fbd579..92dadf6 100644 --- a/uip/scan.c +++ b/uip/scan.c @@ -36,7 +36,7 @@ main(int argc, char **argv) int seqnum[NUMATTRS], unseen, num_unseen_seq = 0; char *cp, *maildir, *file = NULL, *folder = NULL; char *form = NULL, buf[BUFSIZ]; - char **argp, *nfs, **arguments; + char **argp, *fmtstr, **arguments; struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; FILE *in; @@ -106,7 +106,7 @@ main(int argc, char **argv) /* ** Get new format string. Must be before chdir(). */ - nfs = new_fs(form, FORMAT); + fmtstr = new_fs(form, FORMAT); /* ** We are scanning a maildrop file @@ -127,7 +127,7 @@ main(int argc, char **argv) m_unknown(in); for (msgnum = 1; ; ++msgnum) { - state = scan(in, msgnum, -1, nfs, width, 0, 0); + state = scan(in, msgnum, SCN_MBOX, fmtstr, width, 0, 0); if (state != SCNMSG) break; } @@ -205,8 +205,8 @@ main(int argc, char **argv) } } - switch (state = scan(in, msgnum, 0, nfs, width, - msgnum == mp->curmsg, unseen)) { + switch (state = scan(in, msgnum, SCN_FOLD, fmtstr, + width, msgnum==mp->curmsg, unseen)) { case SCNMSG: case SCNERR: break;