X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3c9700d8d045f3ff26ce5dd2a174454dafc14822..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 9b12304b..4558ca30 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -2,22 +2,26 @@
 /*
  * rmf.c -- remove a folder
  *
- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
 
-static struct swit switches[] = {
-#define	INTRSW            0
-    { "interactive", 0 },
-#define	NINTRSW           1
-    { "nointeractive", 0 },
-#define VERSIONSW         2
-    { "version", 0 },
-#define	HELPSW            3
-    { "help", 4 },
-    { 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
@@ -33,13 +37,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;
@@ -57,10 +55,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case INTRSW: 
 		    interactive = 1;
@@ -74,7 +72,7 @@ main (int argc, char **argv)
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
 	    else
-		folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+		folder = pluspath (cp);
 	} else {
 	    adios (NULL, "usage: %s [+folder] [switches]", invo_name);
 	}
@@ -105,27 +103,31 @@ 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);
     }
 
-    if (rmf (folder) == OK && strcmp (context_find (pfolder), newfolder)) {
-	printf ("[+%s now current]\n", newfolder);
-	context_replace (pfolder, newfolder);	/* update current folder */
+    if (rmf (folder) == OK) {
+	char *cfolder = context_find(pfolder);
+	if (cfolder && strcmp (cfolder, newfolder)) {
+	    printf ("[+%s now current]\n", newfolder);
+	    context_replace (pfolder, newfolder);	/* update current folder */
+	}
     }
     context_save ();	/* save the context file */
-    return done (0);
+    done (0);
+    return 1;
 }
 
 static int
 rmf (char *folder)
 {
     int i, j, others;
-    register char *maildir;
+    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: 
@@ -148,6 +150,12 @@ rmf (char *folder)
 	adios (NULL, "unable to read folder +%s", folder);
     others = 0;
 
+    /*
+     *	Run the external delete hook program.
+     */
+
+    (void)ext_hook("del-hook", maildir, NULL);
+
     j = strlen(BACKUP_PREFIX);
     while ((dp = readdir (dd))) {
 	switch (dp->d_name[0]) {
@@ -157,13 +165,6 @@ rmf (char *folder)
 		    continue;	/* else fall */
 
 	    case ',': 
-#ifdef MHE
-	    case '+': 
-#endif /* MHE */
-#ifdef UCI
-	    case '_': 
-	    case '#': 
-#endif /* UCI */
 		break;
 
 	    default: 
@@ -178,7 +179,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++;
 	}
@@ -192,7 +193,9 @@ rmf (char *folder)
      */
     rma (folder);
 
-    chdir ("..");
+    if (chdir ("..") < 0) {
+	advise ("..", "chdir");
+    }
     if (others == 0 && remdir (maildir))
 	return OK;
 
@@ -209,15 +212,11 @@ rmf (char *folder)
 static void
 rma (char *folder)
 {
-    register int alen, j, plen;
-    register char *cp;
-    register struct node *np, *pp;
-
-    /* sanity check - check that context has been read */
-    if (defpath == NULL)
-	adios (NULL, "oops, context hasn't been read yet");
+    int alen, j, plen;
+    char *cp;
+    struct node *np, *pp;
 
-    alen = strlen ("atr-");
+    alen = LEN("atr-");
     plen = strlen (cp = m_mailpath (folder)) + 1;
 
     /*