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

[nmh] / uip / comp.c

diff --git a/uip/comp.c b/uip/comp.c
index 1e4ffa2affacc699ce2285810237139aad358a56..744ea19beb7c05c711cd719f640cad82a19da840 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/fmt_scan.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 #include <fcntl.h>
 
 #define COMP_SWITCHES \
@@ -191,7 +191,7 @@ main (int argc, char **argv)
                    if (*cp == '@')
                        cp = dp = path(cp + 1, TSUBCWF);
                    fcc = addlist(fcc, cp);
-                    mh_xfree(dp);
+                    free(dp);
                    continue;
 
                case WIDTHSW:
@@ -211,13 +211,11 @@ 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 {
            if (msg)
                adios (NULL, "only one message at a time!");
-           else
-               msg = cp;
+            msg = cp;
        }
     }
 
@@ -396,7 +394,7 @@ edit_it:
 
     if (nwhat)
        done (0);
-    what_now (ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd, 0);
+    what_now (ed, nedit, use, drft, NULL, 0, NULL, NULL, 0, cwd, 0);
     done (1);
     return 1;
 }