X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frmf.c;h=12473f89c79215d18e5014e0b0dce57c3ee8caf6;hb=e87123959d15f3b190494dffdd8bce335c137874;hp=5fe47084b70d139763f2aac5fb933a497b02a73c;hpb=5afa7072e3fe7fc42287e2149e1c23b363700795;p=mmh

diff --git a/uip/rmf.c b/uip/rmf.c
index 5fe4708..12473f8 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -2,8 +2,6 @@
 /*
  * 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.
@@ -78,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);
 	}
@@ -114,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
@@ -158,7 +160,7 @@ rmf (char *folder)
 
     (void)ext_hook("del-hook", maildir, (char *)0);
 
-    j = strlen(BACKUP_PREFIX);
+    j = strlen(backup_prefix);
     while ((dp = readdir (dd))) {
 	switch (dp->d_name[0]) {
 	    case '.': 
@@ -179,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",