X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d02aabc331c325d8206a862a43438f4a472a5306..5be8db81:/uip/scan.c?ds=inline

diff --git a/uip/scan.c b/uip/scan.c
index 56afc181..20668691 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -13,48 +13,28 @@
 #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
-    { "form formatfile", 0 },
-#define	FMTSW	3
-    { "format string", 5 },
-#define	HEADSW	4
-    { "header", 0 },
-#define	NHEADSW	5
-    { "noheader", 0 },
-#define	WIDTHSW	6
-    { "width columns", 0 },
-#define	REVSW	7
-    { "reverse", 0 },
-#define	NREVSW	8
-    { "noreverse", 0 },
-#define	FILESW	9
-    { "file file", 4 },
-#define VERSIONSW 10
-    { "version", 0 },
-#define	HELPSW	11
-    { "help", 0 },
-    { NULL, 0 }
-};
 
-
-/*
- * global for sbr/formatsbr.c - yech!
- */
-#ifdef LBL
-extern struct msgs *fmt_current_folder;	
-#endif
-
-/*
- * prototypes
- */
-void clear_screen(void);  /* from termsbr.c */
+#define SCAN_SWITCHES \
+    X("clear", 0, CLRSW) \
+    X("noclear", 0, NCLRSW) \
+    X("form formatfile", 0, FORMSW) \
+    X("format string", 5, FMTSW) \
+    X("header", 0, HEADSW) \
+    X("noheader", 0, NHEADSW) \
+    X("width columns", 0, WIDTHSW) \
+    X("reverse", 0, REVSW) \
+    X("noreverse", 0, NREVSW) \
+    X("file file", 4, FILESW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(SCAN);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(SCAN, switches);
+#undef X
 
 
 int
@@ -63,7 +43,8 @@ main (int argc, char **argv)
     int clearflag = 0, hdrflag = 0, ontty;
     int width = 0, revflag = 0;
     int i, state, msgnum;
-    int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
+    ivector_t seqnum = ivector_create (0);
+    int unseen, num_unseen_seq = 0;
     char *cp, *maildir, *file = NULL, *folder = NULL;
     char *form = NULL, *format = NULL, buf[BUFSIZ];
     char **argp, *nfs, **arguments;
@@ -71,13 +52,7 @@ main (int argc, char **argv)
     struct msgs *mp;
     FILE *in;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     mts_init (invo_name);
     arguments = getarguments (invo_name, argc, argv, 1);
@@ -214,7 +189,7 @@ main (int argc, char **argv)
 	adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */
-    if (!(mp = folder_read (folder)))
+    if (!(mp = folder_read (folder, 1)))
 	adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */
@@ -241,7 +216,7 @@ main (int argc, char **argv)
 	dp = getcpy(cp);
 	ap = brkstring (dp, " ", "\n");
 	for (i = 0; ap && *ap; i++, ap++)
-	    seqnum[i] = seq_getnum (mp, *ap);
+	    ivector_push_back (seqnum, seq_getnum (mp, *ap));
 
 	num_unseen_seq = i;
 	if (dp)
@@ -250,11 +225,6 @@ main (int argc, char **argv)
 
     ontty = isatty (fileno (stdout));
 
-#ifdef LBL
-    else
-	fmt_current_folder = mp;
-#endif
-
     for (msgnum = revflag ? mp->hghsel : mp->lowsel;
 	 (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel);
 	 msgnum += (revflag ? -1 : 1)) {
@@ -274,7 +244,7 @@ main (int argc, char **argv)
 	     */
 	    unseen = 0;
 	    for (i = 0; i < num_unseen_seq; i++) {
-		if (in_sequence(mp, seqnum[i], msgnum)) {
+		if (in_sequence(mp, ivector_at (seqnum, i), msgnum)) {
 		    unseen = 1;
 		    break;
 		}
@@ -303,13 +273,10 @@ main (int argc, char **argv)
 	}
     }
 
-#ifdef LBL
-    seq_save (mp);	/* because formatsbr might have made changes */
-#endif
-
+    ivector_free (seqnum);
     folder_free (mp);	/* free folder/message structure */
     if (clearflag)
-	clear_screen ();
+	nmh_clear_screen ();
 
     done (0);
     return 1;