summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodrigo Campos <rodrigo@sdfg.com.ar>2012-02-29 11:36:18 -0300
committerPádraig Brady <P@draigBrady.com>2012-02-29 15:41:15 +0000
commit4724cd8fe8c76039ef219f350e29179fa66fd2fc (patch)
tree499444d1238d50e696e1a1484f42f90368ea2d54
parent409a7cc7ea877399d10ff15d875c68bd5edc3288 (diff)
downloadcoreutils-4724cd8fe8c76039ef219f350e29179fa66fd2fc.tar.xz
doc: timeout: document the exit status when run with "-s KILL"
* src/timeout.c (usage): Document the exit status for this case, in --help and thus in the man page. Word so that it covers both the -s9 and -k options. * doc/coreutils.texi (timeout invocation): Document the exit status for this case.
-rw-r--r--doc/coreutils.texi1
-rw-r--r--src/timeout.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 0d252fcda..4a4cadbcb 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -15940,6 +15940,7 @@ Exit status:
125 if @command{timeout} itself fails
126 if @var{command} is found but cannot be invoked
127 if @var{command} cannot be found
+137 if @var{command} is sent the KILL(9) signal (128+9)
the exit status of @var{command} otherwise
@end display
diff --git a/src/timeout.c b/src/timeout.c
index 73367c429..c0a252748 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -236,7 +236,8 @@ If the command times out, then exit with status 124. Otherwise, exit\n\
with the status of COMMAND. If no signal is specified, send the TERM\n\
signal upon timeout. The TERM signal kills any process that does not\n\
block or catch that signal. For other processes, it may be necessary to\n\
-use the KILL (9) signal, since this signal cannot be caught.\n"), stdout);
+use the KILL (9) signal, since this signal cannot be caught. If the\n\
+KILL (9) signal is sent, the exit status is 128+9 rather than 124.\n"), stdout);
emit_ancillary_info ();
}
exit (status);