X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscan.c;h=085cc7fa7ea3c54a5b206356520bd53277604074;hp=ef13e39c29fada81f4e8513f311ab6c6b1cdf212;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=51d0e643f8daeb2db8de0a3d31d7d7f038b48380

diff --git a/uip/scan.c b/uip/scan.c
index ef13e39..085cc7f 100644
--- 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, 1);
+			state = scan(in, msgnum, SCN_MBOX, fmtstr, width, 0, 0);
 			if (state != SCNMSG)
 				break;
 		}
@@ -205,9 +205,8 @@ main(int argc, char **argv)
 				}
 			}
 
-			switch (state = scan(in, msgnum, 0, nfs, width,
-						msgnum == mp->curmsg, unseen,
-						1)) {
+			switch (state = scan(in, msgnum, SCN_FOLD, fmtstr,
+					width, msgnum==mp->curmsg, unseen)) {
 			case SCNMSG:
 			case SCNERR:
 				break;