Tweaked check of -outfile in test-mhstore.

[nmh] / uip / mhtest.c

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 80a0c7b3fdbce4c51c6c4212e2d50140071c880f..49d2a981a08c6c3c6747834f92184eaa83164f4b 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -2,73 +2,47 @@
 /*
  * mhtest.c -- test harness for MIME routines
  *
 /*
  * mhtest.c -- test harness for MIME routines
  *

- * $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.

  */
 
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
  */
 
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>

-#include <errno.h>
-#include <signal.h>
-#include <zotnet/mts/mts.h>
-#include <zotnet/tws/tws.h>
+#include <h/mts.h>
+#include <h/tws.h>

 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>

+#include <h/utils.h>
+
+#define MHTEST_SWITCHES \
+    X("check", 0, CHECKSW) \
+    X("nocheck", 0, NCHECKSW) \
+    X("verbose", 0, VERBSW) \
+    X("noverbose", 0, NVERBSW) \
+    X("file file", 0, FILESW) \
+    X("outfile file", 0, OUTFILESW) \
+    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) \
+    X("debug", -5, DEBUGSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(MHTEST);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MHTEST, 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        VERBSW                  2
-    { "verbose", 0 },
-#define        NVERBSW                 3
-    { "noverbose", 0 },
-#define        FILESW                  4
-    { "file file", 0 },
-#define OUTFILESW               5
-    { "outfile file", 0 },
-#define        PARTSW                  6
-    { "part number", 0 },
-#define        TYPESW                  7
-    { "type content", 0 },
-#define        RCACHESW                8
-    { "rcache policy", 0 },
-#define        WCACHESW                9
-    { "wcache policy", 0 },
-#define VERSIONSW              10
-    { "version", 0 },
-#define        HELPSW                 11
-    { "help", 4 },
-
-/*
- * switches for debugging
- */
-#define        DEBUGSW                12
-    { "debug", -5 },
-    { NULL, 0 }
-};
-
-
-extern int errno;
-
-int ebcdicsw = 0;      /* hack for linking purposes */

 
 /* 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 */


@@ -93,9 +67,6 @@ pid_t xpid  = 0;
 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 */


@@ -107,29 +78,32 @@ int output_message (CT, 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);
 
 /* mhfree.c */
 void flush_errors (void);
 
 /* mhfree.c */

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

 
 /*
  * static prototypes
  */
 static int write_content (CT *, char *);
 
 /*
  * static prototypes
  */
 static int write_content (CT *, char *);

-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], *outfile = NULL;
     char *cp, *file = NULL, *folder = NULL;
     char *maildir, buf[100], *outfile = NULL;

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

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

+    done=freects_done;
+

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


@@ -141,15 +115,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
      */


@@ -166,10 +131,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;


@@ -242,28 +207,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 (outfile == NULL)
        adios (NULL, "must specify output file");
 
     if (outfile == NULL)
        adios (NULL, "must specify output file");
 


@@ -289,7 +241,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!");
 
     /*


@@ -300,14 +252,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);


@@ -316,7 +268,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 */


@@ -324,8 +276,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);
        seq_setprev (mp);       /* set the previous-sequence */
 
                done (1);
        seq_setprev (mp);       /* set the previous-sequence */
 


@@ -387,7 +339,7 @@ do_cache:
     }
 
     done (0);
     }
 
     done (0);

-    /* NOTREACHED */
+    return 1;

 }
 
 
 }
 
 


@@ -406,7 +358,7 @@ write_content (CT *cts, char *outfile)
 }
 
 
 }
 
 

-static RETSIGTYPE
+static void

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


@@ -419,16 +371,3 @@ pipeser (int i)
     done (1);
     /* NOTREACHED */
 }
     done (1);
     /* NOTREACHED */
 }

-
-
-void
-done (int status)
-{
-    CT *ctp;
-
-    if ((ctp = cts))
-       for (; *ctp; ctp++)
-           free_content (*ctp);
-
-    exit (status);
-}