mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-17 22:44:49 +01:00
Code Activity

Merge branch 'jc/grep' into next

Browse source 
* jc/grep:
  builtin-grep: unparse more command line options.
This commit is contained in:
Junio C Hamano 2006-05-15 13:51:35 -07:00
commit baee9207b9
1 changed files with 58 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
builtin-grep.c
View file

@ -437,24 +437,73 @@ static int exec_grep(int argc, const char **argv)
} }
#define MAXARGS 1000 #define MAXARGS 1000
#define ARGBUF 4096
#define push_arg(a) do { \
if (nr < MAXARGS) argv[nr++] = (a); \
else die("maximum number of args exceeded"); \
} while (0)
static int external_grep(struct grep_opt *opt, const char **paths, int cached) static int external_grep(struct grep_opt *opt, const char **paths, int cached)
{ {
int i, nr, argc, hit; int i, nr, argc, hit, len;
const char *argv[MAXARGS+1]; const char *argv[MAXARGS+1];
char randarg[ARGBUF];
char *argptr = randarg;
struct grep_pat *p; struct grep_pat *p;
nr = 0; len = nr = 0;
argv[nr++] = "grep"; push_arg("grep");
push_arg("-H");
if (opt->fixed)
push_arg("-H");
if (opt->linenum)
push_arg("-n");
if (opt->regflags & REG_EXTENDED)
push_arg("-E");
if (opt->word_regexp) if (opt->word_regexp)
argv[nr++] = "-w"; push_arg("-w");
if (opt->name_only) if (opt->name_only)
argv[nr++] = "-l"; push_arg("-l");
for (p = opt->pattern_list; p; p = p->next) { if (opt->unmatch_name_only)
argv[nr++] = "-e"; push_arg("-L");
argv[nr++] = p->pattern; if (opt->count)
push_arg("-c");
if (opt->post_context || opt->pre_context) {
if (opt->post_context != opt->pre_context) {
if (opt->pre_context) {
push_arg("-B");
len += snprintf(argptr, sizeof(randarg)-len,
"%u", opt->pre_context);
if (sizeof(randarg) <= len)
die("maximum length of args exceeded");
push_arg(argptr);
argptr += len;
} }
argv[nr++] = "--"; if (opt->post_context) {
push_arg("-A");
len += snprintf(argptr, sizeof(randarg)-len,
"%u", opt->post_context);
if (sizeof(randarg) <= len)
die("maximum length of args exceeded");
push_arg(argptr);
argptr += len;
}
}
else {
push_arg("-C");
len += snprintf(argptr, sizeof(randarg)-len,
"%u", opt->post_context);
if (sizeof(randarg) <= len)
die("maximum length of args exceeded");
push_arg(argptr);
argptr += len;
}
}
for (p = opt->pattern_list; p; p = p->next) {
push_arg("-e");
push_arg(p->pattern);
}
push_arg("--");
hit = 0; hit = 0;
argc = nr; argc = nr;