aboutsummaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-05-19 16:07:51 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-19 16:14:50 -0700
commit3c6a370b0ee78114a656acba04fddf306252b9d5 (patch)
tree730ab88db53dcf8207d0ca4b163d9f07e2c367d0 /dir.c
parent8dcf39c46e2931ca02b18b1ea3a6b21f446d8de8 (diff)
downloadgit-3c6a370b0ee78114a656acba04fddf306252b9d5.tar.gz
git-3c6a370b0ee78114a656acba04fddf306252b9d5.tar.xz
Move pathspec matching from builtin-add.c into dir.c
I'll use it for builtin-rm.c too. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c80
1 files changed, 80 insertions, 0 deletions
diff --git a/dir.c b/dir.c
index d40b62e1c..d778ecd89 100644
--- a/dir.c
+++ b/dir.c
@@ -11,6 +11,86 @@
#include "cache.h"
#include "dir.h"
+int common_prefix(const char **pathspec)
+{
+ const char *path, *slash, *next;
+ int prefix;
+
+ if (!pathspec)
+ return 0;
+
+ path = *pathspec;
+ slash = strrchr(path, '/');
+ if (!slash)
+ return 0;
+
+ prefix = slash - path + 1;
+ while ((next = *++pathspec) != NULL) {
+ int len = strlen(next);
+ if (len >= prefix && !memcmp(path, next, len))
+ continue;
+ for (;;) {
+ if (!len)
+ return 0;
+ if (next[--len] != '/')
+ continue;
+ if (memcmp(path, next, len+1))
+ continue;
+ prefix = len + 1;
+ break;
+ }
+ }
+ return prefix;
+}
+
+static int match_one(const char *match, const char *name, int namelen)
+{
+ int matchlen;
+
+ /* If the match was just the prefix, we matched */
+ matchlen = strlen(match);
+ if (!matchlen)
+ return 1;
+
+ /*
+ * If we don't match the matchstring exactly,
+ * we need to match by fnmatch
+ */
+ if (strncmp(match, name, matchlen))
+ return !fnmatch(match, name, 0);
+
+ /*
+ * If we did match the string exactly, we still
+ * need to make sure that it happened on a path
+ * component boundary (ie either the last character
+ * of the match was '/', or the next character of
+ * the name was '/' or the terminating NUL.
+ */
+ return match[matchlen-1] == '/' ||
+ name[matchlen] == '/' ||
+ !name[matchlen];
+}
+
+int match_pathspec(const char **pathspec, const char *name, int namelen, int prefix, char *seen)
+{
+ int retval;
+ const char *match;
+
+ name += prefix;
+ namelen -= prefix;
+
+ for (retval = 0; (match = *pathspec++) != NULL; seen++) {
+ if (retval & *seen)
+ continue;
+ match += prefix;
+ if (match_one(match, name, namelen)) {
+ retval = 1;
+ *seen = 1;
+ }
+ }
+ return retval;
+}
+
void add_exclude(const char *string, const char *base,
int baselen, struct exclude_list *which)
{