NEWS: Encourage nmh-announce subscription. Capitalise `Gmail'.

[nmh] / uip / anno.c

diff --git a/uip/anno.c b/uip/anno.c
index d90e0f60c61a8c9148b95dae1b3b3b7b70453998..5e3b0a235e6d89a4483bf4bc2849abbae1728dea 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -1,8 +1,4 @@
-
-/*
- * anno.c -- annotate messages
- *
- * $Id$
+/* anno.c -- annotate messages

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -36,7 +32,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.
  *


@@ -45,49 +41,55 @@
  *     value of 1 is assumed if this argument is absent.
  */
 
  *     value of 1 is assumed if this argument is absent.
  */
 

-#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 }
-};
+#include "h/mh.h"
+#include "annosbr.h"
+#include "sbr/m_name.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/trimcpy.h"
+#include "sbr/m_draft.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/folder_free.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/utils.h"
+#include "h/done.h"
+#include "sbr/m_maildir.h"
+
+#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


@@ -98,38 +100,27 @@ static void make_comp (char **);
 int
 main (int argc, char **argv)
 {
 int
 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;
+    bool inplace, datesw;
+    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;
     struct msgs *mp;

-    int                append = 0;             /* append annotations instead of default prepend */
+    bool       append;                 /* append annotations instead of default prepend */

     int                delete = -2;            /* delete header element if set */
     int                delete = -2;            /* delete header element if set */

-    char       *draft = (char *)0;     /* draft file name */
+    char       *draft = NULL;  /* draft file name */

     int                isdf = 0;               /* return needed for m_draft() */
     int                isdf = 0;               /* return needed for m_draft() */

-    int                list = 0;               /* list header elements if set */
+    bool       list;                   /* list header elements if set */

     int                number = 0;             /* delete specific number of like 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], true, true)) { 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)));
-
+    append = list = false;
+    inplace = datesw = true;

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


@@ -137,43 +128,43 @@ main (int argc, char **argv)
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW:
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW:

-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);

 
                case HELPSW:
                    snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                    print_help (buf, switches, 1);
 
                case HELPSW:
                    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)

-                       adios (NULL, "only one component at a time!");
+                       die("only one component at a time!");

                    if (!(comp = *argp++) || *comp == '-')
                    if (!(comp = *argp++) || *comp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    continue;
 
                case DATESW:
                    continue;
 
                case DATESW:

-                   datesw++;
+                   datesw = true;

                    continue;
                case NDATESW:
                    continue;
                case NDATESW:

-                   datesw = 0;
+                   datesw = false;

                    continue;
 
                case INPLSW:
                    continue;
 
                case INPLSW:

-                   inplace++;
+                   inplace = true;

                    continue;
                case NINPLSW:
                    continue;
                case NINPLSW:

-                   inplace = 0;
+                   inplace = false;

                    continue;
 
                case TEXTSW:
                    if (text)
                    continue;
 
                case TEXTSW:
                    if (text)

-                       adios (NULL, "only one body at a time!");
+                       die("only one body at a time!");

                    if (!(text = *argp++) || *text == '-')
                    if (!(text = *argp++) || *text == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    continue;
 
                case DELETESW:          /* delete annotations */
                    continue;
 
                case DELETESW:          /* delete annotations */


@@ -185,12 +176,12 @@ main (int argc, char **argv)
                    continue;
 
                case LISTSW:            /* produce a listing */
                    continue;
 
                case LISTSW:            /* produce a listing */

-                   list = 1;
+                   list = true;

                    continue;
 
                case NUMBERSW:          /* number listing or delete by number */
                    if (number != 0)
                    continue;
 
                case NUMBERSW:          /* number listing or delete by number */
                    if (number != 0)

-                       adios (NULL, "only one number at a time!");
+                       die("only one number at a time!");

 
                    if (argp - arguments == argc - 1 || **argp == '-')
                        number = 1;
 
                    if (argp - arguments == argc - 1 || **argp == '-')
                        number = 1;


@@ -200,7 +191,7 @@ main (int argc, char **argv)
                            number = -1;
 
                        else if (!(number = atoi(*argp)))
                            number = -1;
 
                        else if (!(number = atoi(*argp)))

-                           adios (NULL, "missing argument to %s", argp[-2]);
+                           die("missing argument to %s", argp[-1]);

 
                        argp++;
                    }
 
                        argp++;
                    }


@@ -209,7 +200,7 @@ main (int argc, char **argv)
                    continue;
 
                case APPENDSW:          /* append annotations instead of default prepend */
                    continue;
 
                case APPENDSW:          /* append annotations instead of default prepend */

-                   append = 1;
+                   append = true;

                    continue;
 
                case PRESERVESW:        /* preserve access and modification times on annotated message */
                    continue;
 
                case PRESERVESW:        /* preserve access and modification times on annotated message */


@@ -223,22 +214,10 @@ main (int argc, char **argv)
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
        }
        if (*cp == '+' || *cp == '@') {
            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;
-       }
+               die("only one folder at a time!");
+            folder = pluspath (cp);
+       } else
+               app_msgarg(&msgs, cp);

     }
 
     /*
     }
 
     /*


@@ -247,11 +226,11 @@ main (int argc, char **argv)
      * message numbers below.
      */
 
      * message numbers below.
      */
 

-    if (draft != (char *)0) {
-       if (nummsgs != 0)
-           adios(NULL, "can only have message numbers or -draft.");
+    if (draft != NULL) {
+       if (msgs.size != 0)
+           die("can only have message numbers or -draft.");

 
 

-       draft = getcpy(m_draft(folder, (char *)0, 1, &isdf));
+       draft = mh_xstrdup(m_draft(folder, NULL, 1, &isdf));

 
        make_comp(&comp);
 
 
        make_comp(&comp);
 


@@ -260,18 +239,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,16 +255,16 @@ 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)))
-       adios (NULL, "unable to read folder %s", folder);
+    if (!(mp = folder_read (folder, 1)))
+       die("unable to read folder %s", folder);

 
     /* check for empty folder */
     if (mp->nummsg == 0)
 
     /* check for empty folder */
     if (mp->nummsg == 0)

-       adios (NULL, "no messages in %s", folder);
+       die("no messages in %s", folder);

 
     /* parse all the message ranges/sequences and set SELECTED */
 
     /* 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,17 +284,17 @@ 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) {
 
     if (*ap == NULL) {

-       printf ("Enter component name: ");
+       fputs("Enter component name: ", stdout);

        fflush (stdout);
 
        if (fgets (buffer, sizeof buffer, stdin) == NULL)
        fflush (stdout);
 
        if (fgets (buffer, sizeof buffer, stdin) == NULL)


@@ -329,14 +304,14 @@ make_comp (char **ap)
 
     if ((cp = *ap + strlen (*ap) - 1) > *ap && *cp == ':')
        *cp = 0;
 
     if ((cp = *ap + strlen (*ap) - 1) > *ap && *cp == ':')
        *cp = 0;

-    if (strlen (*ap) == 0)
-       adios (NULL, "null component name");
+    if (!**ap)
+       die("null component name");

     if (**ap == '-')
     if (**ap == '-')

-       adios (NULL, "invalid component name %s", *ap);
+       die("invalid component name %s", *ap);

     if (strlen (*ap) >= NAMESZ)
     if (strlen (*ap) >= NAMESZ)

-       adios (NULL, "too large component name %s", *ap);
+       die("too large component name %s", *ap);

 
     for (cp = *ap; *cp; cp++)
 
     for (cp = *ap; *cp; cp++)

-       if (!isalnum (*cp) && *cp != '-')
-           adios (NULL, "invalid component name %s", *ap);
+       if (!isalnum ((unsigned char) *cp) && *cp != '-')
+           die("invalid component name %s", *ap);

 }
 }