Applied patch from Mark Ferrell <mferrell@mvista.com> to fix sed '1,$p' where

sed was only printing the first line and then exiting.
This commit is contained in:
Mark Whitley 2000-08-10 00:09:47 +00:00
parent adbf018dc4
commit 40406e6bad
2 changed files with 4 additions and 4 deletions

View File

@ -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);
}

4
sed.c
View File

@ -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);
}