X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d45c3d28d788129428036fd7f26fa417beccd93e..a75b45f604c4e48b0f39be25ce59cd1955e5f9a4:/uip/mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index ea34914b..94e5e064 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -11,8 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
-#include <errno.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
@@ -20,59 +18,42 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-static struct swit switches[] = {
-#define	CHECKSW                 0
-    { "check", 0 },
-#define	NCHECKSW                1
-    { "nocheck", 0 },
-#define	PAUSESW                 2
-    { "pause", 0 },
-#define	NPAUSESW                3
-    { "nopause", 0 },
-#define	SERIALSW                4
-    { "serialonly", 0 },
-#define	NSERIALSW               5
-    { "noserialonly", 0 },
-#define	VERBSW                  6
-    { "verbose", 0 },
-#define	NVERBSW                 7
-    { "noverbose", 0 },
-#define	FILESW                  8	/* interface from show */
-    { "file file", 0 },
-#define	FORMSW                  9
-    { "form formfile", 0 },
-#define	PARTSW                 10
-    { "part number", 0 },
-#define	TYPESW                 11
-    { "type content", 0 },
-#define	RCACHESW               12
-    { "rcache policy", 0 },
-#define	WCACHESW               13
-    { "wcache policy", 0 },
-#define VERSIONSW              14
-    { "version", 0 },
-#define	HELPSW                 15
-    { "help", 0 },
-
-/*
- * switches for moreproc/mhlproc
- */
-#define	PROGSW                 16
-    { "moreproc program", -4 },
-#define	NPROGSW                17
-    { "nomoreproc", -3 },
-#define	LENSW                  18
-    { "length lines", -4 },
-#define	WIDTHSW                19
-    { "width columns", -4 },
-
-/*
- * switches for debugging
- */
-#define	DEBUGSW                20
-    { "debug", -5 },
-    { NULL, 0 }
-};
+#define MHSHOW_SWITCHES \
+    X("check", 0, CHECKSW) \
+    X("nocheck", 0, NCHECKSW) \
+    X("pause", 0, PAUSESW) \
+    X("nopause", 0, NPAUSESW) \
+    X("serialonly", 0, SERIALSW) \
+    X("noserialonly", 0, NSERIALSW) \
+    X("verbose", 0, VERBSW) \
+    X("noverbose", 0, NVERBSW) \
+    X("file file", 0, FILESW) \
+    X("form formfile", 0, FORMSW) \
+    X("part number", 0, PARTSW) \
+    X("type content", 0, TYPESW) \
+    X("rcache policy", 0, RCACHESW) \
+    X("wcache policy", 0, WCACHESW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    /*					\
+     * switches for moreproc/mhlproc	\
+     */					\
+    X("moreproc program", -4, PROGSW) \
+    X("nomoreproc", -3, NPROGSW) \
+    X("length lines", -4, LENSW) \
+    X("width columns", -4, WIDTHSW) \
+    /*				\
+     * switches for debugging	\
+     */				\
+    X("debug", -5, DEBUGSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(MHSHOW);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MHSHOW, switches);
+#undef X
 
 
 /* mhparse.c */
@@ -88,7 +69,6 @@ extern char *cache_private;
 extern int pausesw;
 extern int serialsw;
 extern char *progsw;
-extern int nolist;
 extern int nomore;	/* flags for moreproc/header display */
 extern char *formsw;
 
@@ -110,14 +90,12 @@ CT parse_mime (char *);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
-void set_endian (void);
 void flush_errors (void);
 
 /* mhshowsbr.c */
 void show_all_messages (CT *);
 
 /* mhfree.c */
-void free_content (CT);
 extern CT *cts;
 void freects_done (int) NORETURN;
 
@@ -168,10 +146,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 RCACHESW:
 		icachesw = &rcachesw;
@@ -286,13 +264,6 @@ do_cache:
     parts[npart] = NULL;
     types[ntype] = NULL;
 
-    set_endian ();
-
-    if ((cp = getenv ("MM_NOASK")) && !strcmp (cp, "1")) {
-	nolist  = 1;
-	pausesw = 0;
-    }
-
     /*
      * Check if we've specified an additional profile
      */
@@ -362,7 +333,7 @@ do_cache:
 	    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 */
@@ -426,6 +397,14 @@ do_cache:
 	}
     }
 
+    /* If reading from a folder, do some updating */
+    if (mp) {
+	context_replace (pfolder, folder);/* update current folder  */
+	seq_setcur (mp, mp->hghsel);	  /* update current message */
+	seq_save (mp);			  /* synchronize sequences  */
+	context_save ();		  /* save the context file  */
+    }
+
     /*
      * Show the message content
      */
@@ -438,14 +417,6 @@ do_cache:
     free ((char *) cts);
     cts = NULL;
 
-    /* If reading from a folder, do some updating */
-    if (mp) {
-	context_replace (pfolder, folder);/* update current folder  */
-	seq_setcur (mp, mp->hghsel);	  /* update current message */
-	seq_save (mp);			  /* synchronize sequences  */
-	context_save ();		  /* save the context file  */
-    }
-
     done (0);
     return 1;
 }
@@ -455,7 +426,6 @@ static void
 pipeser (int i)
 {
     if (i == SIGQUIT) {
-	unlink ("core");
 	fflush (stdout);
 	fprintf (stderr, "\n");
 	fflush (stderr);