Display the command when reporting timing.

[nmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index f6cb4e829fdcfcfd55d2ec3eb898a3d42502ba54..724bd26fcf9590c0d613a763af23a261f5faa898 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -1,6 +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
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -8,6 +6,10 @@
  */
 
 #include <h/mh.h>
  */
 
 #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) \
 
 #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;
     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;
 
     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: 
                    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]",
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [+folder] [switches]",


@@ -70,11 +73,10 @@ main (int argc, char **argv)
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
        }
        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 {
        } else {

-           adios (NULL, "usage: %s [+folder] [switches]", invo_name);
+           die("usage: %s [+folder] [switches]", invo_name);

        }
     }
 
        }
     }
 


@@ -84,14 +86,16 @@ main (int argc, char **argv)
        folder = getfolder (1);
        defolder++;
     }
        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;
 
     if (strchr (folder, '/') && (*folder != '/') && (*folder != '.')) {
 
     if (interactive == -1)
        interactive = defolder;
 
     if (strchr (folder, '/') && (*folder != '/') && (*folder != '.')) {

-       for (cp = copy (folder, newfolder); cp > newfolder && *cp != '/'; cp--)
+       for (cp = stpcpy(newfolder, folder); cp > newfolder && *cp != '/'; cp--)

            continue;
        if (cp > newfolder)
            *cp = '\0';
            continue;
        if (cp > newfolder)
            *cp = '\0';


@@ -123,7 +127,8 @@ main (int argc, char **argv)
 static int
 rmf (char *folder)
 {
 static int
 rmf (char *folder)
 {

-    int i, j, others;
+    int i, others;
+    char *fp;

     char *maildir;
     char cur[BUFSIZ];
     struct dirent *dp;
     char *maildir;
     char cur[BUFSIZ];
     struct dirent *dp;


@@ -132,37 +137,39 @@ rmf (char *folder)
     switch (i = chdir (maildir = m_maildir (folder))) {
        case OK: 
            if (access (".", W_OK) != NOTOK && access ("..", W_OK) != NOTOK)
     switch (i = chdir (maildir = m_maildir (folder))) {
        case OK: 
            if (access (".", W_OK) != NOTOK && access ("..", W_OK) != NOTOK)

-               break;          /* fall otherwise */
+               break;
+           /* FALLTHRU */

 
        case NOTOK: 
 
        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;
            }
            if (!context_del (cur)) {
                printf ("[+%s de-referenced]\n", folder);
                return OK;
            }

-           advise (NULL, "you have no profile entry for the %s folder +%s",
+           inform("you have no profile entry for the %s folder +%s",

                    i == NOTOK ? "unreadable" : "read-only", folder);
            return NOTOK;
     }
 
     if ((dd = opendir (".")) == NULL)
                    i == NOTOK ? "unreadable" : "read-only", folder);
            return NOTOK;
     }
 
     if ((dd = opendir (".")) == NULL)

-       adios (NULL, "unable to read folder +%s", folder);
+       die("unable to read folder +%s", folder);

     others = 0;
 
     /*
      * Run the external delete hook program.
      */
 
     others = 0;
 
     /*
      * Run the external delete hook program.
      */
 

-    (void)ext_hook("del-hook", maildir, (char *)0);
+    (void)ext_hook("del-hook", maildir, NULL);

 
 

-    j = strlen(BACKUP_PREFIX);

     while ((dp = readdir (dd))) {
        switch (dp->d_name[0]) {
            case '.': 
                if (strcmp (dp->d_name, ".") == 0
                        || strcmp (dp->d_name, "..") == 0)
     while ((dp = readdir (dd))) {
        switch (dp->d_name[0]) {
            case '.': 
                if (strcmp (dp->d_name, ".") == 0
                        || strcmp (dp->d_name, "..") == 0)

-                   continue;   /* else fall */
+                   continue;
+               break;

 
            case ',': 
                break;
 
            case ',': 
                break;


@@ -171,10 +178,10 @@ rmf (char *folder)
                if (m_atoi (dp->d_name))
                    break;
                if (strcmp (dp->d_name, LINK) == 0
                if (m_atoi (dp->d_name))
                    break;
                if (strcmp (dp->d_name, LINK) == 0

-                       || strncmp (dp->d_name, BACKUP_PREFIX, j) == 0)
+                       || has_prefix(dp->d_name, BACKUP_PREFIX))

                    break;
 
                    break;
 

-               admonish (NULL, "file \"%s/%s\" not deleted",
+               inform("file \"%s/%s\" not deleted, continuing...",

                        folder, dp->d_name);
                others++;
                continue;
                        folder, dp->d_name);
                others++;
                continue;


@@ -199,7 +206,7 @@ rmf (char *folder)
     if (others == 0 && remdir (maildir))
        return OK;
 
     if (others == 0 && remdir (maildir))
        return OK;
 

-    advise (NULL, "folder +%s not removed", folder);
+    inform("folder +%s not removed", folder);

     return NOTOK;
 }
 
     return NOTOK;
 }
 


@@ -216,7 +223,7 @@ rma (char *folder)
     char *cp;
     struct node *np, *pp;
 
     char *cp;
     struct node *np, *pp;
 

-    alen = strlen ("atr-");
+    alen = LEN("atr-");

     plen = strlen (cp = m_mailpath (folder)) + 1;
 
     /*
     plen = strlen (cp = m_mailpath (folder)) + 1;
 
     /*


@@ -229,7 +236,8 @@ rma (char *folder)
                && *(np->n_name + j) == '-'
                && strcmp (cp, np->n_name + j + 1) == 0) {
            if (!np->n_context)
                && *(np->n_name + j) == '-'
                && strcmp (cp, np->n_name + j + 1) == 0) {
            if (!np->n_context)

-               admonish (NULL, "bug: context_del(key=\"%s\")", np->n_name);
+               inform("bug: context_del(key=\"%s\"), continuing...",
+                   np->n_name);

            if (pp) {
                pp->n_next = np->n_next;
                np = pp;
            if (pp) {
                pp->n_next = np->n_next;
                np = pp;


@@ -241,4 +249,6 @@ rma (char *folder)
            pp = np;
        }
     }
            pp = np;
        }
     }

+
+    free(cp);

 }
 }