summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-22 00:51:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-22 00:51:03 (GMT)
commitd9fde065bd808fbbad3b53e10e160c8f8193b577 (patch)
treeaeae85b30e694dd7d23a7eb120a499055f147038 /dir.c
parent1afcde6da1221bdb85a3630d995f9ca384042cb9 (diff)
parentf9b7cce61cbd19c99e89b859b5909f0741111185 (diff)
downloadgit-d9fde065bd808fbbad3b53e10e160c8f8193b577.zip
git-d9fde065bd808fbbad3b53e10e160c8f8193b577.tar.gz
git-d9fde065bd808fbbad3b53e10e160c8f8193b577.tar.bz2
Merge branch 'rs/ctype'
* rs/ctype: Add is_regex_special() Change NUL char handling of isspecial() Reformat ctype.c Add ctype test Conflicts: Makefile
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dir.c b/dir.c
index 7c59829..d55a41a 100644
--- a/dir.c
+++ b/dir.c
@@ -75,7 +75,7 @@ static int match_one(const char *match, const char *name, int namelen)
for (;;) {
unsigned char c1 = *match;
unsigned char c2 = *name;
- if (isspecial(c1))
+ if (c1 == '\0' || is_glob_special(c1))
break;
if (c1 != c2)
return 0;
@@ -678,7 +678,7 @@ static int simple_length(const char *match)
for (;;) {
unsigned char c = *match++;
len++;
- if (isspecial(c))
+ if (c == '\0' || is_glob_special(c))
return len;
}
}