X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscan.c;h=18de4c48e9ccdb078120064c32de8de7d32086c5;hp=cb4bac461f5a22dc0c58b244bf63b3aa9d041481;hb=d3540eaa4251b3a282115a72ed5d1bb39ce74b3f;hpb=3fe7a0704e4ab592003af2e66c3003718ecde2c1

diff --git a/uip/scan.c b/uip/scan.c
index cb4bac4..18de4c4 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -23,21 +23,13 @@ static struct swit switches[] = {
 	{ "form formatfile", 0 },
 #define FMTSW  3
 	{ "format string", 5 },
-#define HEADSW  4
-	{ "header", 0 },
-#define NHEADSW  5
-	{ "noheader", 0 },
-#define WIDTHSW  6
+#define WIDTHSW  4
 	{ "width columns", 0 },
-#define REVSW  7
-	{ "reverse", 0 },
-#define NREVSW  8
-	{ "noreverse", 0 },
-#define FILESW  9
+#define FILESW  5
 	{ "file file", 4 },
-#define VERSIONSW 10
+#define VERSIONSW 6
 	{ "version", 0 },
-#define HELPSW  11
+#define HELPSW  7
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -52,8 +44,8 @@ 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 clearflag = 0, ontty;
+	int width = 0;
 	int i, state, msgnum;
 	int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
 	char *cp, *maildir, *file = NULL, *folder = NULL;
@@ -71,7 +63,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;
 
@@ -115,25 +106,12 @@ main(int argc, char **argv)
 				form = NULL;
 				continue;
 
-			case HEADSW:
-				hdrflag++;
-				continue;
-			case NHEADSW:
-				hdrflag = 0;
-				continue;
-
 			case WIDTHSW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
 				width = atoi(cp);
 				continue;
-			case REVSW:
-				revflag++;
-				continue;
-			case NREVSW:
-				revflag = 0;
-				continue;
 
 			case FILESW:
 				if (!(cp = *argp++) || (cp[0] == '-' && cp[1]))
@@ -178,7 +156,7 @@ main(int argc, char **argv)
 		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;
 		}
@@ -239,9 +217,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");
@@ -275,7 +251,6 @@ main(int argc, char **argv)
 				advise(NULL, "message %d: empty", msgnum);
 				break;
 			}
-			hdrflag = 0;
 			fclose(in);
 			if (ontty)
 				fflush(stdout);