seq_del.c: Move interface to own file.

[nmh] / uip / pick.c

diff --git a/uip/pick.c b/uip/pick.c
index 281a1ac7cf081a3a4a68cf8c965e6b6a4216d5dc..b5a7cdd620dac3132167dad4f76fc17736c3b36e 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -1,18 +1,21 @@
-
-/*
- * pick.c -- search for messages by content
+/* pick.c -- search for messages by content

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

-#include <h/mh.h>
-#include <h/tws.h>
-#include <h/picksbr.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/seq_add.h"
+#include "sbr/error.h"
+#include "h/tws.h"
+#include "h/picksbr.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"

 
 #define PICK_SWITCHES \
 
 #define PICK_SWITCHES \

+    X("reverse", 0, REVSW) \

     X("and", 0, ANDSW) \
     X("or", 0, ORSW) \
     X("not", 0, NOTSW) \
     X("and", 0, ANDSW) \
     X("or", 0, ORSW) \
     X("not", 0, NOTSW) \


@@ -36,6 +39,7 @@
     X("nozero", 0, NZEROSW) \
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \
     X("nozero", 0, NZEROSW) \
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \

+    X("debug", 0, DEBUGSW) \

     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
 
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
 


@@ -54,25 +58,26 @@ static void putzero_done (int) NORETURN;
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int publicsw = -1, zerosw = 1, vecp = 0;
+    int publicsw = -1;
+    bool zerosw = true;
+    int vecp = 0;

     size_t seqp = 0;
     size_t seqp = 0;

-    int lo, hi, msgnum;
+    int msgnum;

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

-    char *seqs[NUMATTRS + 1], *vec[MAXARGS];
+    svector_t seqs = svector_create (0);
+    char *vec[MAXARGS];

     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs_array msgs = { 0, 0, NULL };

-    struct msgs *mp;
-    register FILE *fp;
-
-    done=putzero_done;
+    struct msgnum_array nums = { 0, 0, NULL };
+    struct msgs *mp, *mp2;
+    FILE *fp;
+    int debug = 0;
+    bool reverse = false;
+    int start, end, inc;

 
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], true, true)) { return 1; }

 
 

-    /* read user profile/context */
-    context_read();
+    set_done(putzero_done);

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -89,7 +94,7 @@ main (int argc, char **argv)
                listsw = 0;     /* HACK */
                done (1);
            case UNKWNSW: 
                listsw = 0;     /* HACK */
                done (1);
            case UNKWNSW: 

-               adios (NULL, "-%s unknown", cp);
+               die("-%s unknown", cp);

 
            case HELPSW: 
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 
            case HELPSW: 
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",


@@ -102,6 +107,10 @@ main (int argc, char **argv)
                listsw = 0;     /* HACK */
                done (0);
 
                listsw = 0;     /* HACK */
                done (0);
 

+            case REVSW:
+                reverse = true;
+                continue;
+

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


@@ -114,11 +123,11 @@ main (int argc, char **argv)
                vec[vecp++] = --cp;
            pattern:
                if (!(cp = *argp++))/* allow -xyz arguments */
                vec[vecp++] = --cp;
            pattern:
                if (!(cp = *argp++))/* allow -xyz arguments */

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                vec[vecp++] = cp;
                continue;
            case OTHRSW: 
                vec[vecp++] = cp;
                continue;
            case OTHRSW: 

-               adios (NULL, "internal error!");
+               die("internal error!");

 
            case ANDSW:
            case ORSW:
 
            case ANDSW:
            case ORSW:


@@ -130,16 +139,13 @@ main (int argc, char **argv)
 
            case SEQSW: 
                if (!(cp = *argp++) || *cp == '-')
 
            case SEQSW: 
                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);
+                   die("missing argument to %s", argp[-2]);

 
                 if (!seq_nameok (cp))
                   done (1);
 
 
                 if (!seq_nameok (cp))
                   done (1);
 

