Changed msg_style and msg_delim to be file static to m_getfld.c

[mmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 5fe4708..c9a04f5 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.
@@ -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);
        }
@@ -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: