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

diff --git a/uip/rmf.c b/uip/rmf.c
index 5fe4708..1cacbc4 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -78,7 +78,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,9 +114,12 @@ 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);