diff options
author | Glenn L McGrath <bug1@ihug.co.nz> | 2003-09-15 10:12:53 +0400 |
---|---|---|
committer | Glenn L McGrath <bug1@ihug.co.nz> | 2003-09-15 10:12:53 +0400 |
commit | 6e5687abc3732fac6d8a43a324b8f284f7a5482d (patch) | |
tree | a52bb068db8a2a021bca47a8b8c4b2c486dfc863 | |
parent | 7b3512129799fe07195d188133605fde5c8c6e75 (diff) |
A test and fix for the sed 'n' command
-rw-r--r-- | editors/sed.c | 8 | ||||
-rw-r--r-- | testsuite/sed/sed-next-line | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/editors/sed.c b/editors/sed.c index 00ed20892..8c77a0ffc 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -985,11 +985,19 @@ static void process_file(FILE * file) next_line = NULL; break; case 'n': /* Read next line from input */ + if (!be_quiet) { + puts(pattern_space); + } if (next_line) { free(pattern_space); pattern_space = next_line; next_line = bb_get_chomped_line_from_file(file); linenum++; + } else { + /* Jump to end of script and exist */ + deleted = 1; + free(next_line); + next_line = NULL; } break; case 'N': /* Append the next line to the current line */ diff --git a/testsuite/sed/sed-next-line b/testsuite/sed/sed-next-line new file mode 100644 index 000000000..38fe20cf2 --- /dev/null +++ b/testsuite/sed/sed-next-line @@ -0,0 +1,12 @@ +busybox sed 'n;p'>output <<EOF +a +b +c +EOF +cmp -s output - <<EOF +a +b +b +c +c +EOF |