X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=ca68a68473af918dc7004762a8f42f3c85007a67;hp=2a929c56fe95ebcae44ec8e257033d2a06296fdd;hb=999f4c895c2442f50f943f6a8b391e1adc9cbba4;hpb=50ae83a17feb1fc2f48fb8e51ef73da08ae4e2f2

diff --git a/notmuch-new.c b/notmuch-new.c
index 2a929c56..ca68a684 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
@@ -143,10 +153,13 @@ add_files_recursive (notmuch_database_t *notmuch,
     notmuch_message_t *message = NULL;
     struct dirent **namelist = NULL;
     int num_entries;
+    notmuch_directory_t *directory;
 
     path_mtime = st->st_mtime;
 
-    path_dbtime = notmuch_database_get_directory_mtime (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) {
@@ -277,7 +290,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 	next = NULL;
     }
 
-    status = notmuch_database_set_directory_mtime (notmuch, path, path_mtime);
+    status = notmuch_directory_set_mtime (directory, path_mtime);
     if (status && ret == NOTMUCH_STATUS_SUCCESS)
 	ret = status;
 
@@ -297,7 +310,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)