summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b8d0f5a)
raw | patch | inline | side by side (parent: b8d0f5a)
author | Junio C Hamano <junkio@cox.net> | |
Thu, 4 May 2006 04:46:29 +0000 (21:46 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 4 May 2006 04:46:29 +0000 (21:46 -0700) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-grep.c | patch | blob | history |
diff --git a/builtin-grep.c b/builtin-grep.c
index 0d6115763bf3c9f409518daa000f51951a7f0c95..c89ee33a1ede4e032cae850315ee2b2185a64457 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
unsigned linenum:1;
unsigned invert:1;
unsigned name_only:1;
+ unsigned unmatch_name_only:1;
unsigned count:1;
unsigned word_regexp:1;
#define GREP_BINARY_DEFAULT 0
*/
if (opt->invert)
hit = !hit;
+ if (opt->unmatch_name_only) {
+ if (hit)
+ return 0;
+ goto next_line;
+ }
if (hit) {
count++;
if (binary_match_only) {
prev->bol = bol;
prev->eol = eol;
}
+
+ next_line:
*eol = ch;
bol = eol + 1;
if (!left)
left--;
lno++;
}
+
+ if (opt->unmatch_name_only) {
+ /* We did not see any hit, so we want to show this */
+ printf("%s\n", name);
+ return 1;
+ }
+
/* NEEDSWORK:
* The real "grep -c foo *.c" gives many "bar.c:0" lines,
* which feels mostly useless but sometimes useful. Maybe
opt.name_only = 1;
continue;
}
+ if (!strcmp("-L", arg) ||
+ !strcmp("--files-without-match", arg)) {
+ opt.unmatch_name_only = 1;
+ continue;
+ }
if (!strcmp("-c", arg) ||
!strcmp("--count", arg)) {
opt.count = 1;