commit edc806507cb3db0790b27cb76c47050b57028c4b
author Matt Kraai <kraai@debian.org> Tue May 22 14:29:27 2001 +0000
committer Matt Kraai <kraai@debian.org> Tue May 22 14:29:27 2001 +0000
tree 981ed796e53dbfdc1c4c8a47650474c1e224b756
parent 117231c44f2a6b25b211322b61b192d788917c84

Fixed extra -- lines (noted by Christophe Boyanique).

findutils/grep.c

diff --git a/findutils/grep.c b/findutils/grep.c
index 061462e..07646e0 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -60,7 +60,8 @@
 {
 #ifdef BB_FEATURE_GREP_CONTEXT
 	/* possibly print the little '--' seperator */
-	if (last_line_printed && last_line_printed < linenum - 1) {
+	if ((lines_before || lines_after) && last_line_printed &&
+			last_line_printed < linenum - 1) {
 		puts("--");
 	}
 	last_line_printed = linenum;

grep.c

diff --git a/grep.c b/grep.c
index 061462e..07646e0 100644
--- a/grep.c
+++ b/grep.c
@@ -60,7 +60,8 @@
 {
 #ifdef BB_FEATURE_GREP_CONTEXT
 	/* possibly print the little '--' seperator */
-	if (last_line_printed && last_line_printed < linenum - 1) {
+	if ((lines_before || lines_after) && last_line_printed &&
+			last_line_printed < linenum - 1) {
 		puts("--");
 	}
 	last_line_printed = linenum;