mhstore(1) now obeys its -noverbose switch.

[nmh] / uip / anno.c

diff --git a/uip/anno.c b/uip/anno.c
index 41716f7cfef3bac0f01f23b1f053da8baad35fdb..26706edac514e8c51f364104cb2915c30c031e1b 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -46,44 +46,35 @@
 #include <h/mh.h>
 #include <h/utils.h>
 
-static struct swit switches[] = {
-#define        COMPSW  0
-    { "component field", 0 },
-#define        INPLSW  1
-    { "inplace", 0 },
-#define        NINPLSW 2
-    { "noinplace", 0 },
-#define        DATESW  3
-    { "date", 0 },
-#define        NDATESW 4
-    { "nodate", 0 },
-#define        TEXTSW  5
-    { "text body", 0 },
-#define VERSIONSW 6
-    { "version", 0 },
-#define        HELPSW  7
-    { "help", 0 },
-#define        DRFTSW                   8
-    { "draft", 2 },
-#define        LISTSW                   9
-    { "list", 1 },
-#define        DELETESW                10
-    { "delete", 2 },
-#define        NUMBERSW                11
-    { "number", 2 },
-#define        APPENDSW                12
-    { "append", 1 },
-#define        PRESERVESW              13
-    { "preserve", 1 },
-#define        NOPRESERVESW            14
-    { "nopreserve", 3 },
-    { NULL, 0 }
-};
+#define ANNO_SWITCHES \
+    X("component field", 0, COMPSW) \
+    X("inplace", 0, INPLSW) \
+    X("noinplace", 0, NINPLSW) \
+    X("date", 0, DATESW) \
+    X("nodate", 0, NDATESW) \
+    X("text body", 0, TEXTSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("draft", 2, DRFTSW) \
+    X("list", 1, LISTSW) \
+    X("delete", 2, DELETESW) \
+    X("number", 2, NUMBERSW) \
+    X("append", 1, APPENDSW) \
+    X("preserve", 1, PRESERVESW) \
+    X("nopreserve", 3, NOPRESERVESW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(ANNO);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(ANNO, switches);
+#undef X
 
 /*
  * static prototypes
  */
-static void make_comp (unsigned char **);
+static void make_comp (char **);
 
 
 int
@@ -92,8 +83,7 @@ main (int argc, char **argv)
     int inplace = 1, datesw = 1;
     int msgnum;
     char *cp, *maildir;
-    unsigned char *comp = NULL;
-    char *text = NULL, *folder = NULL, buf[BUFSIZ];
+    char *comp = NULL, *text = NULL, *folder = NULL, buf[BUFSIZ];
     char **argp, **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
@@ -104,13 +94,7 @@ main (int argc, char **argv)
     int                list = 0;               /* list header elements if set */
     int                number = 0;             /* delete specific number of like elements if set */
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -128,10 +112,10 @@ main (int argc, char **argv)
                    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                    print_help (buf, switches, 1);
-                   done (1);
+                   done (0);
                case VERSIONSW:
                    print_version(invo_name);
-                   done (1);
+                   done (0);
 
                case COMPSW:
                    if (comp)
@@ -238,11 +222,6 @@ main (int argc, char **argv)
        return 1;
     }
 
-#ifdef UCI
-    if (strcmp(invo_name, "fanno") == 0)       /* ugh! */
-       datesw = 0;
-#endif /* UCI */
-
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
     if (!msgs.size)
@@ -255,7 +234,7 @@ main (int argc, char **argv)
        adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */
-    if (!(mp = folder_read (folder)))
+    if (!(mp = folder_read (folder, 1)))
        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */
@@ -289,10 +268,9 @@ main (int argc, char **argv)
 }
 
 static void
-make_comp (unsigned char **ap)
+make_comp (char **ap)
 {
-    register unsigned char *cp;
-    char buffer[BUFSIZ];
+    char *cp, buffer[BUFSIZ];
 
     if (*ap == NULL) {
        printf ("Enter component name: ");
@@ -313,6 +291,6 @@ make_comp (unsigned char **ap)
        adios (NULL, "too large component name %s", *ap);
 
     for (cp = *ap; *cp; cp++)
-       if (!isalnum (*cp) && *cp != '-')
+       if (!isalnum ((unsigned char) *cp) && *cp != '-')
            adios (NULL, "invalid component name %s", *ap);
 }