-               seqs[seqp++] = cp;
+               svector_push_back (seqs, cp);
+               seqp++;

                continue;
            case NSEQSW:
                seqp = 0;
                continue;
            case NSEQSW:
                seqp = 0;


@@ -151,10 +157,10 @@ main (int argc, char **argv)
                publicsw = 0;
                continue;
            case ZEROSW: 
                publicsw = 0;
                continue;
            case ZEROSW: 

-               zerosw++;
+               zerosw = true;

                continue;
            case NZEROSW: 
                continue;
            case NZEROSW: 

-               zerosw = 0;
+               zerosw = false;

                continue;
 
            case LISTSW: 
                continue;
 
            case LISTSW: 


@@ -163,13 +169,16 @@ main (int argc, char **argv)
            case NLISTSW: 
                listsw = 0;
                continue;
            case NLISTSW: 
                listsw = 0;
                continue;

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

            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)

-               adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+               die("only one folder at a time!");
+            folder = pluspath (cp);

        } else
                app_msgarg(&msgs, cp);
     }
        } else
                app_msgarg(&msgs, cp);
     }


@@ -194,17 +203,16 @@ main (int argc, char **argv)
 
     /* read folder and create message structure */
     if (!(mp = folder_read (folder, 0)))
 
     /* read folder and create message structure */
     if (!(mp = folder_read (folder, 0)))

-       adios (NULL, "unable to read folder %s", folder);
+       die("unable to read folder %s", folder);

 
     /* check for empty folder */
     if (mp->nummsg == 0)
 
     /* check for empty folder */
     if (mp->nummsg == 0)

-       adios (NULL, "no messages in %s", folder);
+       die("no messages in %s", folder);

 
     /* parse all the message ranges/sequences and set SELECTED */
     for (msgnum = 0; msgnum < msgs.size; msgnum++)
        if (!m_convert (mp, msgs.msgs[msgnum]))
            done (1);
 
     /* parse all the message ranges/sequences and set SELECTED */
     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,
 
     /*
      * If we aren't saving the results to a sequence,


@@ -214,14 +222,11 @@ main (int argc, char **argv)
        listsw = !seqp;
 
     if (publicsw == 1 && is_readonly(mp))
        listsw = !seqp;
 
     if (publicsw == 1 && is_readonly(mp))

-       adios (NULL, "folder %s is read-only, so -public not allowed", folder);
+       die("folder %s is read-only, so -public not allowed", folder);

 
     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)
     /* If printing message numbers to standard out, force line buffering on.
      */
     if (listsw)


@@ -229,65 +234,95 @@ main (int argc, char **argv)
 
     /*
      * 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)
                if (listsw)

-                   printf ("%s\n", m_name (msgnum));
+                   puts(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 (nums.size >= mp->numsel)
+       die("no messages match specification");
+
+    /*
+     * 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)))
+       die("unable to reread folder %s", folder);

 
 

-    if (mp->numsel <= 0)
-       adios (NULL, "no messages match specification");
+    for (msgnum = 0; msgnum < msgs.size; msgnum++)
+       if (!m_convert (mp2, msgs.msgs[msgnum]))
+           done (1);
+    seq_setprev (mp2); /* set the previous-sequence */

 
 

-    seqs[seqp] = NULL;
+    /*
+     * 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 total matched if not printing each matched message number.
      */
     if (!listsw) {
 
     /*
      * Print total matched if not printing each matched message number.
      */
     if (!listsw) {

-       printf ("%d hit%s\n", mp->numsel, mp->numsel == 1 ? "" : "s");
+       printf ("%d hit%s\n", mp2->numsel, PLURALS(mp2->numsel));

     }
 
     }
 

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

+    folder_free (mp2);

     done (0);
     return 1;
 }
 
 
     done (0);
     return 1;
 }
 
 

-static void
+static void NORETURN

 putzero_done (int status)
 {
     if (listsw && status && !isatty (fileno (stdout)))
 putzero_done (int status)
 {
     if (listsw && status && !isatty (fileno (stdout)))

-       printf ("0\n");
+       puts("0");

     exit (status);
 }
     exit (status);
 }