lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / mark.c

diff --git a/uip/mark.c b/uip/mark.c
index 6ffc2b1a60d28ab6a3f69ac4bf0c85887a608a22..0b17b862a0d0f11770d19b35201c4242d28590db 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -1,6 +1,4 @@
-
-/*
- * mark.c -- add message(s) to sequences in given folder
+/* mark.c -- add message(s) to sequences in given folder

  *        -- delete messages (s) from sequences in given folder
  *        -- list sequences in given folder
  *
  *        -- delete messages (s) from sequences in given folder
  *        -- list sequences in given folder
  *


@@ -11,32 +9,28 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #include <h/utils.h>

-
-static struct swit switches[] = {
-#define        ADDSW               0
-    { "add", 0 },
-#define        DELSW               1
-    { "delete", 0 },
-#define        LSTSW               2
-    { "list", 0 },
-#define        SEQSW               3
-    { "sequence name", 0 },
-#define        PUBLSW              4
-    { "public", 0 },
-#define        NPUBLSW             5
-    { "nopublic", 0 },
-#define        ZEROSW              6
-    { "zero", 0 },
-#define        NZEROSW             7
-    { "nozero", 0 },
-#define VERSIONSW           8
-    { "version", 0 },
-#define        HELPSW              9
-    { "help", 0 },
-#define        DEBUGSW            10
-    { "debug", -5 },
-    { NULL, 0 }
-};
+#include "sbr/m_maildir.h"
+
+#define MARK_SWITCHES \
+    X("add", 0, ADDSW) \
+    X("delete", 0, DELSW) \
+    X("list", 0, LSTSW) \
+    X("sequence name", 0, SEQSW) \
+    X("public", 0, PUBLSW) \
+    X("nopublic", 0, NPUBLSW) \
+    X("zero", 0, ZEROSW) \
+    X("nozero", 0, NZEROSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("debug", -5, DEBUGSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(MARK);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MARK, switches);
+#undef X

 
 /*
  * static prototypes
 
 /*
  * static prototypes


@@ -53,17 +47,11 @@ main (int argc, char **argv)
     unsigned int seqp = 0;
     char *cp, *maildir, *folder = NULL, buf[BUFSIZ];
     char **argp, **arguments;
     unsigned int seqp = 0;
     char *cp, *maildir, *folder = NULL, buf[BUFSIZ];
     char **argp, **arguments;

-    char *seqs[NUMATTRS + 1];
+    svector_t seqs = svector_create (0);

     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 

-#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;


@@ -84,10 +72,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 ADDSW: 
                addsw++;
 
            case ADDSW: 
                addsw++;


@@ -106,10 +94,8 @@ main (int argc, char **argv)
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
 
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
 

-               /* check if too many sequences specified */
-               if (seqp >= NUMATTRS)
-                   adios (NULL, "too many sequences (more than %d) specified", NUMATTRS);
-               seqs[seqp++] = cp;
+               svector_push_back (seqs, cp);
+               seqp++;

                continue;
 
            case PUBLSW: 
                continue;
 
            case PUBLSW: 


@@ -134,10 +120,9 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");

-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);

        } else
        } else

-               app_msgarg(&msgs, cp);
+            app_msgarg(&msgs, cp);

     }
 
     /*
     }
 
     /*


@@ -164,7 +149,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);
 
     /* print some general debugging info */
        adios (NULL, "unable to read folder %s", folder);
 
     /* print some general debugging info */


@@ -190,19 +175,18 @@ main (int argc, char **argv)
     if (seqp == 0 && (addsw || deletesw))
        adios (NULL, "-%s requires at least one -sequence argument",
               addsw ? "add" : "delete");
     if (seqp == 0 && (addsw || deletesw))
        adios (NULL, "-%s requires at least one -sequence argument",
               addsw ? "add" : "delete");

-    seqs[seqp] = NULL;

 
     /* Adding messages to sequences */
     if (addsw) {
 
     /* Adding messages to sequences */
     if (addsw) {

-       for (seqp = 0; seqs[seqp]; seqp++)
-           if (!seq_addsel (mp, seqs[seqp], publicsw, zerosw))
+       for (seqp = 0; seqp < svector_size (seqs); seqp++)
+           if (!seq_addsel (mp, svector_at (seqs, seqp), publicsw, zerosw))

                done (1);
     }
 
     /* Deleting messages from sequences */
     if (deletesw) {
                done (1);
     }
 
     /* Deleting messages from sequences */
     if (deletesw) {

-       for (seqp = 0; seqs[seqp]; seqp++)
-           if (!seq_delsel (mp, seqs[seqp], publicsw, zerosw))
+       for (seqp = 0; seqp < svector_size (seqs); seqp++)
+           if (!seq_delsel (mp, svector_at (seqs, seqp), publicsw, zerosw))

                done (1);
     }
 
                done (1);
     }
 


@@ -210,8 +194,8 @@ main (int argc, char **argv)
     if (listsw) {
        if (seqp) {
            /* print the sequences given */
     if (listsw) {
        if (seqp) {
            /* print the sequences given */

-           for (seqp = 0; seqs[seqp]; seqp++)
-               seq_print (mp, seqs[seqp]);
+           for (seqp = 0; seqp < svector_size (seqs); seqp++)
+               seq_print (mp, svector_at (seqs, seqp));

        } else {
            /* else print them all */
            seq_printall (mp);
        } else {
            /* else print them all */
            seq_printall (mp);


@@ -222,6 +206,7 @@ main (int argc, char **argv)
            seq_printdebug (mp);
     }
 
            seq_printdebug (mp);
     }
 

+    svector_free (seqs);

     seq_save (mp);                     /* synchronize message sequences */
     context_replace (pfolder, folder); /* update current folder         */
     context_save ();                   /* save the context file         */
     seq_save (mp);                     /* synchronize message sequences */
     context_replace (pfolder, folder); /* update current folder         */
     context_save ();                   /* save the context file         */


@@ -259,18 +244,22 @@ print_debug (struct msgs *mp)
 /*
  * Print debugging info about all the SELECTED
  * messages and the sequences they are in.
 /*
  * Print debugging info about all the SELECTED
  * messages and the sequences they are in.

+ * Due to limitations of snprintb(), only a limited
+ * number of sequences will be printed.  See the
+ * comments in sbr/seq_bits.c.

  */
 static void
 seq_printdebug (struct msgs *mp)
 {
     int msgnum;
  */
 static void
 seq_printdebug (struct msgs *mp)
 {
     int msgnum;

-    char buf[100];
+    char buf[BUFSIZ];

 
 

-    printf ("\n");
+    putchar('\n');

     for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
        if (is_selected (mp, msgnum))
            printf ("%*d: %s\n", DMAXFOLDER, msgnum,
     for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
        if (is_selected (mp, msgnum))
            printf ("%*d: %s\n", DMAXFOLDER, msgnum,

-               snprintb (buf, sizeof(buf),
-               (unsigned) mp->msgstats[msgnum - mp->lowoff], seq_bits (mp)));
+                   snprintb (buf, sizeof buf,
+                             (unsigned) bvector_first_bits (msgstat (mp, msgnum)),
+                             seq_bits (mp)));

     }
 }
     }
 }