X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9cf9f118998a7635485e13863d1bc16c1486bb05..d6b2ae5fa68b9a82ffc006c233aef64c5cdb3bd2:/uip/new.c

diff --git a/uip/new.c b/uip/new.c
index 59b5b8cf..2bb8c17a 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -95,6 +95,7 @@ get_msgnums(char *folder, char *sequences[])
     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 */
@@ -112,9 +113,14 @@ get_msgnums(char *folder, char *sequences[])
     if (seqfile == NULL)
     	return NULL;
 
-    if ((fp = lkfopendata (seqfile, "r")) == NULL) {
-    	free(seqfile);
-	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;
+	}
     }
 
     /* Use m_getfld to scan sequence file */
@@ -255,7 +261,9 @@ check_folders(struct node **first, struct node **last,
     b.sequences = sequences;
 
     if (folders == NULL) {
-	chdir(m_maildir(""));
+	if (chdir(m_maildir("")) < 0) {
+	    advise (m_maildir(""), "chdir");
+	}
 	crawl_folders(".", crawl_callback, &b);
     } else {
 	fp = fopen(folders, "r");
@@ -380,7 +388,9 @@ doit(char *cur, char *folders, char *sequences[])
 	    /* TODO: Split enough of scan.c out so that we can call it here. */
 	    command = concat("scan +", node->n_name, " ", sequences_s,
 			     (void *)NULL);
-	    system(command);
+	    if (system(command) == NOTOK) {
+		adios (command, "system");
+	    }
 	    free(command);
         } else {
             if (node->n_field == NULL) {
@@ -400,8 +410,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) {
@@ -422,11 +435,7 @@ main(int argc, char **argv)
     char *unseen;
     struct node *folder;
 
-    setlocale(LC_ALL, "");
-    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;