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

sh: Send messages about signals to stderr.

Browse Source 
This is required by POSIX and seems to make more sense.

See also r217557.
This commit is contained in:
Jilles Tjoelker 2011-01-30 22:57:52 +00:00
parent 77192fddeb
commit b9f696953d
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/sh/jobs.c
View File

@ -1056,13 +1056,13 @@ dowait(int block, struct job *job)
} }
if (sig > 0 && sig != SIGINT && sig != SIGPIPE) { if (sig > 0 && sig != SIGINT && sig != SIGPIPE) {
if (sig < sys_nsig && sys_siglist[sig]) if (sig < sys_nsig && sys_siglist[sig])
out1str(sys_siglist[sig]); out2str(sys_siglist[sig]);
else else
out1fmt("Signal %d", sig); outfmt(out2, "Signal %d", sig);
if (coredump) if (coredump)
out1str(" (core dumped)"); out2str(" (core dumped)");
out1c('\n'); out2c('\n');
flushout(out1); flushout(out2);
} }
} else { } else {
TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job)); TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job));

10
tools/regression/bin/sh/execution/killed2.0 Normal file
View File

@ -0,0 +1,10 @@
# $FreeBSD$
# Most shells print a message when a foreground job is killed by a signal.
# POSIX allows this, provided the message is sent to stderr, not stdout.
# Some trickery is needed to capture the message as redirecting stderr of
# the command itself does not affect it. The colon command ensures that
# the subshell forks for ${SH}.
exec 3>&1
r=`(${SH} -c 'kill $$'; :) 2>&1 >&3`
[ -n "$r" ]