Display the command when reporting timing.

[nmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 1dfa6974fbad8e320f37e35adcc870ffdbf45452..724bd26fcf9590c0d613a763af23a261f5faa898 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -1,5 +1,4 @@
-/*
- * rmf.c -- remove a folder
+/* rmf.c -- remove a folder
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -7,7 +6,10 @@
  */
 
 #include <h/mh.h>
+#include "h/done.h"
 #include <h/utils.h>
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 
 #define RMF_SWITCHES \
     X("interactive", 0, INTRSW) \
@@ -36,8 +38,9 @@ main (int argc, char **argv)
     int defolder = 0, interactive = -1;
     char *cp, *folder = NULL, newfolder[BUFSIZ];
     char buf[BUFSIZ], **argp, **arguments;
+    char *fp;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -49,7 +52,7 @@ main (int argc, char **argv)
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 
-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [+folder] [switches]",
@@ -70,11 +73,10 @@ main (int argc, char **argv)
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
-               adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+               die("only one folder at a time!");
+            folder = pluspath (cp);
        } else {
-           adios (NULL, "usage: %s [+folder] [switches]", invo_name);
+           die("usage: %s [+folder] [switches]", invo_name);
        }
     }
 
@@ -84,8 +86,10 @@ main (int argc, char **argv)
        folder = getfolder (1);
        defolder++;
     }
-    if (strcmp (m_mailpath (folder), pwd ()) == 0)
-       adios (NULL, "sorry, you can't remove the current working directory");
+    fp = m_mailpath(folder);
+    if (!strcmp(fp, pwd()))
+       die("sorry, you can't remove the current working directory");
+    free(fp);
 
     if (interactive == -1)
        interactive = defolder;
@@ -124,6 +128,7 @@ static int
 rmf (char *folder)
 {
     int i, others;
+    char *fp;
     char *maildir;
     char cur[BUFSIZ];
     struct dirent *dp;
@@ -136,8 +141,9 @@ rmf (char *folder)
            /* FALLTHRU */
 
        case NOTOK: 
-           snprintf (cur, sizeof(cur), "atr-%s-%s",
-                       current, m_mailpath (folder));
+            fp = m_mailpath(folder);
+           snprintf (cur, sizeof(cur), "atr-%s-%s", current, fp);
+            free(fp);
            if (!context_del (cur)) {
                printf ("[+%s de-referenced]\n", folder);
                return OK;
@@ -148,7 +154,7 @@ rmf (char *folder)
     }
 
     if ((dd = opendir (".")) == NULL)
-       adios (NULL, "unable to read folder +%s", folder);
+       die("unable to read folder +%s", folder);
     others = 0;
 
     /*
@@ -163,7 +169,7 @@ rmf (char *folder)
                if (strcmp (dp->d_name, ".") == 0
                        || strcmp (dp->d_name, "..") == 0)
                    continue;
-               /* FALLTHRU */
+               break;
 
            case ',': 
                break;
@@ -243,4 +249,6 @@ rma (char *folder)
            pp = np;
        }
     }
+
+    free(cp);
 }