notmuch: Ignore .notmuch when counting files.
authorCarl Worth <cworth@cworth.org>
Mon, 19 Oct 2009 19:52:46 +0000 (12:52 -0700)
committerCarl Worth <cworth@cworth.org>
Mon, 19 Oct 2009 19:52:46 +0000 (12:52 -0700)
We were correctly ignoring this when adding files, but not when
doing the initial count. Clearly we need better code sharing
here.

notmuch.c

index 25aa6c5f402a532b5558c928bdd2e40d107940da..e4b5dff6442fc686456410ee01871bcb858bff7e 100644 (file)
--- a/notmuch.c
+++ b/notmuch.c
@@ -253,9 +253,14 @@ count_files (const char *path, int *count)
        if (e == NULL)
            break;
 
        if (e == NULL)
            break;
 
-       /* Skip these special directories to avoid infinite recursion. */
+       /* Ignore special directories to avoid infinite recursion.
+        * Also ignore the .notmuch directory.
+        */
+       /* XXX: Eventually we'll want more sophistication to let the
+        * user specify files to be ignored. */
        if (strcmp (entry->d_name, ".") == 0 ||
        if (strcmp (entry->d_name, ".") == 0 ||
-           strcmp (entry->d_name, "..") == 0)
+           strcmp (entry->d_name, "..") == 0 ||
+           strcmp (entry->d_name, ".notmuch") == 0)
        {
            continue;
        }
        {
            continue;
        }