Don't `else' after goto. Simplify control flow.

[nmh] / uip / pick.c

diff --git a/uip/pick.c b/uip/pick.c
index 9f4bf0f5746dfa502936bf5700bbe98df5f2dd3c..9b2e0cded306b1187d1f12b2e57978af95608111 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -2,9 +2,7 @@
 /*
  * pick.c -- search for messages by content
  *
 /*
  * pick.c -- search for messages by content
  *

- * $Id$
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * This code is Copyright (c) 2002, 2008, by the authors of nmh.  See the

  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */


@@ -12,100 +10,78 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/picksbr.h>
 #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
-
-
-static struct swit switches[] = {
-#define        ANDSW                   0
-    { "and", 0 },
-#define        ORSW                    1
-    { "or", 0 },
-#define        NOTSW                   2
-    { "not", 0 },
-#define        LBRSW                   3
-    { "lbrace", 0 },
-#define        RBRSW                   4
-    { "rbrace", 0 },
-#define        CCSW                    5
-    { "cc  pattern", 0 },
-#define        DATESW                  6
-    { "date  pattern", 0 },
-#define        FROMSW                  7
-    { "from  pattern", 0 },
-#define        SRCHSW                  8
-    { "search  pattern", 0 },
-#define        SUBJSW                  9
-    { "subject  pattern", 0 },
-#define        TOSW                   10
-    { "to  pattern", 0 },
-#define        OTHRSW                 11
-    { "-othercomponent  pattern", 0 },
-#define        AFTRSW                 12
-    { "after date", 0 },
-#define        BEFRSW                 13
-    { "before date", 0 },
-#define        DATFDSW                14
-    { "datefield field", 5 },
-#define        SEQSW                  15
-    { "sequence name", 0 },
-#define        PUBLSW                 16
-    { "public", 0 },
-#define        NPUBLSW                17
-    { "nopublic", 0 },
-#define        ZEROSW                 18
-    { "zero", 0 },
-#define        NZEROSW                19
-    { "nozero", 0 },
-#define        LISTSW                 20
-    { "list", 0 },
-#define        NLISTSW                21
-    { "nolist", 0 },
-#define VERSIONSW              22
-    { "version", 0 },
-#define        HELPSW                 23
-    { "help", 0 },
-    { NULL, 0 }
-};
+#include <h/utils.h>
+
+#define PICK_SWITCHES \
+    X("reverse", 0, REVSW) \
+    X("and", 0, ANDSW) \
+    X("or", 0, ORSW) \
+    X("not", 0, NOTSW) \
+    X("lbrace", 0, LBRSW) \
+    X("rbrace", 0, RBRSW) \
+    X("cc  pattern", 0, CCSW) \
+    X("date  pattern", 0, DATESW) \
+    X("from  pattern", 0, FROMSW) \
+    X("search  pattern", 0, SRCHSW) \
+    X("subject  pattern", 0, SUBJSW) \
+    X("to  pattern", 0, TOSW) \
+    X("-othercomponent  pattern", 0, OTHRSW) \
+    X("after date", 0, AFTRSW) \
+    X("before date", 0, BEFRSW) \
+    X("datefield field", 5, DATFDSW) \
+    X("sequence name", 0, SEQSW) \
+    X("nosequence", 0, NSEQSW) \
+    X("public", 0, PUBLSW) \
+    X("nopublic", 0, NPUBLSW) \
+    X("zero", 0, ZEROSW) \
+    X("nozero", 0, NZEROSW) \
+    X("list", 0, LISTSW) \
+    X("nolist", 0, NLISTSW) \
+    X("debug", 0, DEBUGSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(PICK);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(PICK, switches);
+#undef X

 
 static int listsw = -1;
 
 
 static int listsw = -1;
 

+static void putzero_done (int) NORETURN;

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

-    int publicsw = -1, zerosw = 1, seqp = 0, vecp = 0;
-    int nummsgs, maxmsgs, lo, hi, msgnum;
+    int publicsw = -1, zerosw = 1, vecp = 0;
+    size_t seqp = 0;
+    int msgnum;

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

-    char **msgs, *seqs[NUMATTRS + 1], *vec[MAXARGS];
-    struct msgs *mp;
-    register FILE *fp;
+    svector_t seqs = svector_create (0);
+    char *vec[MAXARGS];
+    struct msgs_array msgs = { 0, 0, NULL };
+    struct msgnum_array nums = { 0, 0, NULL };
+    struct msgs *mp, *mp2;
+    FILE *fp;
+    int debug = 0;
+    int reverse = 0;
+    int start, end, inc;
+
+    if (nmh_init(argv[0], 1)) { return 1; }

 
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    done=putzero_done;

 
 

-    /* read user profile/context */
-    context_read();
+    /* Deprecated.  Use -debug instead. */
+    if ((cp = getenv ("MHPDEBUG")) && *cp)
+       ++debug;

 
     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");
-

     while ((cp = *argp++)) {
        if (*cp == '-') {
            if (*++cp == '-') {
     while ((cp = *argp++)) {
        if (*cp == '-') {
            if (*++cp == '-') {


@@ -125,11 +101,15 @@ main (int argc, char **argv)
                          invo_name);
                print_help (buf, switches, 1);
                listsw = 0;     /* HACK */
                          invo_name);
                print_help (buf, switches, 1);
                listsw = 0;     /* HACK */

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

            case VERSIONSW:
                print_version(invo_name);
                listsw = 0;     /* HACK */
            case VERSIONSW:
                print_version(invo_name);
                listsw = 0;     /* HACK */

-               done (1);
+               done (0);
+
+            case REVSW:
+                reverse = 1;
+                continue;

 
            case CCSW: 
            case DATESW: 
 
            case CCSW: 
            case DATESW: 


@@ -161,10 +141,14 @@ main (int argc, char **argv)
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
 
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
 

-               /* check if too many sequences specified */
-               if (seqp >= NUMATTRS)
-                   adios (NULL, "too many sequences (more than %d) specified", NUMATTRS);
-               seqs[seqp++] = cp;
+                if (!seq_nameok (cp))
+                  done (1);
+
+               svector_push_back (seqs, cp);
+               seqp++;
+               continue;
+           case NSEQSW:
+               seqp = 0;

                continue;
            case PUBLSW: 
                publicsw = 1;
                continue;
            case PUBLSW: 
                publicsw = 1;


@@ -185,26 +169,19 @@ main (int argc, char **argv)
            case NLISTSW: 
                listsw = 0;
                continue;
            case NLISTSW: 
                listsw = 0;
                continue;

+
+           case DEBUGSW:
+               ++debug;
+               continue;

            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
            }
        }
        if (*cp == '+' || *cp == '@') {
            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 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;
-       }
+               folder = pluspath (cp);
+       } else
+               app_msgarg(&msgs, cp);

     }
     vec[vecp] = NULL;
 
     }
     vec[vecp] = NULL;
 


