Date: Sat, 12 Dec 2009 18:45:49 +0200
Message-ID: <87my1ocf9e.wl%djcb@djcbsoftware.nl>
From: Dirk-Jan C. Binnema <djcb.bulk@gmail.com>
To: David Maus <maus.david@gmail.com>
In-Reply-To: <874onwfizh.wl%maus.david@gmail.com>
References: <87r5r0ctl3.wl%djcb@djcbsoftware.nl>
	<874onwfizh.wl%maus.david@gmail.com>
Mail-Reply-To: djcb@djcbsoftware.nl
User-Agent: Wanderlust/2.15.6 (Almost Unreal) Emacs/23.1 Mule/6.0
	(HANACHIRUSATO)
Organization: DJCBSoftware
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Cc: "notmuch@notmuchmail org" <notmuch@notmuchmail.org>
Subject: Re: [notmuch] Subject: [PATCH] update the check whether a dir
	entry	should be ignored.
Precedence: list
Reply-To: djcb@djcbsoftware.nl

Hi David,

>>>>> "DM" == David Maus <maus.david@gmail.com> writes:

    >> There is one maybe controversial change, namely that it ignores all
    >> dot-dirs; this works fine for .notmuch and .nnmaildir (gnus), but maybe
    >> there is some valid use case for having mail in dot-dirs. Maybe one of
    >> the IMAP-servers does this? Not sure. Anyway, I can change that part.

    DM> Yes, ignore dot-dirs completely is not a good idea as the "." is a
    DM> common separator for mailbox hierarchies on imap servers. Dovecot uses
    DM> it by default, Courier too.

Thanks. I was suspecting something like that. Attached, updated patch that
also updates the counting part.

---
 notmuch-new.c |   75 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/notmuch-new.c b/notmuch-new.c
index 9d20616..411e084 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -109,6 +109,44 @@ is_maildir (struct dirent **entries, int count)
     return 0;
 }
 
+
+static int
+ignore_dir_entry (const char* path, struct dirent *entry)
+{
+    char noindex[4096]; /* any path will fit */
+    
+    /* ignore everything starting with a dot; this covers hidden
+    * files, as well as special dir (. and ..), but also things like
+    * gnus .nnmaildir or .notmuch */
+
+    /* special handling for dot-dirs */
+    if (entry->d_name[0] == '.') {
+
+	/* ignore '.' and '..' */
+	if (entry->d_name[1] == '\0' ||
+	    (entry->d_name[1] == '.' && entry->d_name[2] == '\0')) 
+	    return 1;
+	
+	if (entry->d_name[1] == 'n')  { /* optimization */
+	    /* ignore notmuch, gnus special dirs (or such-named files) */
+	    if (strcmp (entry->d_name, ".notmuch") == 0 ||
+		strcmp (entry->d_name, ".nnmaildir") == 0)
+		return 1;
+	}
+    }
+    
+    /* we also check if dir contains a file called '.noindex'; if so,
+     * we ignore this directory; alloca would be suitable here, if not
+     * for the portability. */
+    snprintf (noindex, sizeof(noindex), "%s/%s/.noindex", path, entry->d_name);
+    if (access (noindex, F_OK) == 0)
+	return 1;
+    
+    return 0; /* don't ignore */
+}
+
+    
+
 /* Examine 'path' recursively as follows:
  *
  *   o Ask the filesystem for the mtime of 'path' (path_mtime)
@@ -181,21 +219,17 @@ add_files_recursive (notmuch_database_t *notmuch,
 	if (path_mtime <= path_dbtime && entry->d_type == DT_REG)
 	    continue;
 
-	/* 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 ||
-	    strcmp (entry->d_name, "..") == 0 ||
-	    (entry->d_type == DT_DIR &&
-	     (strcmp (entry->d_name, "tmp") == 0) &&
-	     is_maildir (namelist, num_entries)) ||
-	    strcmp (entry->d_name, ".notmuch") ==0)
-	{
-	    continue;
-	}
 
+	/* ignore tmp Maildirs, for obvious reasons */
+	if (entry->d_type == DT_DIR &&
+	    (strcmp (entry->d_name, "tmp") == 0) &&
+	    is_maildir (namelist, num_entries))
+	    continue;
+	
+	/* ignore special directories and files */
+	if (ignore_dir_entry (path, entry))
+	    continue;
+	
 	next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
 
 	if (stat (next, st)) {
@@ -394,18 +428,9 @@ count_files (const char *path, int *count)
 
         entry= namelist[i++];
 
-	/* 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 ||
-	    strcmp (entry->d_name, "..") == 0 ||
-	    strcmp (entry->d_name, ".notmuch") == 0)
-	{
+	if (ignore_dir_entry (path, entry))
 	    continue;
-	}
-
+	
 	if (asprintf (&next, "%s/%s", path, entry->d_name) == -1) {
 	    next = NULL;
 	    fprintf (stderr, "Error descending from %s to %s: Out of memory\n",
-- 
1.6.3.3