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

diff --git a/uip/scan.c b/uip/scan.c
index 6881c34..1b58eb5 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -10,54 +10,33 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <h/mts.h>
 #include <h/utils.h>
 #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 FMTSW  3
-	{ "format string", 5 },
-#define HEADSW  4
-	{ "header", 0 },
-#define NHEADSW  5
-	{ "noheader", 0 },
-#define WIDTHSW  6
+#define WIDTHSW  1
 	{ "width columns", 0 },
-#define REVSW  7
-	{ "reverse", 0 },
-#define NREVSW  8
-	{ "noreverse", 0 },
-#define FILESW  9
+#define FILESW  2
 	{ "file file", 4 },
-#define VERSIONSW 10
+#define VERSIONSW 3
 	{ "version", 0 },
-#define HELPSW  11
+#define HELPSW  4
 	{ "help", 0 },
 	{ NULL, 0 }
 };
 
 
-/*
-** prototypes
-*/
-void clear_screen(void);  /* from termsbr.c */
-
-
 int
 main(int argc, char **argv)
 {
-	int clearflag = 0, hdrflag = 0, ontty;
-	int width = 0, revflag = 0;
+	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, *format = NULL, buf[BUFSIZ];
+	char *form = NULL, buf[BUFSIZ];
 	char **argp, *nfs, **arguments;
 	struct msgs_array msgs = { 0, 0, NULL };
 	struct msgs *mp;
@@ -71,7 +50,6 @@ main(int argc, char **argv)
 	/* read user profile/context */
 	context_read();
 
-	mts_init(invo_name);
 	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
@@ -95,31 +73,10 @@ 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",
 							argp[-2]);
-				format = NULL;
-				continue;
-			case FMTSW:
-				if (!(format = *argp++) || *format == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				form = NULL;
-				continue;
-
-			case HEADSW:
-				hdrflag++;
-				continue;
-			case NHEADSW:
-				hdrflag = 0;
 				continue;
 
 			case WIDTHSW:
@@ -128,12 +85,6 @@ main(int argc, char **argv)
 							argp[-2]);
 				width = atoi(cp);
 				continue;
-			case REVSW:
-				revflag++;
-				continue;
-			case NREVSW:
-				revflag = 0;
-				continue;
 
 			case FILESW:
 				if (!(cp = *argp++) || (cp[0] == '-' && cp[1]))
@@ -156,7 +107,7 @@ main(int argc, char **argv)
 	/*
 	** Get new format string.  Must be before chdir().
 	*/
-	nfs = new_fs(form, format, FORMAT);
+	nfs = new_fs(form, FORMAT);
 
 	/*
 	** We are scanning a maildrop file
@@ -175,16 +126,10 @@ main(int argc, char **argv)
 			adios(file, "unable to open");
 		}
 
-#ifndef JLR
-		if (hdrflag) {
-			printf("FOLDER %s\t%s\n", file, dtimenow(1));
-		}
-#endif /* JLR */
-
 		m_unknown(in);
 		for (msgnum = 1; ; ++msgnum) {
 			state = scan(in, msgnum, -1, nfs, width, 0, 0,
-					hdrflag ? file : NULL, 0L, 1);
+					NULL, 0L, 1);
 			if (state != SCNMSG && state != SCNENC)
 				break;
 		}
@@ -245,21 +190,13 @@ main(int argc, char **argv)
 
 	ontty = isatty(fileno(stdout));
 
-	for (msgnum = revflag ? mp->hghsel : mp->lowsel;
-		 (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel);
-		 msgnum += (revflag ? -1 : 1)) {
+	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 		if (is_selected(mp, msgnum)) {
 			if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {
 				admonish(cp, "unable to open message");
 				continue;
 			}
 
-#ifndef JLR
-			if (hdrflag) {
-				printf("FOLDER %s\t%s\n", folder, dtimenow(1));
-			}
-#endif /* JLR */
-
 			/*
 			** Check if message is in any sequence given
 			** by Unseen-Sequence profile entry.
@@ -287,7 +224,6 @@ main(int argc, char **argv)
 				advise(NULL, "message %d: empty", msgnum);
 				break;
 			}
-			hdrflag = 0;
 			fclose(in);
 			if (ontty)
 				fflush(stdout);
@@ -295,8 +231,6 @@ main(int argc, char **argv)
 	}
 
 	folder_free(mp);  /* free folder/message structure */
-	if (clearflag)
-		clear_screen();
 
 	done(0);
 	return 1;