bekucera/coreutils
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/coreutils.git synced 2025-09-10 07:59:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

timeout: handle signals more transparently

Browse Source 
* m4/jm-macros.m4: Define HAVE_SETRLIMIT.
* src/timeout.c: If the child exited with a signal,
raise that signal to the timeout process itself,
so that callers may also see the signal status.
Use setrlimit to disable core dumps for the timeout
process, which would be generated by some signals.
This commit is contained in:
Pádraig Brady
2011-07-08 14:49:05 +01:00
parent 4d90d29899
commit 5a647a05e2
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
m4/jm-macros.m4
View File

@@ -65,6 +65,8 @@ AC_DEFUN([coreutils_MACROS],
# Used by sort.c.
AC_CHECK_FUNCS_ONCE([nl_langinfo])
# Used by timeout.c
AC_CHECK_FUNCS_ONCE([setrlimit])
# Used by tail.c.
AC_CHECK_FUNCS([inotify_init],

24
src/timeout.c
View File

@@ -58,6 +58,12 @@
#include "error.h"
#include "quote.h"
#if HAVE_SETRLIMIT
/* FreeBSD 5.0 at least needs <sys/types.h> and <sys/time.h> included
before <sys/resource.h>. Currently "system.h" includes <sys/time.h>. */
# include <sys/resource.h>
#endif
#define PROGRAM_NAME "timeout"
#define AUTHORS proper_name_utf8 ("Padraig Brady", "P\303\241draig Brady")
@@ -370,7 +376,23 @@ main (int argc, char **argv)
if (WIFEXITED (status))
status = WEXITSTATUS (status);
else if (WIFSIGNALED (status))
status = WTERMSIG (status) + 128; /* what sh does at least. */
{
int sig = WTERMSIG (status);
#if HAVE_SETRLIMIT && defined RLIMIT_CORE
if (!timed_out)
{
/* exit with the signal flag set, but avoid core files. */
if (setrlimit (RLIMIT_CORE, &(struct rlimit) {0,0}) == 0)
{
signal (sig, SIG_DFL);
raise (sig);
}
else
error (0, errno, _("warning: disabling core dumps failed"));
}
#endif
status = sig + 128; /* what sh returns for signaled processes. */
}
else
{
/* shouldn't happen. */