X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpick.c;h=8fd294ee140fc85caf6e17e1641cc8fe87bc4065;hp=65a9091ee1e46073efa3545176f9ccd41f8d893c;hb=174d375bb4b9bcaa0c3f28c422216f68703494a8;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68

diff --git a/uip/pick.c b/uip/pick.c
index 65a9091..8fd294e 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -12,13 +12,7 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/picksbr.h>
-
-/*
- * We allocate space for messages (msgs array)
- * this number of elements at a time.
- */
-#define MAXMSGS  256
-
+#include <h/utils.h>
 
 static struct swit switches[] = {
 #define	ANDSW                   0
@@ -72,17 +66,18 @@ static struct swit switches[] = {
     { NULL, 0 }
 };
 
-static int listsw = 0;
+static int listsw = -1;
 
 
 int
 main (int argc, char **argv)
 {
     int publicsw = -1, zerosw = 1, seqp = 0, vecp = 0;
-    int nummsgs, maxmsgs, lo, hi, msgnum;
+    int lo, hi, msgnum;
     char *maildir, *folder = NULL, buf[100];
     char *cp, **argp, **arguments;
-    char **msgs, *seqs[NUMATTRS + 1], *vec[MAXARGS];
+    char *seqs[NUMATTRS + 1], *vec[MAXARGS];
+    struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
     register FILE *fp;
 
@@ -97,15 +92,6 @@ main (int argc, char **argv)
     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");
-
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    if (*++cp == '-') {
@@ -115,6 +101,7 @@ main (int argc, char **argv)
 	    switch (smatch (cp, switches)) {
 	    case AMBIGSW: 
 		ambigsw (cp, switches);
+		listsw = 0;	/* HACK */
 		done (1);
 	    case UNKWNSW: 
 		adios (NULL, "-%s unknown", cp);
@@ -127,6 +114,7 @@ main (int argc, char **argv)
 		done (1);
 	    case VERSIONSW:
 		print_version(invo_name);
+		listsw = 0;	/* HACK */
 		done (1);
 
 	    case CCSW: 
@@ -163,7 +151,6 @@ main (int argc, char **argv)
 		if (seqp >= NUMATTRS)
 		    adios (NULL, "too many sequences (more than %d) specified", NUMATTRS);
 		seqs[seqp++] = cp;
-		listsw = 0;
 		continue;
 	    case PUBLSW: 
 		publicsw = 1;
@@ -179,7 +166,7 @@ main (int argc, char **argv)
 		continue;
 
 	    case LISTSW: 
-		listsw++;
+		listsw = 1;
 		continue;
 	    case NLISTSW: 
 		listsw = 0;
@@ -191,19 +178,8 @@ main (int argc, char **argv)
 		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 name/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;
-	}
+	} else
+		app_msgarg(&msgs, cp);
     }
     vec[vecp] = NULL;
 
@@ -214,8 +190,8 @@ main (int argc, char **argv)
      * If we didn't specify which messages to search,
      * then search the whole folder.
      */
-    if (!nummsgs)
-	msgs[nummsgs++] = "all";
+    if (!msgs.size)
+	app_msgarg(&msgs, "all");
 
     if (!folder)
 	folder = getfolder (1);
@@ -233,17 +209,17 @@ main (int argc, char **argv)
 	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 */
 
     /*
      * If we aren't saving the results to a sequence,
-     * we need to list the results.
+     * we default to list the results.
      */
-    if (seqp == 0)
-	listsw++;
+    if (listsw == -1)
+	listsw = !seqp;
 
     if (publicsw == 1 && is_readonly(mp))
 	adios (NULL, "folder %s is read-only, so -public not allowed", folder);