notmuch new: Fix regression preventing addition of symlinked mail files.

[notmuch] / notmuch-new.c

diff --git a/notmuch-new.c b/notmuch-new.c
index ab1d12a6fd7dd8ea1a800fc30c4686c096ba62fe..432d126286fba8fd070ad75d18850ecca38caef9 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -229,10 +229,11 @@ 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;
 
@@ -262,7 +263,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.
@@ -333,8 +334,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 +364,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);
 
@@ -447,6 +467,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 +487,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) {