X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscan.c;h=6fbd5790bdd2d0bc8058452aae69bc8564fc2aef;hp=cfcd3e4c3e867eb09fad67a81075d165c304588c;hb=6b80b3bb772e2cf9186cf964bf78109b677e1bef;hpb=f51956be123db66b00138f80464d06f030dbb88d

diff --git a/uip/scan.c b/uip/scan.c
index cfcd3e4..6fbd579 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -14,34 +14,23 @@
 #include <errno.h>
 
 static struct swit switches[] = {
-#define CLRSW  0
-	{ "clear", 0 },
-#define NCLRSW  1
-	{ "noclear", 0 },
-#define FORMSW  2
+#define FORMSW  0
 	{ "form formatfile", 0 },
-#define WIDTHSW  3
+#define WIDTHSW  1
 	{ "width columns", 0 },
-#define FILESW  4
+#define FILESW  2
 	{ "file file", 4 },
-#define VERSIONSW 5
+#define VERSIONSW 3
 	{ "version", 0 },
-#define HELPSW  6
+#define HELPSW  4
 	{ "help", 0 },
 	{ NULL, 0 }
 };
 
 
-/*
-** prototypes
-*/
-void clear_screen(void);  /* from termsbr.c */
-
-
 int
 main(int argc, char **argv)
 {
-	int clearflag = 0, ontty;
 	int width = 0;
 	int i, state, msgnum;
 	int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
@@ -83,13 +72,6 @@ main(int argc, char **argv)
 				print_version(invo_name);
 				done(1);
 
-			case CLRSW:
-				clearflag++;
-				continue;
-			case NCLRSW:
-				clearflag = 0;
-				continue;
-
 			case FORMSW:
 				if (!(form = *argp++) || *form == '-')
 					adios(NULL, "missing argument to %s",
@@ -145,9 +127,8 @@ main(int argc, char **argv)
 
 		m_unknown(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, -1, nfs, width, 0, 0);
+			if (state != SCNMSG)
 				break;
 		}
 		fclose(in);
@@ -205,8 +186,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) {
@@ -227,10 +206,8 @@ main(int argc, char **argv)
 			}
 
 			switch (state = scan(in, msgnum, 0, nfs, width,
-						msgnum == mp->curmsg, unseen,
-						folder, 0L, 1)) {
+					msgnum == mp->curmsg, unseen)) {
 			case SCNMSG:
-			case SCNENC:
 			case SCNERR:
 				break;
 
@@ -242,14 +219,10 @@ main(int argc, char **argv)
 				break;
 			}
 			fclose(in);
-			if (ontty)
-				fflush(stdout);
 		}
 	}
 
 	folder_free(mp);  /* free folder/message structure */
-	if (clearflag)
-		clear_screen();
 
 	done(0);
 	return 1;