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 1fa6536424ede36220c4568faaabc02bedcdee54..1084a478ba755f67415c49ac5be01d47aacebb1c 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -9,7 +9,7 @@
 #include <h/tws.h>
 #include <h/picksbr.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define PICK_SWITCHES \
     X("reverse", 0, REVSW) \
@@ -74,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;
 
@@ -177,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);
     }