X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5dd6771b28c257af405d7248639ed0e3bcdce38b..6f133ca42e6552b505996de7f9afcbc8d47cb4cb:/uip/new.c

diff --git a/uip/new.c b/uip/new.c
index 41d2ebf8..198207a8 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -105,15 +105,16 @@ get_msgnums(char *folder, char *sequences[])
 
     /* copied from seq_read.c:seq_public */
     for (state = FLD;;) {
-        switch (state = m_getfld (state, name, field, sizeof(field), fp)) {
+	int fieldsz = sizeof field;
+	switch (state = m_getfld (state, name, field, &fieldsz, fp)) {
             case FLD:
             case FLDPLUS:
             case FLDEOF:
                 if (state == FLDPLUS) {
                     cp = getcpy (field);
                     while (state == FLDPLUS) {
-                        state = m_getfld (state, name, field,
-                                          sizeof(field), fp);
+			fieldsz = sizeof field;
+			state = m_getfld (state, name, field, &fieldsz, fp);
                         cp = add (field, cp);
                     }
 
@@ -218,6 +219,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.
+ *
+ * An empty list is returned as first=last=NULL.
  */
 static void
 check_folders(struct node **first, struct node **last,
@@ -229,7 +232,7 @@ check_folders(struct node **first, struct node **last,
     char *line;
     size_t len;
 
-    *first = *cur_node = NULL;
+    *first = *last = *cur_node = NULL;
     *maxlen = 0;
 
     b.first = first;
@@ -308,7 +311,10 @@ doit(char *cur, char *folders, char *sequences[])
 		  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;
@@ -403,6 +409,9 @@ main(int argc, char **argv)
     char *unseen;
     struct node *folder;
 
+    sequences[0] = NULL;
+    sequences[1] = NULL;
+
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
@@ -430,10 +439,10 @@ main(int argc, char **argv)
 		snprintf (help, sizeof(help), "%s [switches] [sequences]",
 			  invo_name);
 		print_help (help, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
 
 	    case FOLDERSSW:
 		if (!(folders = *argp++) || *folders == '-')
@@ -449,6 +458,7 @@ main(int argc, char **argv)
 	/* have a sequence argument */
 	if (!seq_in_list(cp, sequences)) {
 	    sequences[i++] = cp;
+	    sequences[i] = NULL;
 	}
     }