BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

1_00_stable_10817
Matt Kraai 2001-05-22 14:29:27 +00:00
parent 117231c44f
commit edc806507c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
findutils/grep.c
View File

@ -60,7 +60,8 @@ static void print_line(const char *line, int linenum, char decoration)
{ {
#ifdef BB_FEATURE_GREP_CONTEXT #ifdef BB_FEATURE_GREP_CONTEXT
/* possibly print the little '--' seperator */ /* 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("--"); puts("--");
} }
last_line_printed = linenum; last_line_printed = linenum;

3
grep.c
View File

@ -60,7 +60,8 @@ static void print_line(const char *line, int linenum, char decoration)
{ {
#ifdef BB_FEATURE_GREP_CONTEXT #ifdef BB_FEATURE_GREP_CONTEXT
/* possibly print the little '--' seperator */ /* 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("--"); puts("--");
} }
last_line_printed = linenum; last_line_printed = linenum;