* uip/mhlistsbr.c, uip/mhlsbr.c, uip/picksbr.c: cast

[mmh] / uip / pick.c

diff --git a/uip/pick.c b/uip/pick.c
index dff628a..e0d6136 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -4,7 +4,7 @@
  *
  * $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.
  */
@@ -68,6 +68,7 @@ static struct swit switches[] = {
 
 static int listsw = -1;
 
+static void putzero_done (int) NORETURN;
 
 int
 main (int argc, char **argv)
@@ -81,6 +82,8 @@ main (int argc, char **argv)
     struct msgs *mp;
     register FILE *fp;
 
+    done=putzero_done;
+
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
@@ -150,6 +153,10 @@ 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 PUBLSW: 
@@ -230,6 +237,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 +255,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 +284,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 +294,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 */
 }