aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Whitley <markw@lineo.com>2000-08-10 00:09:47 +0000
committerMark Whitley <markw@lineo.com>2000-08-10 00:09:47 +0000
commit40406e6bad9abcd58977ed92194c9061d85c9e47 (patch)
tree305a296c9ea3827ed2a9a42e21c9dc67d4abae2e
parentadbf018dc469d808fc0ca77f91bf37a871219d97 (diff)
downloadbusybox-40406e6bad9abcd58977ed92194c9061d85c9e47.tar.gz
Applied patch from Mark Ferrell <mferrell@mvista.com> to fix sed '1,$p' where
sed was only printing the first line and then exiting.
-rw-r--r--editors/sed.c4
-rw-r--r--sed.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/editors/sed.c b/editors/sed.c
index 665471913..60b1e8d2e 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -639,8 +639,8 @@ static void process_file(FILE *file)
}
/* are we acting on a range of line numbers? */
- else if (sed_cmds[i].beg_line > 0 && sed_cmds[i].end_line > 0) {
- if (linenum >= sed_cmds[i].beg_line && linenum <= sed_cmds[i].end_line)
+ else if (sed_cmds[i].beg_line > 0 && sed_cmds[i].end_line != 0) {
+ if (linenum >= sed_cmds[i].beg_line && (sed_cmds[i].end_line == -1 || linenum <= sed_cmds[i].end_line))
line_altered += do_sed_command(&sed_cmds[i], line);
}
diff --git a/sed.c b/sed.c
index 665471913..60b1e8d2e 100644
--- a/sed.c
+++ b/sed.c
@@ -639,8 +639,8 @@ static void process_file(FILE *file)
}
/* are we acting on a range of line numbers? */
- else if (sed_cmds[i].beg_line > 0 && sed_cmds[i].end_line > 0) {
- if (linenum >= sed_cmds[i].beg_line && linenum <= sed_cmds[i].end_line)
+ else if (sed_cmds[i].beg_line > 0 && sed_cmds[i].end_line != 0) {
+ if (linenum >= sed_cmds[i].beg_line && (sed_cmds[i].end_line == -1 || linenum <= sed_cmds[i].end_line))
line_altered += do_sed_command(&sed_cmds[i], line);
}