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

diff --git a/uip/scan.c b/uip/scan.c
index a11ca0d..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,15 +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 FILESW  5
+#define FILESW  4
 	{ "file file", 4 },
-#define VERSIONSW 6
+#define VERSIONSW 5
 	{ "version", 0 },
-#define HELPSW  7
+#define HELPSW  6
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -49,7 +46,7 @@ main(int argc, char **argv)
 	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;
@@ -63,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;
 
@@ -98,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:
@@ -135,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