diff options
Diffstat (limited to '')
| -rw-r--r-- | src/timeout.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/timeout.c b/src/timeout.c index 6d9d10912..7b0f1d7c5 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -73,12 +73,6 @@ #define AUTHORS proper_name_utf8 ("Padraig Brady", "P\303\241draig Brady") -/* Note ETIMEDOUT is 110 on GNU/Linux systems but this is non standard */ -#define EXIT_TIMEDOUT 124 - -/* Internal failure. */ -#define EXIT_CANCELED 125 - static int timed_out; static int term_signal = SIGTERM; /* same default as kill command. */ static int monitored_pid; @@ -153,13 +147,12 @@ Mandatory arguments to long options are mandatory for short options too.\n\ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\n\ -If the command times out, then we exit with status 124,\n\ -otherwise the normal exit status of the command is returned.\n\ -If no signal is specified, the TERM signal is sent. The TERM signal\n\ -will kill processes which do not catch this signal. For other processes,\n\ -it may be necessary to use the KILL (9) signal, since this signal cannot\n\ -be caught.\n"), stdout); - emit_bug_reporting_address (); +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); + emit_ancillary_info (); } exit (status); } |