X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0569d6d1631dc90d4f2f2df6bdd0599c7ecc7814..64cc8937ff11ffd37736f27ceed5f4ff93161ca7:/uip/scan.c?ds=sidebyside

diff --git a/uip/scan.c b/uip/scan.c
index 05f8bf88..2996a2b5 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -2,8 +2,6 @@
 /*
  * scan.c -- display a one-line "scan" listing of folder or messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -17,42 +15,29 @@
 #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 }
-};
+#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
 
 
-/*
- * global for sbr/formatsbr.c - yech!
- */
-#ifdef LBL
-extern struct msgs *fmt_current_folder;	
-#endif
-
 /*
  * prototypes
  */
@@ -101,10 +86,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case CLRSW: 
 		    clearflag++;
@@ -186,19 +171,18 @@ 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);
+	scan_detect_mbox_style (in);
 	for (msgnum = 1; ; ++msgnum) {
 	    state = scan (in, msgnum, -1, nfs, width, 0, 0,
 		    hdrflag ? file : NULL, 0L, 1);
 	    if (state != SCNMSG && state != SCNENC)
 		break;
 	}
+	scan_finished ();
 	fclose (in);
 	done (0);
     }
@@ -217,7 +201,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 */
@@ -253,32 +237,18 @@ 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)) {
 	if (is_selected(mp, msgnum)) {
 	    if ((in = fopen (cp = m_name (msgnum), "r")) == NULL) {
-#if 0
-		if (errno != EACCES)
-#endif
 		    admonish (cp, "unable to open message");
-#if 0
-		else
-		    printf ("%*d  unreadable\n", DMAXFOLDER, msgnum);
-#endif
 		continue;
 	    }
 
-#ifndef JLR
 	    if (hdrflag) {
 		printf ("FOLDER %s\t%s\n", folder, dtimenow(1));
 	    }
-#endif /* JLR */
 
 	    /*
 	     * Check if message is in any sequence given
@@ -304,13 +274,10 @@ main (int argc, char **argv)
 		    adios (NULL, "scan() botch (%d)", state);
 
 		case SCNEOF: 
-#if 0
-		    printf ("%*d  empty\n", DMAXFOLDER, msgnum);
-#else
 		    advise (NULL, "message %d: empty", msgnum);
-#endif
 		    break;
 	    }
+	    scan_finished ();
 	    hdrflag = 0;
 	    fclose (in);
 	    if (ontty)
@@ -318,13 +285,10 @@ main (int argc, char **argv)
 	}
     }
 
-#ifdef LBL
-    seq_save (mp);	/* because formatsbr might have made changes */
-#endif
-
     folder_free (mp);	/* free folder/message structure */
     if (clearflag)
 	clear_screen ();
 
-    return done (0);
+    done (0);
+    return 1;
 }