@@ -215,8 +192,8 @@ main (int argc, char **argv)
      * If we didn't specify which messages to search,
      * then search the whole folder.
      */
      * 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);
 
     if (!folder)
        folder = getfolder (1);


@@ -226,7 +203,7 @@ main (int argc, char **argv)
        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, 0)))

        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */
        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */


@@ -234,10 +211,9 @@ main (int argc, char **argv)
        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);

-    seq_setprev (mp);  /* set the previous-sequence */

 
     /*
      * If we aren't saving the results to a sequence,
 
     /*
      * If we aren't saving the results to a sequence,


@@ -252,71 +228,102 @@ main (int argc, char **argv)
     if (!pcompile (vec, NULL))
        done (1);
 
     if (!pcompile (vec, NULL))
        done (1);
 

-    lo = mp->lowsel;
-    hi = mp->hghsel;
+    /* If printing message numbers to standard out, force line buffering on.
+     */
+    if (listsw)
+       setvbuf (stdout, NULL, _IOLBF, 0);

 
     /*
      * Scan through all the SELECTED messages and check for a
 
     /*
      * Scan through all the SELECTED messages and check for a

-     * match.  If the message does not match, then unselect it.
+     * match.  If there is NOT a match, then add it to a list to
+     * remove from the final sequence (it will make sense later)

      */
      */

