Fixed quoting of filename, expanded C-T parameter values, etc.,

[nmh] / uip / new.c

diff --git a/uip/new.c b/uip/new.c
index 41d2ebf8cb6b7fb6ae9e21dac9186cbfae187b88..6f9982528c50111ade88551a63ac45616ac6062f 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -13,25 +13,23 @@
 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 

-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-

 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 
 #include <h/mh.h>
 #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;
 
 
 static enum { NEW, FNEXT, FPREV, UNSEEN } run_mode = NEW;
 


@@ -91,29 +89,45 @@ seq_in_list(char *name, char *sequences[])
 static char *
 get_msgnums(char *folder, char *sequences[])
 {
 static char *
 get_msgnums(char *folder, char *sequences[])
 {

-    char *seqfile = concat(m_maildir(folder), "/", mh_seq, (void *)NULL);
-    FILE *fp = fopen(seqfile, "r");
+    char *seqfile = NULL;
+    FILE *fp;

     int state;
     char name[NAMESZ], field[BUFSIZ];
     char *cp;
     char *msgnums = NULL, *this_msgnums, *old_msgnums;
     int state;
     char name[NAMESZ], field[BUFSIZ];
     char *cp;
     char *msgnums = NULL, *this_msgnums, *old_msgnums;

+    m_getfld_state_t gstate = 0;
+
+    /* copied from seq_read.c:seq_public */
+    /*
+     * If mh_seq == NULL or if *mh_seq == '\0' (the user has defined
+     * the "mh-sequences" profile entry, but left it empty),
+     * then just return, and do not initialize any public sequences.
+     */
+    if (mh_seq == NULL || *mh_seq == '\0')
+       return NULL;

 
 

-    /* no sequences file -> no messages */
-    if (fp == NULL) {
-        return NULL;
+    /* get filename of sequence file */
+    seqfile = concat(m_maildir(folder), "/", mh_seq, (void *)NULL);
+
+    if (seqfile == NULL)
+       return NULL;
+
+    if ((fp = lkfopendata (seqfile, "r")) == NULL) {
+       free(seqfile);
+       return NULL;

     }
 
     }
 

-    /* copied from seq_read.c:seq_public */
-    for (state = FLD;;) {
-        switch (state = m_getfld (state, name, field, sizeof(field), fp)) {
+    /* Use m_getfld to scan sequence file */
+    for (;;) {
+       int fieldsz = sizeof field;
+       switch (state = m_getfld (&gstate, name, field, &fieldsz, fp)) {

             case FLD:
             case FLDPLUS:
             case FLD:
             case FLDPLUS:

-            case FLDEOF:

                 if (state == FLDPLUS) {
                     cp = getcpy (field);
                     while (state == FLDPLUS) {
                 if (state == FLDPLUS) {
                     cp = getcpy (field);
                     while (state == FLDPLUS) {

-                        state = m_getfld (state, name, field,
-                                          sizeof(field), fp);
+                       fieldsz = sizeof field;
+                       state = m_getfld (&gstate, name, field, &fieldsz, fp);

                         cp = add (field, cp);
                     }
 
                         cp = add (field, cp);
                     }
 


@@ -148,12 +162,9 @@ get_msgnums(char *folder, char *sequences[])
                     }
                 }
 
                     }
                 }
 

-                if (state == FLDEOF)
-                    break;

                 continue;
 
             case BODY:
                 continue;
 
             case BODY:

-            case BODYEOF:

                 adios (NULL, "no blank lines are permitted in %s", seqfile);
                 /* fall */
 
                 adios (NULL, "no blank lines are permitted in %s", seqfile);
                 /* fall */
 


@@ -165,8 +176,11 @@ get_msgnums(char *folder, char *sequences[])
         }
         break;  /* break from for loop */
     }
         }
         break;  /* break from for loop */
     }

+    m_getfld_state_destroy (&gstate);
+
+    lkfclosedata (fp, seqfile);

 
 

-    fclose(fp);
+    free(seqfile);

 
     return msgnums;
 }
 
     return msgnums;
 }


