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

[nmh] / uip / rmm.c

diff --git a/uip/rmm.c b/uip/rmm.c
index 8882b8f623033bbf72c81aeb7cb85a9613575a12..fa5fe5b93ea685ff2224d2c676a088c715643dfe 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -1,6 +1,4 @@
-
-/*
- * rmm.c -- remove a message(s)
+/* rmm.c -- remove a message(s)
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -9,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "sbr/m_maildir.h"
 
 #define RMM_SWITCHES \
     X("unlink", 0, UNLINKSW) \
@@ -37,11 +36,7 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 
-    setlocale(LC_ALL, "");
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -84,10 +79,9 @@ 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);
+            app_msgarg(&msgs, cp);
     }
 
     if (!context_find ("path"))