d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct boundary condition error in D' and P' commands when the last

Browse Source 
line of the pattern space is empty. Don't emit spurious newline when
EOF is reached with the `N' command.

Pointed out by:	Oleg Osyka
MFC after:	1 week
This commit is contained in:
Tim J. Robbins 2002-08-11 09:53:44 +00:00
parent 6854d13abc
commit 13ee49d316
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/sed/process.c
View File

@ -137,7 +137,7 @@ redirect:
if (pd)
goto new;
if (psl == 0 ||
(p = memchr(ps, '\n', psl - 1)) == NULL) {
(p = memchr(ps, '\n', psl)) == NULL) {
pd = 1;
goto new;
} else {
@ -176,11 +176,8 @@ redirect:
case 'N':
flush_appends();
cspace(&PS, "\n", 1, 0);
if (!mf_fgets(&PS, 0)) {
if (!nflag && !pd)
OUT(ps)
if (!mf_fgets(&PS, 0))
exit(0);
}
break;
case 'p':
if (pd)
@ -191,7 +188,7 @@ redirect:
if (pd)
break;
if (psl != 0 &&
(p = memchr(ps, '\n', psl - 1)) != NULL) {
(p = memchr(ps, '\n', psl)) != NULL) {
oldpsl = psl;
psl = p - ps;
}