Added scan and inc from mbox with multiple messages.

[nmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index c3dcc919491436441d9a1f6a90cb0c3063124b5a..9e922475c6df63ed8cec4fdb3a1ebb3f661bdc78 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -2,8 +2,6 @@
 /*
  * rmf.c -- remove a folder
  *
 /*
  * 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.
  * 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.


@@ -11,17 +9,19 @@
 
 #include <h/mh.h>
 
 
 #include <h/mh.h>
 

-static struct swit switches[] = {
-#define        INTRSW            0
-    { "interactive", 0 },
-#define        NINTRSW           1
-    { "nointeractive", 0 },
-#define VERSIONSW         2
-    { "version", 0 },
-#define        HELPSW            3
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define RMF_SWITCHES \
+    X("interactive", 0, INTRSW) \
+    X("nointeractive", 0, NINTRSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(RMF);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(RMF, switches);
+#undef X

 
 /*
  * static prototypes
 
 /*
  * static prototypes


@@ -61,10 +61,10 @@ main (int argc, char **argv)
                    snprintf (buf, sizeof(buf), "%s [+folder] [switches]",
                        invo_name);
                    print_help (buf, switches, 1);
                    snprintf (buf, sizeof(buf), "%s [+folder] [switches]",
                        invo_name);
                    print_help (buf, switches, 1);

-                   done (1);
+                   done (0);

                case VERSIONSW:
                    print_version(invo_name);
                case VERSIONSW:
                    print_version(invo_name);

-                   done (1);
+                   done (0);

 
                case INTRSW: 
                    interactive = 1;
 
                case INTRSW: 
                    interactive = 1;


@@ -171,13 +171,6 @@ rmf (char *folder)
                    continue;   /* else fall */
 
            case ',': 
                    continue;   /* else fall */
 
            case ',': 

-#ifdef MHE
-           case '+': 
-#endif /* MHE */
-#ifdef UCI
-           case '_': 
-           case '#': 
-#endif /* UCI */

                break;
 
            default: 
                break;
 
            default: