X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-new.c;h=d1298aff84168fb2295a0132eb2ab7b6e8ad90be;hb=1a38cb841ca4ce87f6b57f9b1baf1a5f8b8e35b7;hp=e2b5878f06058196f2e1826f681befbe32970641;hpb=49f09958df22f80e4058b6f2892f6224a80c3d6d;p=notmuch

diff --git a/notmuch-new.c b/notmuch-new.c
index e2b5878f..d1298aff 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -221,7 +221,7 @@ add_files_recursive (notmuch_database_t *notmuch,
     notmuch_filenames_t *db_files = NULL;
     notmuch_filenames_t *db_subdirs = NULL;
     struct stat st;
-    notmuch_bool_t is_maildir;
+    notmuch_bool_t is_maildir, new_directory;
 
     if (stat (path, &st)) {
 	fprintf (stderr, "Error reading directory %s: %s\n",
@@ -240,12 +240,22 @@ add_files_recursive (notmuch_database_t *notmuch,
     directory = notmuch_database_get_directory (notmuch, path);
     db_mtime = notmuch_directory_get_mtime (directory);
 
+    if (db_mtime == 0) {
+	new_directory = TRUE;
+	db_files = NULL;
+	db_subdirs = NULL;
+    } else {
+	new_directory = FALSE;
+	db_files = notmuch_directory_get_child_files (directory);
+	db_subdirs = notmuch_directory_get_child_directories (directory);
+    }
+
     /* If the database knows about this directory, then we sort based
      * on strcmp to match the database sorting. Otherwise, we can do
      * inode-based sorting for faster filesystem operation. */
     num_fs_entries = scandir (path, &fs_entries, 0,
-			      db_mtime ?
-			      dirent_sort_strcmp_name : dirent_sort_inode);
+			      new_directory ?
+			      dirent_sort_inode : dirent_sort_strcmp_name);
 
     if (num_fs_entries == -1) {
 	fprintf (stderr, "Error opening directory %s: %s\n",
@@ -294,9 +304,6 @@ add_files_recursive (notmuch_database_t *notmuch,
 	goto DONE;
 
     /* Pass 2: Scan for new files, removed files, and removed directories. */
-    db_files = notmuch_directory_get_child_files (directory);
-    db_subdirs = notmuch_directory_get_child_directories (directory);
-
     for (i = 0; i < num_fs_entries; i++)
     {
 	if (interrupted)
@@ -334,8 +341,27 @@ add_files_recursive (notmuch_database_t *notmuch,
 	    notmuch_filenames_advance (db_subdirs);
 	}
 
-	if (entry->d_type != DT_REG)
+	/* If we're looking at a symlink, we only want to add it if it
+	 * links to a regular file, (and not to a directory, say). */
+	if (entry->d_type == DT_LNK) {
+	    int err;
+
+	    next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
+	    err = stat (next, &st);
+	    talloc_free (next);
+	    next = NULL;
+
+	    /* Don't emit an error for a link pointing nowhere, since
+	     * the directory-traversal pass will have already done
+	     * that. */
+	    if (err)
+		continue;
+
+	    if (! S_ISREG (st.st_mode))
+		continue;
+	} else if (entry->d_type != DT_REG) {
 	    continue;
+	}
 
 	/* Don't add a file that we've added before. */
 	if (notmuch_filenames_has_more (db_files) &&
@@ -411,6 +437,30 @@ add_files_recursive (notmuch_database_t *notmuch,
 	next = NULL;
     }
 
+    /* Now that we've walked the whole filesystem list, anything left
+     * over in the database lists has been deleted. */
+    while (notmuch_filenames_has_more (db_files))
+    {
+	char *absolute = talloc_asprintf (state->removed_files,
+					  "%s/%s", path,
+					  notmuch_filenames_get (db_files));
+
+	_filename_list_add (state->removed_files, absolute);
+
+	notmuch_filenames_advance (db_files);
+    }
+
+    while (notmuch_filenames_has_more (db_subdirs))
+    {
+	char *absolute = talloc_asprintf (state->removed_directories,
+					  "%s/%s", path,
+					  notmuch_filenames_get (db_subdirs));
+
+	_filename_list_add (state->removed_directories, absolute);
+
+	notmuch_filenames_advance (db_subdirs);
+    }
+
     if (! interrupted) {
 	status = notmuch_directory_set_mtime (directory, fs_mtime);
 	if (status && ret == NOTMUCH_STATUS_SUCCESS)