Renamed -version switch to -Version to remove the conflict with -verbose.

[mmh] / uip / scan.c

diff --git a/uip/scan.c b/uip/scan.c
index 6fbd579..085cc7f 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -21,7 +21,7 @@ static struct swit switches[] = {
 #define FILESW  2
        { "file file", 4 },
 #define VERSIONSW 3
-       { "version", 0 },
+       { "Version", 0 },
 #define HELPSW  4
        { "help", 0 },
        { NULL, 0 }
@@ -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
@@ -125,9 +125,9 @@ main(int argc, char **argv)
                        adios(file, "unable to open");
                }
 
-               m_unknown(in);
+               thisisanmbox(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;