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

diff --git a/uip/rmf.c b/uip/rmf.c
index fb951ed..c9a04f5 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.
@@ -61,10 +59,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [+folder] [switches]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case INTRSW: 
 		    interactive = 1;
@@ -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
@@ -170,13 +169,6 @@ rmf (char *folder)
 		    continue;	/* else fall */
 
 	    case ',': 
-#ifdef MHE
-	    case '+': 
-#endif /* MHE */
-#ifdef UCI
-	    case '_': 
-	    case '#': 
-#endif /* UCI */
 		break;
 
 	    default: