summaryrefslogtreecommitdiff
path: root/grep.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2009-01-17 15:50:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-18 02:30:37 (GMT)
commit8cc32992624ed4140fb136d98675f0f19b20ba09 (patch)
tree4b6b3164c5fd4dce658f5b08c86cc337853d7373 /grep.c
parentc841aa8b903200f5d7830c7c4ab8d62b5ef44c5c (diff)
downloadgit-8cc32992624ed4140fb136d98675f0f19b20ba09.zip
git-8cc32992624ed4140fb136d98675f0f19b20ba09.tar.gz
git-8cc32992624ed4140fb136d98675f0f19b20ba09.tar.bz2
Change NUL char handling of isspecial()
Replace isspecial() by the new macro is_glob_special(), which is more, well, specialized. The former included the NUL char in its character class, while the letter only included characters that are special to file name globbing. The new name contains underscores because they enhance readability considerably now that it's made up of three words. Renaming the function is necessary to document its changed scope. The call sites of isspecial() are updated to check explicitly for NUL. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'grep.c')
-rw-r--r--grep.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/grep.c b/grep.c
index 6485760..f9a4525 100644
--- a/grep.c
+++ b/grep.c
@@ -30,8 +30,9 @@ void append_grep_pattern(struct grep_opt *opt, const char *pat,
static int isregexspecial(int c)
{
- return isspecial(c) || c == '$' || c == '(' || c == ')' || c == '+' ||
- c == '.' || c == '^' || c == '{' || c == '|';
+ return c == '\0' || is_glob_special(c) ||
+ c == '$' || c == '(' || c == ')' || c == '+' ||
+ c == '.' || c == '^' || c == '{' || c == '|';
}
static int is_fixed(const char *s)