lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / pick.c

diff --git a/uip/pick.c b/uip/pick.c
index fba190a250abb35b124ae582ce37f2f21ec61556..1084a478ba755f67415c49ac5be01d47aacebb1c 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -1,6 +1,4 @@
-
-/*
- * 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
  *
  * 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


@@ -11,6 +9,7 @@
 #include <h/tws.h>
 #include <h/picksbr.h>
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/picksbr.h>
 #include <h/utils.h>

+#include "sbr/m_maildir.h"

 
 #define PICK_SWITCHES \
     X("reverse", 0, REVSW) \
 
 #define PICK_SWITCHES \
     X("reverse", 0, REVSW) \


@@ -66,18 +65,15 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgnum_array nums = { 0, 0, NULL };
     struct msgs *mp, *mp2;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgnum_array nums = { 0, 0, NULL };
     struct msgs *mp, *mp2;

-    register FILE *fp;
+    FILE *fp;

     int debug = 0;
     int reverse = 0;
     int debug = 0;
     int reverse = 0;

+    int start, end, inc;

 
     if (nmh_init(argv[0], 1)) { return 1; }
 
     done=putzero_done;
 
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
     done=putzero_done;
 

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


@@ -177,8 +173,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");

-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);

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


@@ -237,15 +232,22 @@ main (int argc, char **argv)
      * match.  If there is NOT a match, then add it to a list to
      * remove from the final sequence (it will make sense later)
      */
      * 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 = reverse ? mp->hghsel : mp->lowsel;
-         reverse ? msgnum >= mp->lowsel : msgnum <= mp->hghsel;
-         msgnum += reverse ? -1 : 1) {
+    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 (fp && pmatches (fp, msgnum, 0L, 0L, debug)) {
                if (listsw)
        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, debug)) {
                if (listsw)

-                   printf ("%s\n", m_name (msgnum));
+                   puts(m_name (msgnum));

            } else {
                app_msgnum(&nums, msgnum);
            }
            } else {
                app_msgnum(&nums, msgnum);
            }


@@ -298,7 +300,7 @@ main (int argc, char **argv)
      * 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", mp2->numsel, mp2->numsel == 1 ? "" : "s");
+       printf ("%d hit%s\n", mp2->numsel, PLURALS(mp2->numsel));

     }
 
     svector_free (seqs);
     }
 
     svector_free (seqs);


@@ -312,10 +314,10 @@ main (int argc, char **argv)
 }
 
 
 }
 
 

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