X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/cff8de7654cf393a494b01a587bd4d503d15a5e3..9322ba2854211794c27fae9468768b80b767c211:/uip/rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index c9a04f55..6a86fe6a 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -8,18 +8,21 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
-static struct swit switches[] = {
-#define	INTRSW            0
-    { "interactive", 0 },
-#define	NINTRSW           1
-    { "nointeractive", 0 },
-#define VERSIONSW         2
-    { "version", 0 },
-#define	HELPSW            3
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define RMF_SWITCHES \
+    X("interactive", 0, INTRSW) \
+    X("nointeractive", 0, NINTRSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(RMF);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(RMF, switches);
+#undef X
 
 /*
  * static prototypes
@@ -35,13 +38,7 @@ main (int argc, char **argv)
     char *cp, *folder = NULL, newfolder[BUFSIZ];
     char buf[BUFSIZ], **argp, **arguments;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    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;
@@ -95,7 +92,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';
@@ -107,7 +104,7 @@ main (int argc, char **argv)
 
     if (interactive) {
 	cp = concat ("Remove folder \"", folder, "\"? ", NULL);
-	if (!getanswer (cp))
+	if (!read_yes_or_no_if_tty (cp))
 	    done (0);
 	free (cp);
     }
@@ -127,16 +124,17 @@ main (int argc, char **argv)
 static int
 rmf (char *folder)
 {
-    int i, j, others;
-    register char *maildir;
+    int i, others;
+    char *maildir;
     char cur[BUFSIZ];
-    register struct dirent *dp;
-    register DIR *dd;
+    struct dirent *dp;
+    DIR *dd;
 
     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",
@@ -158,15 +156,15 @@ rmf (char *folder)
      *	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)
-		    continue;	/* else fall */
+		    continue;
+		/* FALLTHRU */
 
 	    case ',': 
 		break;
@@ -175,7 +173,7 @@ 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",
@@ -183,7 +181,7 @@ rmf (char *folder)
 		others++;
 		continue;
 	}
-	if (unlink (dp->d_name) == NOTOK) {
+	if (m_unlink (dp->d_name) == NOTOK) {
 	    admonish (dp->d_name, "unable to unlink %s:", folder);
 	    others++;
 	}
@@ -197,7 +195,9 @@ rmf (char *folder)
      */
     rma (folder);
 
-    chdir ("..");
+    if (chdir ("..") < 0) {
+	advise ("..", "chdir");
+    }
     if (others == 0 && remdir (maildir))
 	return OK;
 
@@ -214,11 +214,11 @@ rmf (char *folder)
 static void
 rma (char *folder)
 {
-    register int alen, j, plen;
-    register char *cp;
-    register struct node *np, *pp;
+    int alen, j, plen;
+    char *cp;
+    struct node *np, *pp;
 
-    alen = strlen ("atr-");
+    alen = LEN("atr-");
     plen = strlen (cp = m_mailpath (folder)) + 1;
 
     /*