[RFC PATCH v3 4/8] excluded_1(): support exclude "directories" in index

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Aug 11, 2009, 15:44 UTC
Message-ID: <1250005446-12047-5-git-send-email-pclouds@gmail.com>
In-Reply-To: <1250005446-12047-4-git-send-email-pclouds@gmail.com>

Index does not really have "directories", attempts to match "foo/" against index will fail unless someone tries to reconstruct directories from a list of file.

Observing that dtype in this function can never be NULL (otherwise it would segfault), dtype NULL will be used to say "hey.. you are matching against index" and behave properly.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
  Having dtype to segfault when dtype is NULL is nice, but I found
  no way else to sneak the new code in. Defining DT_INDEX may clash
  existing system definitions..

 dir.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dir.c b/dir.c
index 66b485c..c990938 100644
--- a/dir.c
+++ b/dir.c
@@ -350,6 +350,12 @@ static int excluded_1(const char *pathname,
 			int to_exclude = x->to_exclude;
 
 			if (x->flags & EXC_FLAG_MUSTBEDIR) {
+				if (!dtype) {
+					if (!prefixcmp(pathname, exclude))
+						return to_exclude;
+					else
+						continue;
+				}
 				if (*dtype == DT_UNKNOWN)
 					*dtype = get_dtype(NULL, pathname, pathlen);
 				if (*dtype != DT_DIR)

-- 
1.6.3.GIT