Created app_msgarg() (append message arg) and a simple resizable array

[mmh] / uip / mhn.c

diff --git a/uip/mhn.c b/uip/mhn.c
index 685a74e..cfeac94 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -26,13 +26,6 @@
 # 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        AUTOSW                  0
     { "auto", 0 },
@@ -218,10 +211,11 @@ int
 main (int argc, char **argv)
 {
     int sizesw = 1, headsw = 1;
-    int nummsgs, maxmsgs, msgnum, *icachesw;
+    int msgnum, *icachesw;
     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;
@@ -238,14 +232,6 @@ main (int argc, char **argv)
     argp = arguments;
 
     /*
-     * Allocate the initial space to record message
-     * names, ranges, and sequences.
-     */
-    nummsgs = 0;
-    maxmsgs = MAXMSGS;
-    msgs = (char **) mh_xmalloc ((size_t) (maxmsgs * sizeof(*msgs)));
-
-    /*
      * Parse arguments
      */
     while ((cp = *argp++)) {
@@ -442,18 +428,8 @@ do_cache:
                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;
-               msgs = (char **) mh_xrealloc (msgs,
-                   (size_t) (maxmsgs * sizeof(*msgs)));
-           }
-           msgs[nummsgs++] = cp;
-       }
+       } else
+               app_msgarg(&msgs, cp);
     }
 
     /* null terminate the list of acceptable parts/types */
@@ -524,9 +500,9 @@ do_cache:
 
        if (showsw || storesw || cachesw)
            adios (NULL, "cannot use -build with -show, -store, -cache");
-       if (nummsgs < 1)
+       if (msgs.size < 1)
            adios (NULL, "need to specify a %s composition file", invo_name);
-       if (nummsgs > 1)
+       if (msgs.size > 1)
            adios (NULL, "only one %s composition file at a time", invo_name);
 
        vecp = 0;
@@ -542,7 +518,7 @@ do_cache:
        else if (rfc934sw == -1)
            vec[vecp++] = "-norfc934mode";
 
-       vec[vecp++] = msgs[0];
+       vec[vecp++] = msgs.msgs[0];
        vec[vecp] = NULL;
 
        execvp ("mhbuild", vec);
@@ -553,10 +529,10 @@ do_cache:
     /*
      * Process a mhn composition file (old MH style)
      */
-    if (nummsgs == 1 && !folder && !npart && !cachesw
+    if (msgs.size == 1 && !folder && !npart && !cachesw
        && !showsw && !storesw && !ntype && !file
        && (cp = getenv ("mhdraft"))
-       && strcmp (cp, msgs[0]) == 0) {
+       && strcmp (cp, msgs.msgs[0]) == 0) {
 
        char *vec[MAXARGS];
        int vecp;
@@ -582,7 +558,7 @@ do_cache:
        _exit (-1);
     }
 
-    if (file && nummsgs)
+    if (file && msgs.size)
        adios (NULL, "cannot specify msg and file at same time!");
 
     /*
@@ -599,8 +575,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);
@@ -617,8 +593,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 */