mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/grep' into next

Browse Source 
* jc/grep:
  builtin-grep: -F (--fixed-strings)
  builtin-grep: -w fix
  builtin-grep: typofix
This commit is contained in:
Junio C Hamano
2006-05-09 18:29:55 -07:00
parent 07c747ee18 07ea91d84f
commit dab809862f
2 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-grep.txt
View File

@ -12,7 +12,7 @@ SYNOPSIS
'git-grep' [--cached] 'git-grep' [--cached]
[-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp] [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp]
[-v | --invert-match] [-v | --invert-match]
[-E | --extended-regexp] [-G | --basic-regexp] [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings]
[-n] [-l | --files-with-matches] [-L | --files-without-match] [-n] [-l | --files-with-matches] [-L | --files-without-match]
[-c | --count] [-c | --count]
[-A <post-context>] [-B <pre-context>] [-C <context>] [-A <post-context>] [-B <pre-context>] [-C <context>]

44
builtin-grep.c
View File

@ -98,6 +98,7 @@ struct grep_opt {
unsigned unmatch_name_only:1; unsigned unmatch_name_only:1;
unsigned count:1; unsigned count:1;
unsigned word_regexp:1; unsigned word_regexp:1;
unsigned fixed:1;
#define GREP_BINARY_DEFAULT 0 #define GREP_BINARY_DEFAULT 0
#define GREP_BINARY_NOMATCH 1 #define GREP_BINARY_NOMATCH 1
#define GREP_BINARY_TEXT 2 #define GREP_BINARY_TEXT 2
@ -179,6 +180,20 @@ static int buffer_is_binary(const char *ptr, unsigned long size)
return 0; return 0;
} }
static int fixmatch(const char *pattern, char *line, regmatch_t *match)
{
char *hit = strstr(line, pattern);
if (!hit) {
match->rm_so = match->rm_eo = -1;
return REG_NOMATCH;
}
else {
match->rm_so = hit - line;
match->rm_eo = match->rm_so + strlen(pattern);
return 0;
}
}
static int grep_buffer(struct grep_opt *opt, const char *name, static int grep_buffer(struct grep_opt *opt, const char *name,
char *buf, unsigned long size) char *buf, unsigned long size)
{ {
@ -224,9 +239,14 @@ static int grep_buffer(struct grep_opt *opt, const char *name,
*eol = 0; *eol = 0;
for (p = opt->pattern_list; p; p = p->next) { for (p = opt->pattern_list; p; p = p->next) {
regex_t *exp = &p->regexp; if (!opt->fixed) {
hit = !regexec(exp, bol, ARRAY_SIZE(pmatch), regex_t *exp = &p->regexp;
pmatch, 0); hit = !regexec(exp, bol, ARRAY_SIZE(pmatch),
pmatch, 0);
}
else {
hit = !fixmatch(p->pattern, bol, pmatch);
}
if (hit && opt->word_regexp) { if (hit && opt->word_regexp) {
/* Match beginning must be either /* Match beginning must be either
@ -241,10 +261,10 @@ static int grep_buffer(struct grep_opt *opt, const char *name,
die("regexp returned nonsense"); die("regexp returned nonsense");
if (pmatch[0].rm_so != 0 && if (pmatch[0].rm_so != 0 &&
word_char(bol[pmatch[0].rm_so-1])) word_char(bol[pmatch[0].rm_so-1]))
continue; /* not a word boundary */ hit = 0;
if ((eol-bol) < pmatch[0].rm_eo && if (pmatch[0].rm_eo != (eol-bol) &&
word_char(bol[pmatch[0].rm_eo])) word_char(bol[pmatch[0].rm_eo]))
continue; /* not a word boundary */ hit = 0;
} }
if (hit) if (hit)
break; break;
@ -549,6 +569,11 @@ int cmd_grep(int argc, const char **argv, char **envp)
opt.regflags |= REG_EXTENDED; opt.regflags |= REG_EXTENDED;
continue; continue;
} }
if (!strcmp("-F", arg) ||
!strcmp("--fixed-strings", arg)) {
opt.fixed = 1;
continue;
}
if (!strcmp("-G", arg) || if (!strcmp("-G", arg) ||
!strcmp("--basic-regexp", arg)) { !strcmp("--basic-regexp", arg)) {
opt.regflags &= ~REG_EXTENDED; opt.regflags &= ~REG_EXTENDED;
@ -674,7 +699,10 @@ int cmd_grep(int argc, const char **argv, char **envp)
if (!opt.pattern_list) if (!opt.pattern_list)
die("no pattern given."); die("no pattern given.");
compile_patterns(&opt); if ((opt.regflags != REG_NEWLINE) && opt.fixed)
die("cannot mix --fixed-strings and regexp");
if (!opt.fixed)
compile_patterns(&opt);
/* Check revs and then paths */ /* Check revs and then paths */
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
@ -701,7 +729,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
/* The rest are paths */ /* The rest are paths */
if (!seen_dashdash) { if (!seen_dashdash) {
int j; int j;
for (j = i; j < argc; i++) for (j = i; j < argc; j++)
verify_filename(prefix, argv[j]); verify_filename(prefix, argv[j]);
} }