X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=ee6f196ecb9b79346c586a44265403f5ddcb3b71;hp=f58a384b52b1cf48cbb7067b2e5f8743e9b0aeae;hb=d807e28f43579ecc91aa40ae3e42760991c2f810;hpb=de064f177202b8e7ec4073eef24b17f91eba11c8

diff --git a/notmuch-new.c b/notmuch-new.c
index f58a384b..ee6f196e 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -35,8 +35,10 @@ static volatile sig_atomic_t interrupted;
 static void
 handle_sigint (unused (int sig))
 {
+    ssize_t ignored;
     static char msg[] = "Stopping...         \n";
-    write(2, msg, sizeof(msg)-1);
+
+    ignored = write(2, msg, sizeof(msg)-1);
     interrupted = 1;
 }
 
@@ -141,21 +143,13 @@ add_files_recursive (notmuch_database_t *notmuch,
     notmuch_message_t *message = NULL;
     struct dirent **namelist = NULL;
     int num_entries;
-
-    /* If we're told to, we bail out on encountering a read-only
-     * directory, (with this being a clear clue from the user to
-     * Notmuch that new mail won't be arriving there and we need not
-     * look. */
-    if (state->ignore_read_only_directories &&
-	(st->st_mode & S_IWUSR) == 0)
-    {
-	state->saw_read_only_directory = TRUE;
-	goto DONE;
-    }
+    notmuch_directory_t *directory;
 
     path_mtime = st->st_mtime;
 
-    path_dbtime = notmuch_database_get_timestamp (notmuch, path);
+    directory = notmuch_database_get_directory (notmuch, path);
+    path_dbtime = notmuch_directory_get_mtime (directory);
+
     num_entries = scandir (path, &namelist, 0, ino_cmp);
 
     if (num_entries == -1) {
@@ -286,7 +280,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 	next = NULL;
     }
 
-    status = notmuch_database_set_timestamp (notmuch, path, path_mtime);
+    status = notmuch_directory_set_mtime (directory, path_mtime);
     if (status && ret == NOTMUCH_STATUS_SUCCESS)
 	ret = status;
 
@@ -483,14 +477,12 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
 	if (interrupted)
 	    return 1;
 
-	printf ("Found %d total files.     \n", count);
+	printf ("Found %d total files (that's not much mail).\n", count);
 	notmuch = notmuch_database_create (db_path);
-	add_files_state.ignore_read_only_directories = FALSE;
 	add_files_state.total_files = count;
     } else {
 	notmuch = notmuch_database_open (db_path,
 					 NOTMUCH_DATABASE_MODE_READ_WRITE);
-	add_files_state.ignore_read_only_directories = TRUE;
 	add_files_state.total_files = 0;
     }
 
@@ -500,7 +492,6 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
     talloc_free (dot_notmuch_path);
     dot_notmuch_path = NULL;
 
-    add_files_state.saw_read_only_directory = FALSE;
     add_files_state.processed_files = 0;
     add_files_state.added_messages = 0;
     gettimeofday (&add_files_state.tv_start, NULL);
@@ -523,19 +514,12 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
 	}
     }
     if (add_files_state.added_messages) {
-	printf ("Added %d new %s to the database (not much, really).\n",
+	printf ("Added %d new %s to the database.\n",
 		add_files_state.added_messages,
 		add_files_state.added_messages == 1 ?
 		"message" : "messages");
     } else {
-	printf ("No new mail---and that's not much.\n");
-    }
-
-    if (elapsed > 1 && ! add_files_state.saw_read_only_directory) {
-	printf ("\nTip: If you have any sub-directories that are archives (that is,\n"
-		"they will never receive new mail), marking these directories as\n"
-		"read-only (chmod u-w /path/to/dir) will make \"notmuch new\"\n"
-		"much more efficient (it won't even look in those directories).\n");
+	printf ("No new mail.\n");
     }
 
     if (ret) {