X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=6df4ad9f3dee001c21fa0fea5a091cb53a9bf8e7;hp=21c9b6ac95abdb81d9983758ec3b5d7612783644;hb=2ce46c31fe44ea1c7fc75a7da83e1278d06c28e1;hpb=3a9c3ec9e719f0e5adefe0ceafffeb34c7a3917e

diff --git a/notmuch-new.c b/notmuch-new.c
index 21c9b6ac..6df4ad9f 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -22,6 +22,16 @@
 
 #include <unistd.h>
 
+typedef struct {
+    int output_is_a_tty;
+    int verbose;
+
+    int total_files;
+    int processed_files;
+    int added_messages;
+    struct timeval tv_start;
+} add_files_state_t;
+
 static volatile sig_atomic_t do_add_files_print_progress = 0;
 
 static void
@@ -111,20 +121,20 @@ is_maildir (struct dirent **entries, int count)
 
 /* Examine 'path' recursively as follows:
  *
- *   o Ask the filesystem for the mtime of 'path' (path_mtime)
+ *   o Ask the filesystem for the mtime of 'path' (fs_mtime)
  *
- *   o Ask the database for its timestamp of 'path' (path_dbtime)
+ *   o Ask the database for its timestamp of 'path' (db_mtime)
  *
- *   o If 'path_mtime' > 'path_dbtime'
+ *   o If 'fs_mtime' > 'db_mtime'
  *
  *       o For each regular file in 'path' with mtime newer than the
- *         'path_dbtime' call add_message to add the file to the
+ *         'db_mtime' call add_message to add the file to the
  *         database.
  *
- *       o For each sub-directory of path, recursively call into this
- *         same function.
+ *   o For each sub-directory of path, recursively call into this
+ *     same function.
  *
- *   o Tell the database to update its time of 'path' to 'path_mtime'
+ *   o Tell the database to update its time of 'path' to 'fs_mtime'
  *
  * The 'struct stat *st' must point to a structure that has already
  * been initialized for 'path' by calling stat().
@@ -138,15 +148,18 @@ add_files_recursive (notmuch_database_t *notmuch,
     DIR *dir = NULL;
     struct dirent *entry = NULL;
     char *next = NULL;
-    time_t path_mtime, path_dbtime;
+    time_t fs_mtime, db_mtime;
     notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS;
     notmuch_message_t *message = NULL;
     struct dirent **namelist = NULL;
     int num_entries;
+    notmuch_directory_t *directory;
+
+    fs_mtime = st->st_mtime;
 
-    path_mtime = st->st_mtime;
+    directory = notmuch_database_get_directory (notmuch, path);
+    db_mtime = notmuch_directory_get_mtime (directory);
 
-    path_dbtime = notmuch_database_get_timestamp (notmuch, path);
     num_entries = scandir (path, &namelist, 0, ino_cmp);
 
     if (num_entries == -1) {
@@ -167,7 +180,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 	/* If this directory hasn't been modified since the last
 	 * add_files, then we only need to look further for
 	 * sub-directories. */
-	if (path_mtime <= path_dbtime && entry->d_type == DT_REG)
+	if (fs_mtime <= db_mtime && entry->d_type == DT_REG)
 	    continue;
 
 	/* Ignore special directories to avoid infinite recursion.
@@ -208,7 +221,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 	if (S_ISREG (st->st_mode)) {
 	    /* If the file hasn't been modified since the last
 	     * add_files, then we need not look at it. */
-	    if (path_dbtime == 0 || st->st_mtime > path_dbtime) {
+	    if (db_mtime == 0 || st->st_mtime > db_mtime) {
 		state->processed_files++;
 
 		if (state->verbose) {
@@ -277,9 +290,11 @@ add_files_recursive (notmuch_database_t *notmuch,
 	next = NULL;
     }
 
-    status = notmuch_database_set_timestamp (notmuch, path, path_mtime);
-    if (status && ret == NOTMUCH_STATUS_SUCCESS)
-	ret = status;
+    if (! interrupted) {
+	status = notmuch_directory_set_mtime (directory, fs_mtime);
+	if (status && ret == NOTMUCH_STATUS_SUCCESS)
+	    ret = status;
+    }
 
   DONE:
     if (next)
@@ -297,7 +312,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 /* This is the top-level entry point for add_files. It does a couple
  * of error checks, sets up the progress-printing timer and then calls
  * into the recursive function. */
-notmuch_status_t
+static notmuch_status_t
 add_files (notmuch_database_t *notmuch,
 	   const char *path,
 	   add_files_state_t *state)