@@ -218,6 +232,8 @@ crawl_callback(char *folder, void *baton)
  * `cur' points to the name of the current folder, `folders' points to the
  * name of a .folder (if NULL, crawl all folders), and `sequences' points to
  * the array of sequences for which to look.
  * `cur' points to the name of the current folder, `folders' points to the
  * name of a .folder (if NULL, crawl all folders), and `sequences' points to
  * the array of sequences for which to look.

+ *
+ * An empty list is returned as first=last=NULL.

  */
 static void
 check_folders(struct node **first, struct node **last,
  */
 static void
 check_folders(struct node **first, struct node **last,


@@ -229,7 +245,7 @@ check_folders(struct node **first, struct node **last,
     char *line;
     size_t len;
 
     char *line;
     size_t len;
 

-    *first = *cur_node = NULL;
+    *first = *last = *cur_node = NULL;

     *maxlen = 0;
 
     b.first = first;
     *maxlen = 0;
 
     b.first = first;


@@ -308,7 +324,10 @@ doit(char *cur, char *folders, char *sequences[])
                  folders, sequences);
 
     if (run_mode == FNEXT || run_mode == FPREV) {
                  folders, sequences);
 
     if (run_mode == FNEXT || run_mode == FPREV) {

-       if (first->n_next == NULL) {
+       if (first == NULL) {
+           /* No folders at all... */
+           return NULL;
+       } else if (first->n_next == NULL) {

            /* We have only one node; any desired messages in it? */
            if (first->n_field == NULL) {
                return NULL;
            /* We have only one node; any desired messages in it? */
            if (first->n_field == NULL) {
                return NULL;


@@ -398,18 +417,12 @@ main(int argc, char **argv)
     char **ap, *cp, **argp, **arguments;
     char help[BUFSIZ];
     char *folders = NULL;
     char **ap, *cp, **argp, **arguments;
     char help[BUFSIZ];
     char *folders = NULL;

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

     int i = 0;
     char *unseen;
     struct node *folder;
 
     int i = 0;
     char *unseen;
     struct node *folder;
 

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


@@ -430,10 +443,10 @@ main(int argc, char **argv)
                snprintf (help, sizeof(help), "%s [switches] [sequences]",
                          invo_name);
                print_help (help, switches, 1);
                snprintf (help, sizeof(help), "%s [switches] [sequences]",
                          invo_name);
                print_help (help, switches, 1);

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

            case VERSIONSW:
                print_version(invo_name);
            case VERSIONSW:
                print_version(invo_name);

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

 
            case FOLDERSSW:
                if (!(folders = *argp++) || *folders == '-')
 
            case FOLDERSSW:
                if (!(folders = *argp++) || *folders == '-')


@@ -447,8 +460,9 @@ main(int argc, char **argv)
            }
        }
        /* have a sequence argument */
            }
        }
        /* have a sequence argument */

-       if (!seq_in_list(cp, sequences)) {
-           sequences[i++] = cp;
+       if (!seq_in_list(cp, svector_strs (sequences))) {
+           svector_push_back (sequences, cp);
+           ++i;

        }
     }
 
        }
     }
 


@@ -475,12 +489,12 @@ main(int argc, char **argv)
            adios(NULL, "must specify sequences or set %s", usequence);
        }
        for (ap = brkstring(unseen, " ", "\n"); *ap; ap++) {
            adios(NULL, "must specify sequences or set %s", usequence);
        }
        for (ap = brkstring(unseen, " ", "\n"); *ap; ap++) {

-           sequences[i++] = *ap;
+           svector_push_back (sequences, *ap);
+           ++i;

        }
     }
        }
     }

-    sequences[i] = NULL;

 
 

-    folder = doit(context_find(pfolder), folders, sequences);
+    folder = doit(context_find(pfolder), folders, svector_strs (sequences));

     if (folder == NULL) {
         done(0);
         return 1;
     if (folder == NULL) {
         done(0);
         return 1;


@@ -504,6 +518,7 @@ main(int argc, char **argv)
 
     context_save();
 
 
     context_save();
 

+    svector_free (sequences);

     done (0);
     return 1;
 }
     done (0);
     return 1;
 }