From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Mon, 15 Sep 2003 06:12:53 +0000 (-0000)
Subject: A test and fix for the sed 'n' command
X-Git-Tag: 1_00_pre4~180
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6e5687abc3732fac6d8a43a324b8f284f7a5482d;p=oweals%2Fbusybox.git

A test and fix for the sed 'n' command
---

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