X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frmf.c;h=12473f89c79215d18e5014e0b0dce57c3ee8caf6;hb=f480c03187724e54e5391ee61b810827da319a6c;hp=233a7bfe02de297e58d6749ca522a2746341d2ef;hpb=017a82124bf2ea39ced5aa4c8f969c18b3c2fb90;p=mmh

diff --git a/uip/rmf.c b/uip/rmf.c
index 233a7bf..12473f8 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -2,7 +2,9 @@
 /*
  * 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>
@@ -74,7 +76,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);
 	}
@@ -110,12 +112,16 @@ main (int argc, char **argv)
 	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
@@ -148,7 +154,13 @@ rmf (char *folder)
 	adios (NULL, "unable to read folder +%s", folder);
     others = 0;
 
-    j = strlen(BACKUP_PREFIX);
+    /*
+     *	Run the external delete hook program.
+     */
+
+    (void)ext_hook("del-hook", maildir, (char *)0);
+
+    j = strlen(backup_prefix);
     while ((dp = readdir (dd))) {
 	switch (dp->d_name[0]) {
 	    case '.': 
@@ -169,8 +181,8 @@ rmf (char *folder)
 	    default: 
 		if (m_atoi (dp->d_name))
 		    break;
-		if (strcmp (dp->d_name, LINK) == 0
-			|| strncmp (dp->d_name, BACKUP_PREFIX, j) == 0)
+		if (strcmp (dp->d_name, altmsglink) == 0
+			|| strncmp (dp->d_name, backup_prefix, j) == 0)
 		    break;
 
 		admonish (NULL, "file \"%s/%s\" not deleted",
@@ -213,10 +225,6 @@ rma (char *folder)
     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");
-
     alen = strlen ("atr-");
     plen = strlen (cp = m_mailpath (folder)) + 1;