summaryrefslogtreecommitdiff
path: root/grep.c
diff options
context:
space:
mode:
authorBrian Collins <bricollins@gmail.com>2009-11-06 09:22:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-17 00:06:46 (GMT)
commit5183bf67278ce5a0da9779d74f05169beac219b8 (patch)
tree3ff2119ec35588228c723069b1f21b061ac1c18d /grep.c
parent78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff)
downloadgit-5183bf67278ce5a0da9779d74f05169beac219b8.zip
git-5183bf67278ce5a0da9779d74f05169beac219b8.tar.gz
git-5183bf67278ce5a0da9779d74f05169beac219b8.tar.bz2
grep: Allow case insensitive search of fixed-strings
"git grep" currently an error when you combine the -F and -i flags. This isn't in line with how GNU grep handles it. This patch allows the simultaneous use of those flags. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Brian Collins <bricollins@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'grep.c')
-rw-r--r--grep.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/grep.c b/grep.c
index 5d162da..bdadf2c 100644
--- a/grep.c
+++ b/grep.c
@@ -41,6 +41,7 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
int err;
p->word_regexp = opt->word_regexp;
+ p->ignore_case = opt->ignore_case;
if (opt->fixed || is_fixed(p->pattern))
p->fixed = 1;
@@ -262,9 +263,15 @@ static void show_name(struct grep_opt *opt, const char *name)
printf("%s%c", name, opt->null_following_name ? '\0' : '\n');
}
-static int fixmatch(const char *pattern, char *line, regmatch_t *match)
+
+static int fixmatch(const char *pattern, char *line, int ignore_case, regmatch_t *match)
{
- char *hit = strstr(line, pattern);
+ char *hit;
+ if (ignore_case)
+ hit = strcasestr(line, pattern);
+ else
+ hit = strstr(line, pattern);
+
if (!hit) {
match->rm_so = match->rm_eo = -1;
return REG_NOMATCH;
@@ -326,7 +333,7 @@ static int match_one_pattern(struct grep_pat *p, char *bol, char *eol,
again:
if (p->fixed)
- hit = !fixmatch(p->pattern, bol, pmatch);
+ hit = !fixmatch(p->pattern, bol, p->ignore_case, pmatch);
else
hit = !regexec(&p->regexp, bol, 1, pmatch, eflags);