-    for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
+    if (!reverse) { /* Overflow or underflow is fine. */
+        start = mp->lowsel;
+        end = mp->hghsel + 1;
+        inc = 1;
+    } else {
+        start = mp->hghsel;
+        end = mp->lowsel - 1;
+        inc = -1;
+    }
+    for (msgnum = start; msgnum != end; msgnum += inc) {

        if (is_selected (mp, msgnum)) {
            if ((fp = fopen (cp = m_name (msgnum), "r")) == NULL)
                admonish (cp, "unable to read message");
        if (is_selected (mp, msgnum)) {
            if ((fp = fopen (cp = m_name (msgnum), "r")) == NULL)
                admonish (cp, "unable to read message");

-           if (fp && pmatches (fp, msgnum, 0L, 0L)) {
-               if (msgnum < lo)
-                   lo = msgnum;
-               if (msgnum > hi)
-                   hi = msgnum;
+           if (fp && pmatches (fp, msgnum, 0L, 0L, debug)) {
+               if (listsw)
+                   printf ("%s\n", m_name (msgnum));

            } else {
            } else {

-               /* if it doesn't match, then unselect it */
-               unset_selected (mp, msgnum);
-               mp->numsel--;
+               app_msgnum(&nums, msgnum);

            }
            if (fp)
                fclose (fp);
        }
     }
 
            }
            if (fp)
                fclose (fp);
        }
     }
 

-    mp->lowsel = lo;
-    mp->hghsel = hi;
-
-    if (mp->numsel <= 0)
+    if (nums.size >= mp->numsel)

        adios (NULL, "no messages match specification");
 
        adios (NULL, "no messages match specification");
 

-    seqs[seqp] = NULL;
+    /*
+     * So, what's happening here?
+     *
+     * - Re-read the folder and sequences, but with locking.
+     * - Recreate the original set of selected messages from the command line
+     * - Set the previous sequence
+     * - Remove any messages that did NOT result in hits from the selection
+     * - Add to any new sequences
+     */
+
+    if (!(mp2 = folder_read (folder, 1)))
+       adios (NULL, "unable to reread folder %s", folder);
+
+    for (msgnum = 0; msgnum < msgs.size; msgnum++)
+       if (!m_convert (mp2, msgs.msgs[msgnum]))
+           done (1);
+    seq_setprev (mp2); /* set the previous-sequence */
+
+    /*
+     * Nums contains a list of messages that we did NOT match.  Remove
+     * that from the selection.
+     */
+
+    for (msgnum = 0; msgnum < nums.size; msgnum++) {
+       unset_selected(mp2, nums.msgnums[msgnum]);
+       mp2->numsel--;
+    }

 
     /*
      * Add the matching messages to sequences
      */
 
     /*
      * Add the matching messages to sequences
      */

-    for (seqp = 0; seqs[seqp]; seqp++)
-       if (!seq_addsel (mp, seqs[seqp], publicsw, zerosw))
-           done (1);
+    if (seqp > 0) {
+       for (seqp = 0; seqp < svector_size (seqs); seqp++)
+           if (!seq_addsel (mp2, svector_at (seqs, seqp), publicsw, zerosw))
+               done (1);
+    }

 
     /*
 
     /*

-     * Print the name of all the matches
+     * Print total matched if not printing each matched message number.

      */
      */

-    if (listsw) {
-       for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
-           if (is_selected (mp, msgnum))
-               printf ("%s\n", m_name (msgnum));
-    } else {
-       printf ("%d hit%s\n", mp->numsel, mp->numsel == 1 ? "" : "s");
+    if (!listsw) {
+       printf ("%d hit%s\n", mp2->numsel, mp2->numsel == 1 ? "" : "s");

     }
 
     }
 

+    svector_free (seqs);

     context_replace (pfolder, folder); /* update current folder         */
     context_replace (pfolder, folder); /* update current folder         */

-    seq_save (mp);                     /* synchronize message sequences */
+    seq_save (mp2);                    /* synchronize message sequences */

     context_save ();                   /* save the context file         */
     folder_free (mp);                  /* free folder/message structure */
     context_save ();                   /* save the context file         */
     folder_free (mp);                  /* free folder/message structure */

-    return done (0);
+    folder_free (mp2);
+    done (0);
+    return 1;

 }
 
 
 }
 
 

-int
-done (int status)
+static void
+putzero_done (int status)

 {
     if (listsw && status && !isatty (fileno (stdout)))
        printf ("0\n");
     exit (status);
 {
     if (listsw && status && !isatty (fileno (stdout)))
        printf ("0\n");
     exit (status);

-    return 1;  /* dead code to satisfy the compiler */

 }
 }