git-grep: use a bit more specific error messages.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jul 4, 2006 at 02:44 UTC
088b084bbbb7c076a85db941ad60edce582017b4
1 file changed
+11
-4
builtin-grep.c
+11
-4
@@ -657,6 +657,13 @@ static int grep_object(struct grep_opt *opt, const char **paths,
657
static const char builtin_grep_usage[] =
658
"git-grep <option>* <rev>* [-e] <pattern> [<path>...]";
659
660
+static const char emsg_invalid_context_len[] =
661
+"%s: invalid context length argument";
662
+static const char emsg_missing_context_len[] =
663
+"missing context length argument";
664
+static const char emsg_missing_argument[] =
665
+"option requires an argument -%s";
666
+
667
int cmd_grep(int argc, const char **argv, char **envp)
668
{
669
int hit = 0;
@@ -764,7 +771,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
771
case 'A': case 'B': case 'C':
772
if (!arg[2]) {
773
if (argc <= 1)
767
- usage(builtin_grep_usage);
774
+ die(emsg_missing_context_len);
775
scan = *++argv;
776
argc--;
777
}
@@ -776,7 +783,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
783
break;
784
}
785
if (sscanf(scan, "%u", &num) != 1)
779
- usage(builtin_grep_usage);
786
+ die(emsg_invalid_context_len, scan);
787
switch (arg[1]) {
788
case 'A':
789
opt.post_context = num;
@@ -795,7 +802,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
802
int lno = 0;
803
char buf[1024];
804
if (argc <= 1)
798
- usage(builtin_grep_usage);
805
+ die(emsg_missing_argument, arg);
806
patterns = fopen(argv[1], "r");
807
if (!patterns)
808
die("'%s': %s", argv[1], strerror(errno));
@@ -820,7 +827,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
827
argc--;
828
continue;
829
}
823
- usage(builtin_grep_usage);
830
+ die(emsg_missing_argument, arg);
831
}
832
if (!strcmp("--", arg)) {
833
/* later processing wants to have this at argv[1] */