X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=7d15fe9184183401ab96556ff9f6d7c6168be8c9;hp=ab1d12a6fd7dd8ea1a800fc30c4686c096ba62fe;hb=957ae198e708dc901e3a8c89b7364c2bc75ce371;hpb=9d4d7963a155d07f71f1f8f95031225cb9a5b705

diff --git a/notmuch-new.c b/notmuch-new.c
index ab1d12a6..7d15fe91 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -229,15 +229,18 @@ add_files_recursive (notmuch_database_t *notmuch,
 	return NOTMUCH_STATUS_FILE_ERROR;
     }
 
-    if (! S_ISDIR (st.st_mode)) {
-	fprintf (stderr, "Error: %s is not a directory.\n", path);
-	return NOTMUCH_STATUS_FILE_ERROR;
-    }
+    /* This is not an error since we may have recursed based on a
+     * symlink to a regular file, not a directory, and we don't know
+     * that until this stat. */
+    if (! S_ISDIR (st.st_mode))
+	return NOTMUCH_STATUS_SUCCESS;
 
     fs_mtime = st.st_mtime;
 
     directory = notmuch_database_get_directory (notmuch, path);
     db_mtime = notmuch_directory_get_mtime (directory);
+    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
@@ -262,7 +265,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 
 	entry = fs_entries[i];
 
-	if (entry->d_type != DT_DIR)
+	if (entry->d_type != DT_DIR && entry->d_type != DT_LNK)
 	    continue;
 
 	/* Ignore special directories to avoid infinite recursion.
@@ -293,9 +296,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)
@@ -333,8 +333,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) &&
@@ -344,7 +363,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 	    continue;
 	}
 
-	/* We're not looking at a regular file that doesn't yet exist
+	/* We're now looking at a regular file that doesn't yet exist
 	 * in the database, so add it. */
 	next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
 
@@ -410,6 +429,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)
@@ -447,6 +490,7 @@ add_files (notmuch_database_t *notmuch,
     struct sigaction action;
     struct itimerval timerval;
     notmuch_bool_t timer_is_active = FALSE;
+    struct stat st;
 
     if (state->output_is_a_tty && ! debugger_is_active () && ! state->verbose) {
 	/* Setup our handler for SIGALRM */
@@ -466,6 +510,17 @@ add_files (notmuch_database_t *notmuch,
 	timer_is_active = TRUE;
     }
 
+    if (stat (path, &st)) {
+	fprintf (stderr, "Error reading directory %s: %s\n",
+		 path, strerror (errno));
+	return NOTMUCH_STATUS_FILE_ERROR;
+    }
+
+    if (! S_ISDIR (st.st_mode)) {
+	fprintf (stderr, "Error: %s is not a directory.\n", path);
+	return NOTMUCH_STATUS_FILE_ERROR;
+    }
+
     status = add_files_recursive (notmuch, path, state);
 
     if (timer_is_active) {