X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhtest.c;h=985147c73a24e6640b7b10595cc8bf90d194fd0a;hp=5c0310916aa6e940a4443f92eb2f8b151e4ea8b7;hb=56a805299de35d8924969138aef4d0f1580daa6d;hpb=3c9700d8d045f3ff26ce5dd2a174454dafc14822

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 5c03109..985147c 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -3,6 +3,10 @@
  * 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>
@@ -11,23 +15,17 @@
 #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/utils.h>
 
 #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 },
@@ -52,7 +50,7 @@ static struct swit switches[] = {
 #define VERSIONSW              10
     { "version", 0 },
 #define	HELPSW                 11
-    { "help", 4 },
+    { "help", 0 },
 
 /*
  * switches for debugging
@@ -63,8 +61,6 @@ static struct swit switches[] = {
 };
 
 
-extern int errno;
-
 int ebcdicsw = 0;	/* hack for linking purposes */
 
 /* mhparse.c */
@@ -118,18 +114,22 @@ void free_content (CT);
  */
 static int write_content (CT *, char *);
 static RETSIGTYPE pipeser (int);
+static int freectp_done (int);
 
 
 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 **argp, **arguments, **msgs;
+    char **argp, **arguments;
+    struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp = NULL;
     CT ct, *ctp;
 
+    done=freectp_done;
+
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
@@ -142,15 +142,6 @@ main (int argc, char **argv)
     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
      */
     while ((cp = *argp++)) {
@@ -242,20 +233,9 @@ do_cache:
 	    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 */
@@ -289,7 +269,7 @@ do_cache:
     if (!context_find ("path"))
 	free (path ("./", TFOLDER));
 
-    if (file && nummsgs)
+    if (file && msgs.size)
 	adios (NULL, "cannot specify msg and file at same time!");
 
     /*
@@ -306,8 +286,8 @@ do_cache:
 	/*
 	 * 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);
@@ -324,8 +304,8 @@ do_cache:
 	    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 */
 
@@ -420,8 +400,8 @@ pipeser (int i)
 }
 
 
-int
-done (int status)
+static int
+freectp_done (int status)
 {
     CT *ctp;