pick: add -nosequence command line switch

[mmh] / uip / pick.c

diff --git a/uip/pick.c b/uip/pick.c
index dff628a..6f450af 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -2,9 +2,7 @@
 /*
  * 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.
  */
@@ -47,32 +45,36 @@ static struct swit switches[] = {
     { "datefield field", 5 },
 #define        SEQSW                  15
     { "sequence name", 0 },
-#define        PUBLSW                 16
+#define        NSEQSW                 16
+    { "nosequence", 0 },
+#define        PUBLSW                 17
     { "public", 0 },
-#define        NPUBLSW                17
+#define        NPUBLSW                18
     { "nopublic", 0 },
-#define        ZEROSW                 18
+#define        ZEROSW                 19
     { "zero", 0 },
-#define        NZEROSW                19
+#define        NZEROSW                20
     { "nozero", 0 },
-#define        LISTSW                 20
+#define        LISTSW                 21
     { "list", 0 },
-#define        NLISTSW                21
+#define        NLISTSW                22
     { "nolist", 0 },
-#define VERSIONSW              22
+#define VERSIONSW              23
     { "version", 0 },
-#define        HELPSW                 23
+#define        HELPSW                 24
     { "help", 0 },
     { NULL, 0 }
 };
 
 static int listsw = -1;
 
+static void putzero_done (int) NORETURN;
 
 int
 main (int argc, char **argv)
 {
-    int publicsw = -1, zerosw = 1, seqp = 0, vecp = 0;
+    int publicsw = -1, zerosw = 1, vecp = 0;
+    size_t seqp = 0;
     int lo, hi, msgnum;
     char *maildir, *folder = NULL, buf[100];
     char *cp, **argp, **arguments;
@@ -81,6 +83,8 @@ main (int argc, char **argv)
     struct msgs *mp;
     register FILE *fp;
 
+    done=putzero_done;
+
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
@@ -111,11 +115,11 @@ main (int argc, char **argv)
                          invo_name);
                print_help (buf, switches, 1);
                listsw = 0;     /* HACK */
-               done (1);
+               done (0);
            case VERSIONSW:
                print_version(invo_name);
                listsw = 0;     /* HACK */
-               done (1);
+               done (0);
 
            case CCSW: 
            case DATESW: 
@@ -150,8 +154,15 @@ main (int argc, char **argv)
                /* check if too many sequences specified */
                if (seqp >= NUMATTRS)
                    adios (NULL, "too many sequences (more than %d) specified", NUMATTRS);
+
+                if (!seq_nameok (cp))
+                  done (1);
+
                seqs[seqp++] = cp;
                continue;
+           case NSEQSW:
+               seqp = 0;
+               continue;
            case PUBLSW: 
                publicsw = 1;
                continue;
@@ -230,6 +241,11 @@ main (int argc, char **argv)
     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
      * match.  If the message does not match, then unselect it.
@@ -243,6 +259,9 @@ main (int argc, char **argv)
                    lo = msgnum;
                if (msgnum > hi)
                    hi = msgnum;
+
+               if (listsw)
+                   printf ("%s\n", m_name (msgnum));
            } else {
                /* if it doesn't match, then unselect it */
                unset_selected (mp, msgnum);
@@ -269,13 +288,9 @@ main (int argc, char **argv)
            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 {
+    if (!listsw) {
        printf ("%d hit%s\n", mp->numsel, mp->numsel == 1 ? "" : "s");
     }
 
@@ -283,15 +298,15 @@ main (int argc, char **argv)
     seq_save (mp);                     /* synchronize message sequences */
     context_save ();                   /* save the context file         */
     folder_free (mp);                  /* free folder/message structure */
-    return done (0);
+    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);
-    return 1;  /* dead code to satisfy the compiler */
 }