X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fscan.c;h=cfcd3e4c3e867eb09fad67a81075d165c304588c;hb=14767c94b3827be7c867196467ed7aea5f6f49b0;hp=e5fb55a652440de6d1bc3e8fa30e101ada7567e9;hpb=c477dc5d1d03fa6d9a8ab3dd3508c63cbddc044e;p=mmh

diff --git a/uip/scan.c b/uip/scan.c
index e5fb55a..cfcd3e4 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -10,7 +10,6 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <h/mts.h>
 #include <h/utils.h>
 #include <errno.h>
 
@@ -21,19 +20,13 @@ static struct swit switches[] = {
 	{ "noclear", 0 },
 #define FORMSW  2
 	{ "form formatfile", 0 },
-#define FMTSW  3
-	{ "format string", 5 },
-#define WIDTHSW  4
+#define WIDTHSW  3
 	{ "width columns", 0 },
-#define REVSW  5
-	{ "reverse", 0 },
-#define NREVSW  6
-	{ "noreverse", 0 },
-#define FILESW  7
+#define FILESW  4
 	{ "file file", 4 },
-#define VERSIONSW 8
+#define VERSIONSW 5
 	{ "version", 0 },
-#define HELPSW  9
+#define HELPSW  6
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -49,11 +42,11 @@ int
 main(int argc, char **argv)
 {
 	int clearflag = 0, ontty;
-	int width = 0, revflag = 0;
+	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;
@@ -67,7 +60,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;
 
@@ -102,13 +94,6 @@ main(int argc, char **argv)
 				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 WIDTHSW:
@@ -117,12 +102,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]))
@@ -145,7 +124,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
@@ -228,9 +207,7 @@ 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");