Try using -man instead of -mandoc in test-manpages on OpenBSD

[nmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 4496590f2aefe1ca893083e7e68d6a794201de23..94e5e0647778f2291fa7a87f844b2d9cef7fec76 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -2,8 +2,6 @@
 /*
  * mhshow.c -- display the contents of MIME messages
  *
 /*
  * mhshow.c -- display the contents of MIME 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.
  * 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.


@@ -13,84 +11,52 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
 #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>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>

+#include <h/utils.h>
+
+#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

 
 

-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-/*
- * We allocate space for message names (msgs array)
- * this number of elements at a time.
- */
-#define MAXMSGS  256
-
-
-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 }
-};
-
-
-extern int errno;

 
 /* mhparse.c */
 
 /* mhparse.c */

-extern int checksw;

 extern char *tmp;      /* directory to place temp files */
 
 /* mhcachesbr.c */
 extern char *tmp;      /* directory to place temp files */
 
 /* mhcachesbr.c */


@@ -103,7 +69,6 @@ extern char *cache_private;
 extern int pausesw;
 extern int serialsw;
 extern char *progsw;
 extern int pausesw;
 extern int serialsw;
 extern char *progsw;

-extern int nolist;

 extern int nomore;     /* flags for moreproc/header display */
 extern char *formsw;
 
 extern int nomore;     /* flags for moreproc/header display */
 extern char *formsw;
 


@@ -117,9 +82,6 @@ extern int userrs;
 int debugsw = 0;
 int verbosw = 0;
 
 int debugsw = 0;
 int verbosw = 0;
 

-/* The list of top-level contents to display */
-CT *cts = NULL;
-

 #define        quitser pipeser
 
 /* mhparse.c */
 #define        quitser pipeser
 
 /* mhparse.c */


@@ -128,32 +90,35 @@ CT parse_mime (char *);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
 /* 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 flush_errors (void);
 
 /* mhshowsbr.c */
 void show_all_messages (CT *);
 
 /* mhfree.c */

-void free_content (CT);
+extern CT *cts;
+void freects_done (int) NORETURN;

 
 /*
  * static prototypes
  */
 
 /*
  * static prototypes
  */

-static RETSIGTYPE pipeser (int);
+static void pipeser (int);

 
 
 int
 main (int argc, char **argv)
 {
 
 
 int
 main (int argc, char **argv)
 {

-    int nummsgs, maxmsgs, msgnum, *icachesw;
+    int msgnum, *icachesw;

     char *cp, *file = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;
     char *cp, *file = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;

-    char **arguments, **msgs;
+    char **arguments;
+    struct msgs_array msgs = { 0, 0, NULL };

     struct msgs *mp = NULL;
     CT ct, *ctp;
     FILE *fp;
 
     struct msgs *mp = NULL;
     CT ct, *ctp;
     FILE *fp;
 

+    done=freects_done;
+

 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif


@@ -165,15 +130,6 @@ main (int argc, char **argv)
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 

-    /*
-     * Allocate the initial space to record message
-     * names, ranges, and sequences.
-     */
-    nummsgs = 0;
-    maxmsgs = MAXMSGS;
-    if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs)))))
-       adios (NULL, "unable to allocate storage");
-

     /*
      * Parse arguments
      */
     /*
      * Parse arguments
      */


@@ -190,10 +146,10 @@ main (int argc, char **argv)
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                print_help (buf, switches, 1);
                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);
            case VERSIONSW:
                print_version(invo_name);

-               done (1);
+               done (0);

 
            case RCACHESW:
                icachesw = &rcachesw;
 
            case RCACHESW:
                icachesw = &rcachesw;


@@ -299,33 +255,15 @@ do_cache:
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
            if (folder)
                adios (NULL, "only one folder at a time!");
            else

-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
-       } else {
-           /*
-            * Check if we need to allocate more space
-            * for message names/ranges/sequences.
-            */
-           if (nummsgs >= maxmsgs) {
-               maxmsgs += MAXMSGS;
-               if (!(msgs = (char **) realloc (msgs,
-                       (size_t) (maxmsgs * sizeof(*msgs)))))
-                   adios (NULL, "unable to reallocate msgs storage");
-           }
-           msgs[nummsgs++] = cp;
-       }
+               folder = pluspath (cp);
+       } else
+               app_msgarg(&msgs, cp);

     }
 
     /* null terminate the list of acceptable parts/types */
     parts[npart] = NULL;
     types[ntype] = NULL;
 
     }
 
     /* null terminate the list of acceptable parts/types */
     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
      */
     /*
      * Check if we've specified an additional profile
      */


@@ -368,7 +306,7 @@ do_cache:
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 

-    if (file && nummsgs)
+    if (file && msgs.size)

        adios (NULL, "cannot specify msg and file at same time!");
 
     /*
        adios (NULL, "cannot specify msg and file at same time!");
 
     /*


@@ -379,14 +317,14 @@ do_cache:
            adios (NULL, "out of memory");
        ctp = cts;
 
            adios (NULL, "out of memory");
        ctp = cts;
 

-       if ((ct = parse_mime (file)));
+       if ((ct = parse_mime (file)))

            *ctp++ = ct;
     } else {
        /*
         * message(s) are coming from a folder
         */
            *ctp++ = ct;
     } else {
        /*
         * message(s) are coming from a folder
         */

-       if (!nummsgs)
-           msgs[nummsgs++] = "cur";
+       if (!msgs.size)
+           app_msgarg(&msgs, "cur");

        if (!folder)
            folder = getfolder (1);
        maildir = m_maildir (folder);
        if (!folder)
            folder = getfolder (1);
        maildir = m_maildir (folder);


@@ -395,7 +333,7 @@ do_cache:
            adios (maildir, "unable to change directory to");
 
        /* read folder and create message structure */
            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 */
            adios (NULL, "unable to read folder %s", folder);
 
        /* check for empty folder */


@@ -403,8 +341,8 @@ do_cache:
            adios (NULL, "no messages in %s", folder);
 
        /* parse all the message ranges/sequences and set SELECTED */
            adios (NULL, "no messages in %s", folder);
 
        /* parse all the message ranges/sequences and set SELECTED */

-       for (msgnum = 0; msgnum < nummsgs; msgnum++)
-           if (!m_convert (mp, msgs[msgnum]))
+       for (msgnum = 0; msgnum < msgs.size; msgnum++)
+           if (!m_convert (mp, msgs.msgs[msgnum]))

                done (1);
 
        /*
                done (1);
 
        /*


@@ -459,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
      */
     /*
      * Show the message content
      */


@@ -471,23 +417,15 @@ do_cache:
     free ((char *) cts);
     cts = NULL;
 
     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  */
-    }
-
-    return done (0);
+    done (0);
+    return 1;

 }
 
 
 }
 
 

-static RETSIGTYPE
+static void

 pipeser (int i)
 {
     if (i == SIGQUIT) {
 pipeser (int i)
 {
     if (i == SIGQUIT) {

-       unlink ("core");

        fflush (stdout);
        fprintf (stderr, "\n");
        fflush (stderr);
        fflush (stdout);
        fprintf (stderr, "\n");
        fflush (stderr);


@@ -496,17 +434,3 @@ pipeser (int i)
     done (1);
     /* NOTREACHED */
 }
     done (1);
     /* NOTREACHED */
 }

-
-
-int
-done (int status)
-{
-    CT *ctp;
-
-    if ((ctp = cts))
-       for (; *ctp; ctp++)
-           free_content (*ctp);
-
-    exit (status);
-    return 1;  /* dead code to satisfy the compiler */
-}