Added scan and inc from mbox with multiple messages.

[nmh] / uip / new.c

diff --git a/uip/new.c b/uip/new.c
index 38c8f0b0329799f8642597104217b145e618ae24..e88a0dd7e8712d86d4e71518825aafa0b0dddbfa 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -21,17 +21,19 @@
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 

-static struct swit switches[] = {
-#define MODESW 0
-    { "mode", 1 },
-#define FOLDERSSW 1
-    { "folders", 1 },
-#define VERSIONSW 2
-    { "version", 1 },
-#define HELPSW 3
-    { "help", 1 },
-    { NULL, 0 }
-};
+#define NEW_SWITCHES \
+    X("mode", 1, MODESW) \
+    X("folders", 1, FOLDERSSW) \
+    X("version", 1, VERSIONSW) \
+    X("help", 1, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(NEW);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(NEW, switches);
+#undef X

 
 static enum { NEW, FNEXT, FPREV, UNSEEN } run_mode = NEW;
 
 
 static enum { NEW, FNEXT, FPREV, UNSEEN } run_mode = NEW;
 


@@ -438,10 +440,10 @@ main(int argc, char **argv)
                snprintf (help, sizeof(help), "%s [switches] [sequences]",
                          invo_name);
                print_help (help, switches, 1);
                snprintf (help, sizeof(help), "%s [switches] [sequences]",
                          invo_name);
                print_help (help, switches, 1);

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

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

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

 
            case FOLDERSSW:
                if (!(folders = *argp++) || *folders == '-')
 
            case FOLDERSSW:
                if (!(folders = *argp++) || *folders == '-')