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

diff --git a/findutils/grep.c b/findutils/grep.c
index 061462ebcbd763b19a36f4aa7211d2db0d61d570..07646e02afc2f06d9ec91047c7f70eaf72d75c99 100644 (file)
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -60,7 +60,8 @@ static void print_line(const char *line, int linenum, char decoration)
 {
 #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;

diff --git a/grep.c b/grep.c
index 061462ebcbd763b19a36f4aa7211d2db0d61d570..07646e02afc2f06d9ec91047c7f70eaf72d75c99 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -60,7 +60,8 @@ static void print_line(const char *line, int linenum, char decoration)
 {
 #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;