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 801716fe3cb35934724360608ee6dfad36268d4a..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) \


@@ -75,10 +74,6 @@ main (int argc, char **argv)
 
     done=putzero_done;
 
 
     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;
 


@@ -178,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);
     }


@@ -306,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);


@@ -320,7 +314,7 @@ 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)))