X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/869b0d5dc814215b72b1899cf82073d13bb65a97..58eaf2c2:/uip/new.c?ds=inline

diff --git a/uip/new.c b/uip/new.c
index 198207a8..bdbdc73f 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -13,25 +13,23 @@
 
 #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>
 
-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;
 
@@ -91,30 +89,51 @@ seq_in_list(char *name, 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 failed_to_lock = 0;
+    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;
+
+    /* get filename of sequence file */
+    seqfile = concat(m_maildir(folder), "/", mh_seq, (void *)NULL);
 
-    /* no sequences file -> no messages */
-    if (fp == NULL) {
-        return NULL;
+    if (seqfile == NULL)
+    	return NULL;
+
+    if ((fp = lkfopendata (seqfile, "r", & failed_to_lock)) == NULL) {
+
+	if (failed_to_lock) {
+	    adios (seqfile, "failed to lock");
+	} else {
+    	    free(seqfile);
+	    return NULL;
+	}
     }
 
-    /* copied from seq_read.c:seq_public */
-    for (state = FLD;;) {
+    /* Use m_getfld to scan sequence file */
+    for (;;) {
 	int fieldsz = sizeof field;
-	switch (state = m_getfld (state, name, field, &fieldsz, fp)) {
+	switch (state = m_getfld (&gstate, name, field, &fieldsz, fp)) {
             case FLD:
             case FLDPLUS:
-            case FLDEOF:
                 if (state == FLDPLUS) {
                     cp = getcpy (field);
                     while (state == FLDPLUS) {
 			fieldsz = sizeof field;
-			state = m_getfld (state, name, field, &fieldsz, fp);
+			state = m_getfld (&gstate, name, field, &fieldsz, fp);
                         cp = add (field, cp);
                     }
 
@@ -149,12 +168,9 @@ get_msgnums(char *folder, char *sequences[])
                     }
                 }
 
-                if (state == FLDEOF)
-                    break;
                 continue;
 
             case BODY:
-            case BODYEOF:
                 adios (NULL, "no blank lines are permitted in %s", seqfile);
                 /* fall */
 
@@ -166,8 +182,11 @@ get_msgnums(char *folder, char *sequences[])
         }
         break;  /* break from for loop */
     }
+    m_getfld_state_destroy (&gstate);
+
+    lkfclosedata (fp, seqfile);
 
-    fclose(fp);
+    free(seqfile);
 
     return msgnums;
 }
@@ -387,8 +406,11 @@ doit(char *cur, char *folders, char *sequences[])
 
     /* If we're fnext, we haven't checked the last node yet.  If it's the
      * current folder, return the first node. */
-    if (run_mode == FNEXT && strcmp(last->n_name, cur) == 0) {
-        return first;
+    if (run_mode == FNEXT) {
+	assert(last != NULL);
+	if (strcmp(last->n_name, cur) == 0) {
+            return first;
+	}
     }
 
     if (run_mode == NEW) {
@@ -404,21 +426,12 @@ main(int argc, char **argv)
     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;
 
-    sequences[0] = NULL;
-    sequences[1] = NULL;
-
-#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;
@@ -456,9 +469,9 @@ main(int argc, char **argv)
 	    }
 	}
 	/* have a sequence argument */
-	if (!seq_in_list(cp, sequences)) {
-	    sequences[i++] = cp;
-	    sequences[i] = NULL;
+	if (!seq_in_list(cp, svector_strs (sequences))) {
+	    svector_push_back (sequences, cp);
+	    ++i;
 	}
     }
 
@@ -485,12 +498,12 @@ main(int argc, char **argv)
 	    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;
@@ -514,6 +527,7 @@ main(int argc, char **argv)
 
     context_save();
 
+    svector_free (sequences);
     done (0);
     return 1;
 }