X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frmf.c;h=a49ba4cf8d24801562821dc89fad1e98a9e4485d;hp=2909196abe5d41e9a46ec3e2ad35e9ce73c057bf;hb=5dd6771b28c257af405d7248639ed0e3bcdce38b;hpb=a259594cc41e41bfbb90562d3977b8194d1446f5

diff --git a/uip/rmf.c b/uip/rmf.c
index 2909196..a49ba4c 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
@@ -223,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;