X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frmf.c;h=12473f89c79215d18e5014e0b0dce57c3ee8caf6;hb=ecc90fb56b43863f4c33ed62da4abe898b17d7fb;hp=fb951ed08e1536bb7f51ee1f89381a7146ad249b;hpb=71932c5d0b008eb518d53f9a53978afd35a70ef5;p=mmh

diff --git a/uip/rmf.c b/uip/rmf.c
index fb951ed..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);
 	}
@@ -122,7 +120,8 @@ main (int argc, char **argv)
 	}
     }
     context_save ();	/* save the context file */
-    return done (0);
+    done (0);
+    return 1;
 }
 
 static int
@@ -161,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 '.': 
@@ -182,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",