Support -fmtproc -nofmtproc in show.

[mmh] / uip / rmf.c

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