Added test-msg-buffer-boundaries.

[nmh] / uip / new.c

diff --git a/uip/new.c b/uip/new.c
index 752f02831b997bfba91a96502ae681d5ceb86c70..e88a0dd7e8712d86d4e71518825aafa0b0dddbfa 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -21,17 +21,19 @@
 #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;
 
@@ -409,6 +411,7 @@ main(int argc, char **argv)
     struct node *folder;
 
     sequences[0] = NULL;
+    sequences[1] = NULL;
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
@@ -437,10 +440,10 @@ main(int argc, char **argv)
                snprintf (help, sizeof(help), "%s [switches] [sequences]",
                          invo_name);
                print_help (help, switches, 1);
-               done (1);
+               done (0);
            case VERSIONSW:
                print_version(invo_name);
-               done (1);
+               done (0);
 
            case FOLDERSSW:
                if (!(folders = *argp++) || *folders == '-')
@@ -456,6 +459,7 @@ main(int argc, char **argv)
        /* have a sequence argument */
        if (!seq_in_list(cp, sequences)) {
            sequences[i++] = cp;
+           sequences[i] = NULL;
        }
     }