undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/grepfix'

Browse Source 
* jc/grepfix:
  git-grep: use a bit more specific error messages.
  git-grep: fix exit code when we use external grep.
  git-grep: fix parsing of pathspec separator '--'
This commit is contained in:
Junio C Hamano 2006-07-05 16:25:32 -07:00
commit 169c2e9d1e
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
builtin-grep.c
View File

@ -446,7 +446,7 @@ static int exec_grep(int argc, const char **argv)
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, len; int i, nr, argc, hit, len, status;
const char *argv[MAXARGS+1]; const char *argv[MAXARGS+1];
char randarg[ARGBUF]; char randarg[ARGBUF];
char *argptr = randarg; char *argptr = randarg;
@ -536,12 +536,17 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
argv[argc++] = name; argv[argc++] = name;
if (argc < MAXARGS) if (argc < MAXARGS)
continue; continue;
hit += exec_grep(argc, argv); status = exec_grep(argc, argv);
if (0 < status)
hit = 1;
argc = nr; argc = nr;
} }
if (argc > nr) if (argc > nr) {
hit += exec_grep(argc, argv); status = exec_grep(argc, argv);
return 0; if (0 < status)
hit = 1;
}
return hit;
} }
static int grep_cache(struct grep_opt *opt, const char **paths, int cached) static int grep_cache(struct grep_opt *opt, const char **paths, int cached)
@ -652,6 +657,13 @@ static int grep_object(struct grep_opt *opt, const char **paths,
static const char builtin_grep_usage[] = static const char builtin_grep_usage[] =
"git-grep <option>* <rev>* [-e] <pattern> [<path>...]"; "git-grep <option>* <rev>* [-e] <pattern> [<path>...]";
static const char emsg_invalid_context_len[] =
"%s: invalid context length argument";
static const char emsg_missing_context_len[] =
"missing context length argument";
static const char emsg_missing_argument[] =
"option requires an argument -%s";
int cmd_grep(int argc, const char **argv, char **envp) int cmd_grep(int argc, const char **argv, char **envp)
{ {
int hit = 0; int hit = 0;
@ -759,7 +771,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
case 'A': case 'B': case 'C': case 'A': case 'B': case 'C':
if (!arg[2]) { if (!arg[2]) {
if (argc <= 1) if (argc <= 1)
usage(builtin_grep_usage); die(emsg_missing_context_len);
scan = *++argv; scan = *++argv;
argc--; argc--;
} }
@ -771,7 +783,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
break; break;
} }
if (sscanf(scan, "%u", &num) != 1) if (sscanf(scan, "%u", &num) != 1)
usage(builtin_grep_usage); die(emsg_invalid_context_len, scan);
switch (arg[1]) { switch (arg[1]) {
case 'A': case 'A':
opt.post_context = num; opt.post_context = num;
@ -790,7 +802,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
int lno = 0; int lno = 0;
char buf[1024]; char buf[1024];
if (argc <= 1) if (argc <= 1)
usage(builtin_grep_usage); die(emsg_missing_argument, arg);
patterns = fopen(argv[1], "r"); patterns = fopen(argv[1], "r");
if (!patterns) if (!patterns)
die("'%s': %s", argv[1], strerror(errno)); die("'%s': %s", argv[1], strerror(errno));
@ -815,10 +827,14 @@ int cmd_grep(int argc, const char **argv, char **envp)
argc--; argc--;
continue; continue;
} }
usage(builtin_grep_usage); die(emsg_missing_argument, arg);
} }
if (!strcmp("--", arg)) if (!strcmp("--", arg)) {
/* later processing wants to have this at argv[1] */
argv--;
argc++;
break; break;
}
if (*arg == '-') if (*arg == '-')
usage(builtin_grep_usage); usage(builtin_grep_usage);