X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5afa7072e3fe7fc42287e2149e1c23b363700795..c8206d4f567151065bc8d896bbd6273bf12dbae3:/uip/rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 5fe47084..5631f785 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
@@ -167,13 +169,6 @@ rmf (char *folder)
 		    continue;	/* else fall */
 
 	    case ',': 
-#ifdef MHE
-	    case '+': 
-#endif /* MHE */
-#ifdef UCI
-	    case '_': 
-	    case '#': 
-#endif /* UCI */
 		break;
 
 	    default: