Removed msh relics from scansbr.c, including a global.

[nmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index f83236b7433e1f063ef77ce29aa6efb6121c86b1..98cab9d148f44720b470e1940c885034dbc8bf52 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -21,14 +21,17 @@
 #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("concat", 0, CONCATSW) \
+    X("noconcat", 0, NCONCATSW) \
+    X("textonly", 0, TEXTONLYSW) \
+    X("notextonly", 0, NTEXTONLYSW) \
+    X("inlineonly", 0, INLINESW) \
+    X("noinlineonly", 0, NINLINESW) \
     X("file file", 0, FILESW) \
     X("form formfile", 0, FORMSW) \
+    X("markform formfile", 0, MARKFORMSW) \
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
     X("rcache policy", 0, RCACHESW) \
@@ -63,8 +66,6 @@ extern char *cache_public;
 extern char *cache_private;
 
 /* mhshowsbr.c */
-extern int pausesw;
-extern int serialsw;
 extern char *progsw;
 extern int nomore;     /* flags for moreproc/header display */
 extern char *formsw;
@@ -89,9 +90,6 @@ int part_ok (CT, int);
 int type_ok (CT, int);
 void flush_errors (void);
 
-/* mhshowsbr.c */
-void show_all_messages (CT *);
-
 /* mhfree.c */
 extern CT *cts;
 void freects_done (int) NORETURN;
@@ -105,8 +103,8 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
-    int msgnum, *icachesw;
-    char *cp, *file = NULL, *folder = NULL;
+    int msgnum, *icachesw, concatsw = -1, textonly = -1, inlineonly = -1;
+    char *cp, *file = NULL, *folder = NULL, *markform = NULL;
     char *maildir, buf[100], **argp;
     char **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
@@ -168,18 +166,23 @@ do_cache:
                checksw = 0;
                continue;
 
-           case PAUSESW:
-               pausesw = 1;
+           case CONCATSW:
+               concatsw = 1;
                continue;
-           case NPAUSESW:
-               pausesw = 0;
+           case NCONCATSW:
+               concatsw = 0;
                continue;
-
-           case SERIALSW:
-               serialsw = 1;
+           case TEXTONLYSW:
+               textonly = 1;
+               continue;
+           case NTEXTONLYSW:
+               textonly = 0;
                continue;
-           case NSERIALSW:
-               serialsw = 0;
+           case INLINESW:
+               inlineonly = 1;
+               continue;
+           case NINLINESW:
+               inlineonly = 0;
                continue;
 
            case PARTSW:
@@ -214,6 +217,11 @@ do_cache:
                formsw = getcpy (etcpath (cp));
                continue;
 
+           case MARKFORMSW:
+               if (!(markform = *argp++) || *markform == '-')
+                   adios (NULL, "missing argument to %s", argp[-2]);
+               continue;
+
            /*
             * Switches for moreproc/mhlproc
             */
@@ -255,6 +263,18 @@ do_cache:
     parts[npart] = NULL;
     types[ntype] = NULL;
 
+    /*
+     * If we had any specific parts or types specified, turn off text only
+     * content.
+     */
+
+    if (npart > 0 || ntype > 0) {
+       if (textonly == -1)
+           textonly = 0;
+       if (inlineonly == -1)
+           inlineonly = 0;
+    }
+
     /*
      * Check if we've specified an additional profile
      */
@@ -386,10 +406,13 @@ do_cache:
        context_save ();                  /* save the context file  */
     }
 
+    if (concatsw)
+       m_popen(moreproc, 0);
+
     /*
      * Show the message content
      */
-    show_all_messages (cts);
+    show_all_messages (cts, concatsw, textonly, inlineonly, markform);
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
@@ -398,6 +421,9 @@ do_cache:
     free ((char *) cts);
     cts = NULL;
 
+    if (concatsw)
+       m_pclose();
+
     done (0);
     return 1;
 }