diff --git a/NEWS b/NEWS index 1cb3c28a1..086da03ae 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,13 @@ GNU coreutils NEWS -*- outline -*- All files would be processed correctly, but the exit status was incorrect. [bug introduced in coreutils-9.0] +** Changes in behavior + + timeout --foreground --kill-after=... will now exit with status 137 + if the kill signal was sent, which is consistent with the behaviour + when the --foreground option is not specified. This allows users to + distinguish if the command was more forcefully terminated. + * Noteworthy changes in release 9.0 (2021-09-24) [stable] diff --git a/doc/coreutils.texi b/doc/coreutils.texi index e3ecbdcf8..02aae4ef4 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -18326,9 +18326,6 @@ exit status 137, regardless of whether that signal is sent to @var{command} or to @command{timeout} itself, i.e., these cases cannot be distinguished. In the latter case, the @var{command} process may still be alive after @command{timeout} has forcefully been terminated. -However if the @option{--foreground} option is specified then -@command{timeout} will not send any signals to its own process, -and so it will exit with one of the other exit status values detailed above. Examples: diff --git a/src/timeout.c b/src/timeout.c index 34d792640..650563461 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -593,6 +593,11 @@ main (int argc, char **argv) unblock_signal (sig); raise (sig); } + /* Allow users to distinguish if command was forcably killed. + Needed with --foreground where we don't send SIGKILL to + the timeout process itself. */ + if (timed_out && sig == SIGKILL) + preserve_status = true; status = sig + 128; /* what sh returns for signaled processes. */ } else diff --git a/tests/misc/timeout.sh b/tests/misc/timeout.sh index 44ca450d8..295a95773 100755 --- a/tests/misc/timeout.sh +++ b/tests/misc/timeout.sh @@ -42,7 +42,10 @@ returns_ 124 timeout --preserve-status .1 sleep 10 && fail=1 # kill delay. Note once the initial timeout triggers, # the exit status will be 124 even if the command # exits on its own accord. +# exit status should be 128+KILL returns_ 124 timeout -s0 -k1 .1 sleep 10 && fail=1 +# Ensure a consistent exit status with --foreground +returns_ 124 timeout --foreground -s0 -k1 .1 sleep 10 && fail=1 # Ensure 'timeout' is immune to parent's SIGCHLD handler # Use a subshell and an exec to work around a bug in FreeBSD 5.0 /bin/sh.