aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kraai <kraai@debian.org>2001-05-22 14:29:27 +0000
committerMatt Kraai <kraai@debian.org>2001-05-22 14:29:27 +0000
commitedc806507cb3db0790b27cb76c47050b57028c4b (patch)
tree981ed796e53dbfdc1c4c8a47650474c1e224b756
parent117231c44f2a6b25b211322b61b192d788917c84 (diff)
downloadbusybox-edc806507cb3db0790b27cb76c47050b57028c4b.tar.gz
Fixed extra -- lines (noted by Christophe Boyanique).
-rw-r--r--findutils/grep.c3
-rw-r--r--grep.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/findutils/grep.c b/findutils/grep.c
index 061462ebc..07646e02a 100644
--- 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 061462ebc..07646e02a 100644
--- 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;