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

sh: Fix signal messages being sent to the wrong file sometimes.

Browse Source 
When a foreground job exits on a signal, a message is printed to stdout
about this. The buffer was not flushed after this which could result in the
message being written to the wrong file if the next command was a builtin
and had stdout redirected.

Example:
  sh -c 'kill -9 $$'; : > foo; echo FOO:; cat foo

Reported by:	gcooper
MFC after:	1 week
This commit is contained in:
jilles 2011-01-18 21:18:31 +00:00
parent a21f29df61
commit 460d7b088e
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/sh/jobs.c
View File

@ -1062,6 +1062,7 @@ dowait(int block, struct job *job)
if (coredump)
out1str(" (core dumped)");
out1c('\n');
flushout(out1);
}
} else {
TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job));

8
tools/regression/bin/sh/execution/killed1.0 Normal file
View File

@ -0,0 +1,8 @@
# $FreeBSD$
# Sometimes the "Killed" message is not flushed soon enough and it
# is redirected along with the output of a builtin.
# Do not change the semicolon to a newline as it would hide the bug.
exec 3>&1
exec >/dev/null 2>&1
${SH} -c 'kill -9 $$'; : >&3 2>&3