From: Carl Worth <cworth@cworth.org>
Date: Wed, 6 Jan 2010 18:30:08 +0000 (-0800)
Subject: notmuch new: Fix regression preventing addition of symlinked mail files.
X-Git-Tag: 0.1~162
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=39e81ca431906370d0fee351419e1314e57a7c58;p=notmuch.git

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

As described in the previous commit message, we introduced multiple
symlink-based regressions in commit
3df737bc4addfce71c647792ee668725e5221a98

Here, we fix the case of symlinks to regular files by doing an extra
stat of any DT_LNK files to determine if they do, in fact, link to
regular files.
---

diff --git a/notmuch-new.c b/notmuch-new.c
index e2b5878f..432d1262 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -334,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) &&