X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3dccb685fb1b879e8910e8732e748b22e7ff8dc7..be6c3984:/uip/mhshow.c?ds=inline

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 993477bb..f83236b7 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,63 +18,43 @@
 #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 },
+#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
 
-/*
- * 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 }
-};
-
-
-/* mhparse.c */
-extern char *tmp;	/* directory to place temp files */
 
 /* mhcachesbr.c */
 extern int rcachesw;
@@ -88,7 +66,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;
 
@@ -116,7 +93,6 @@ void flush_errors (void);
 void show_all_messages (CT *);
 
 /* mhfree.c */
-void free_content (CT);
 extern CT *cts;
 void freects_done (int) NORETURN;
 
@@ -138,15 +114,9 @@ main (int argc, char **argv)
     CT ct, *ctp;
     FILE *fp;
 
-    done=freects_done;
-
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], 1)) { return 1; }
 
-    /* read user profile/context */
-    context_read();
+    done=freects_done;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -314,16 +284,6 @@ do_cache:
 	cache_private = ".cache";
     cache_private = getcpy (m_maildir (cache_private));
 
-    /*
-     * Check for storage directory.  If specified,
-     * then store temporary files there.  Else we
-     * store them in standard nmh directory.
-     */
-    if ((cp = context_find (nmhstorage)) && *cp)
-	tmp = concat (cp, "/", invo_name, NULL);
-    else
-	tmp = add (m_maildir (invo_name), NULL);
-
     if (!context_find ("path"))
 	free (path ("./", TFOLDER));
 
@@ -354,7 +314,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 */
@@ -447,7 +407,6 @@ static void
 pipeser (int i)
 {
     if (i == SIGQUIT) {
-	unlink ("core");
 	fflush (stdout);
 	fprintf (stderr, "\n");
 	fflush (stderr);