X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..4d0110006d4e72f82fb597f170c7d9991f2ca0bf:/uip/pick.c

diff --git a/uip/pick.c b/uip/pick.c
index c5025888..1084a478 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -9,6 +9,7 @@
 #include <h/tws.h>
 #include <h/picksbr.h>
 #include <h/utils.h>
+#include "sbr/m_maildir.h"
 
 #define PICK_SWITCHES \
     X("reverse", 0, REVSW) \
@@ -73,10 +74,6 @@ main (int argc, char **argv)
 
     done=putzero_done;
 
-    /* Deprecated.  Use -debug instead. */
-    if ((cp = getenv ("MHPDEBUG")) && *cp)
-	++debug;
-
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
@@ -176,8 +173,7 @@ main (int argc, char **argv)
 	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);
     }
@@ -304,7 +300,7 @@ main (int argc, char **argv)
      * 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);
@@ -318,7 +314,7 @@ main (int argc, char **argv)
 }
 
 
-static void
+static void NORETURN
 putzero_done (int status)
 {
     if (listsw && status && !isatty (fileno (stdout)))