summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-07-31 23:18:49 +0000
committerEric Andersen2001-07-31 23:18:49 +0000
commit00344431402703089c6b93f6119f9966cc7ba566 (patch)
tree168e32bc0921e40feb47f26326b50f4885b05131
parentaf6b40a1ea1376ba1a17b877c9320f398bc6d01a (diff)
downloadbusybox-00344431402703089c6b93f6119f9966cc7ba566.zip
busybox-00344431402703089c6b93f6119f9966cc7ba566.tar.gz
Fix behavior of grep -lc to match GNU grep. SuS2 is ambiguous
on the correct behavior, so acting like GNU grep seems best -Erik
-rw-r--r--findutils/grep.c5
-rw-r--r--grep.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/findutils/grep.c b/findutils/grep.c
index 03cc9f8..3254868 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -179,7 +179,10 @@ static void grep_file(FILE *file)
if (print_match_counts) {
if (print_filename)
printf("%s:", cur_file);
- printf("%d\n", nmatches);
+ if (print_files_with_matches && nmatches > 0)
+ printf("1\n");
+ else
+ printf("%d\n", nmatches);
}
/* grep -l: print just the filename, but only if we grepped the line in the file */
diff --git a/grep.c b/grep.c
index 03cc9f8..3254868 100644
--- a/grep.c
+++ b/grep.c
@@ -179,7 +179,10 @@ static void grep_file(FILE *file)
if (print_match_counts) {
if (print_filename)
printf("%s:", cur_file);
- printf("%d\n", nmatches);
+ if (print_files_with_matches && nmatches > 0)
+ printf("1\n");
+ else
+ printf("%d\n", nmatches);
}
/* grep -l: print just the filename, but only if we grepped the line in the file */