X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fscan.c;h=ba90e4010ee23851abf6bfb1aa0730b40dd9dfe5;hb=1e42112bb983f886f389b1fa3ef4d90a4dad4f91;hp=1b58eb5b563c692c020e6c1df50a7b2491970637;hpb=e57b17343dcb3ff373ef4dd089fbe778f0c7c270;p=mmh

diff --git a/uip/scan.c b/uip/scan.c
index 1b58eb5..ba90e40 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -19,9 +19,9 @@ static struct swit switches[] = {
 #define WIDTHSW  1
 	{ "width columns", 0 },
 #define FILESW  2
-	{ "file file", 4 },
+	{ "file file", 0 },
 #define VERSIONSW 3
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  4
 	{ "help", 0 },
 	{ NULL, 0 }
@@ -31,20 +31,17 @@ static struct swit switches[] = {
 int
 main(int argc, char **argv)
 {
-	int ontty;
 	int width = 0;
 	int i, state, msgnum;
 	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;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -107,7 +104,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
@@ -126,11 +123,10 @@ 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,
-					NULL, 0L, 1);
-			if (state != SCNMSG && state != SCNENC)
+			state = scan(in, msgnum, SCN_MBOX, fmtstr, width, 0, 0);
+			if (state != SCNMSG)
 				break;
 		}
 		fclose(in);
@@ -188,8 +184,6 @@ main(int argc, char **argv)
 		}
 	}
 
-	ontty = isatty(fileno(stdout));
-
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 		if (is_selected(mp, msgnum)) {
 			if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {
@@ -209,11 +203,9 @@ main(int argc, char **argv)
 				}
 			}
 
-			switch (state = scan(in, msgnum, 0, nfs, width,
-						msgnum == mp->curmsg, unseen,
-						folder, 0L, 1)) {
+			switch (state = scan(in, msgnum, SCN_FOLD, fmtstr,
+					width, msgnum==mp->curmsg, unseen)) {
 			case SCNMSG:
-			case SCNENC:
 			case SCNERR:
 				break;
 
@@ -225,8 +217,6 @@ main(int argc, char **argv)
 				break;
 			}
 			fclose(in);
-			if (ontty)
-				fflush(stdout);
 		}
 	}