X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f09abae01503136d974a3a969cc2b8a6a6f83abe..2fc70e8bf64ead869fce76abb74f04bf1af94923:/uip/rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 31774745..5450fd69 100644
--- 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
@@ -8,6 +6,9 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
+#include "../sbr/m_maildir.h"
+#include "../sbr/m_mktemp.h"
 
 #define RMF_SWITCHES \
     X("interactive", 0, INTRSW) \
@@ -71,8 +72,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 {
 	    adios (NULL, "usage: %s [+folder] [switches]", invo_name);
 	}
@@ -91,7 +91,7 @@ main (int argc, char **argv)
 	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';
@@ -123,7 +123,7 @@ main (int argc, char **argv)
 static int
 rmf (char *folder)
 {
-    int i, j, others;
+    int i, others;
     char *maildir;
     char cur[BUFSIZ];
     struct dirent *dp;
@@ -132,7 +132,8 @@ rmf (char *folder)
     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: 
 	    snprintf (cur, sizeof(cur), "atr-%s-%s",
@@ -141,7 +142,7 @@ rmf (char *folder)
 		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;
     }
@@ -156,13 +157,13 @@ rmf (char *folder)
 
     (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)
-		    continue;	/* else fall */
+		    continue;
+		break;
 
 	    case ',': 
 		break;
@@ -171,10 +172,10 @@ rmf (char *folder)
 		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;
 
-		admonish (NULL, "file \"%s/%s\" not deleted",
+		inform("file \"%s/%s\" not deleted, continuing...",
 			folder, dp->d_name);
 		others++;
 		continue;
@@ -199,7 +200,7 @@ rmf (char *folder)
     if (others == 0 && remdir (maildir))
 	return OK;
 
-    advise (NULL, "folder +%s not removed", folder);
+    inform("folder +%s not removed", folder);
     return NOTOK;
 }
 
@@ -216,7 +217,7 @@ rma (char *folder)
     char *cp;
     struct node *np, *pp;
 
-    alen = strlen ("atr-");
+    alen = LEN("atr-");
     plen = strlen (cp = m_mailpath (folder)) + 1;
 
     /*
@@ -229,7 +230,8 @@ rma (char *folder)
 		&& *(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;