Exposed a bunch of switches that are now documented.

[nmh] / uip / anno.c

diff --git a/uip/anno.c b/uip/anno.c
index d90e0f60c61a8c9148b95dae1b3b3b7b70453998..7a91f25195f48882a3112ac8439ff7fab7772b55 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -2,8 +2,6 @@
 /*
  * anno.c -- annotate messages
  *
 /*
  * anno.c -- annotate messages
  *

- * $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.


@@ -36,7 +34,7 @@
  *     option is specified, only the last path name component of each field
  *     body is output.  The entire field body is output if the -text option
  *     is used; the contents of the -text argument are ignored.  If the -list
  *     option is specified, only the last path name component of each field
  *     body is output.  The entire field body is output if the -text option
  *     is used; the contents of the -text argument are ignored.  If the -list

- *     option is used in conjuction with the new -number option described
+ *     option is used in conjunction with the new -number option described

  *     below, each line is numbered starting with 1.  A tab separates the
  *     number from the field body.
  *
  *     below, each line is numbered starting with 1.  A tab separates the
  *     number from the field body.
  *


@@ -48,46 +46,30 @@
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>
 

-/*
- * We allocate space for messages (msgs array)
- * this number of elements at a time.
- */
-#define MAXMSGS  256
-
-
-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 prototypes


@@ -99,10 +81,11 @@ int
 main (int argc, char **argv)
 {
     int inplace = 1, datesw = 1;
 main (int argc, char **argv)
 {
     int inplace = 1, datesw = 1;

-    int nummsgs, maxmsgs, msgnum;
-    char *cp, *maildir, *comp = NULL;
-    char *text = NULL, *folder = NULL, buf[BUFSIZ];
-    char **argp, **arguments, **msgs;
+    int msgnum;
+    char *cp, *maildir;
+    char *comp = NULL, *text = NULL, *folder = NULL, buf[BUFSIZ];
+    char **argp, **arguments;
+    struct msgs_array msgs = { 0, 0, NULL };

     struct msgs *mp;
     int                append = 0;             /* append annotations instead of default prepend */
     int                delete = -2;            /* delete header element if set */
     struct msgs *mp;
     int                append = 0;             /* append annotations instead of default prepend */
     int                delete = -2;            /* delete header element if set */


@@ -111,25 +94,11 @@ main (int argc, char **argv)
     int                list = 0;               /* list header elements if set */
     int                number = 0;             /* delete specific number of like elements if set */
 
     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;
 
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 

-    /*
-     * Allocate the initial space to record message
-     * names and ranges.
-     */
-    nummsgs = 0;
-    maxmsgs = MAXMSGS;
-    msgs = (char **) mh_xmalloc ((size_t) (maxmsgs * sizeof(*msgs)));
-

     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {


@@ -143,10 +112,10 @@ main (int argc, char **argv)
                    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                    print_help (buf, switches, 1);
                    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);
                case VERSIONSW:
                    print_version(invo_name);

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

 
                case COMPSW:
                    if (comp)
 
                case COMPSW:
                    if (comp)


@@ -225,20 +194,9 @@ main (int argc, char **argv)
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
            if (folder)
                adios (NULL, "only one folder at a time!");
            else

-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
-       } else {
-           /*
-            * Check if we need to allocate more space
-            * for message name/ranges.
-            */
-           if (nummsgs >= maxmsgs) {
-               maxmsgs += MAXMSGS;
-               if (!(msgs = (char **) realloc (msgs,
-                       (size_t) (maxmsgs * sizeof(*msgs)))))
-                   adios (NULL, "unable to reallocate msgs storage");
-           }
-           msgs[nummsgs++] = cp;
-       }
+               folder = pluspath (cp);
+       } else
+               app_msgarg(&msgs, cp);

     }
 
     /*
     }
 
     /*


@@ -248,7 +206,7 @@ main (int argc, char **argv)
      */
 
     if (draft != (char *)0) {
      */
 
     if (draft != (char *)0) {

-       if (nummsgs != 0)
+       if (msgs.size != 0)

            adios(NULL, "can only have message numbers or -draft.");
 
        draft = getcpy(m_draft(folder, (char *)0, 1, &isdf));
            adios(NULL, "can only have message numbers or -draft.");
 
        draft = getcpy(m_draft(folder, (char *)0, 1, &isdf));


@@ -260,18 +218,14 @@ main (int argc, char **argv)
        else
            annotate (draft, comp, text, inplace, datesw, delete, append);
 
        else
            annotate (draft, comp, text, inplace, datesw, delete, append);
 

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

     }
 
     }
 

-#ifdef UCI
-    if (strcmp(invo_name, "fanno") == 0)       /* ugh! */
-       datesw = 0;
-#endif /* UCI */
-

     if (!context_find ("path"))
        free (path ("./", TFOLDER));
     if (!context_find ("path"))
        free (path ("./", TFOLDER));

-    if (!nummsgs)
-       msgs[nummsgs++] = "cur";
+    if (!msgs.size)
+       app_msgarg(&msgs, "cur");

     if (!folder)
        folder = getfolder (1);
     maildir = m_maildir (folder);
     if (!folder)
        folder = getfolder (1);
     maildir = m_maildir (folder);


@@ -280,7 +234,7 @@ main (int argc, char **argv)
        adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */
        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 */
        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */


@@ -288,8 +242,8 @@ main (int argc, char **argv)
        adios (NULL, "no messages in %s", folder);
 
     /* parse all the message ranges/sequences and set SELECTED */
        adios (NULL, "no messages in %s", folder);
 
     /* parse all the message ranges/sequences and set SELECTED */

-    for (msgnum = 0; msgnum < nummsgs; msgnum++)
-       if (!m_convert (mp, msgs[msgnum]))
+    for (msgnum = 0; msgnum < msgs.size; msgnum++)
+       if (!m_convert (mp, msgs.msgs[msgnum]))

            done (1);
 
     make_comp (&comp);
            done (1);
 
     make_comp (&comp);


@@ -309,14 +263,14 @@ main (int argc, char **argv)
     seq_save (mp);     /* synchronize message sequences */
     folder_free (mp);  /* free folder/message structure */
     context_save ();   /* save the context file         */
     seq_save (mp);     /* synchronize message sequences */
     folder_free (mp);  /* free folder/message structure */
     context_save ();   /* save the context file         */

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

 }
 
 static void
 make_comp (char **ap)
 {
 }
 
 static void
 make_comp (char **ap)
 {

-    register char *cp;
-    char buffer[BUFSIZ];
+    char *cp, buffer[BUFSIZ];

 
     if (*ap == NULL) {
        printf ("Enter component name: ");
 
     if (*ap == NULL) {
        printf ("Enter component name: ");


@@ -337,6 +291,6 @@ make_comp (char **ap)
        adios (NULL, "too large component name %s", *ap);
 
     for (cp = *ap; *cp; cp++)
        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);
 }
            adios (NULL, "invalid component name %s", *ap);
 }