In script mode, if the command is killed by a signal, print the

signal description as well as a core dump notification like the
shell does.
This commit is contained in:
Todd C. Miller
2009-10-14 20:04:16 +00:00
parent 233377a8b7
commit 7411b071e4

View File

@@ -663,12 +663,17 @@ script_child(path, argv)
if (WIFEXITED(grandchild_status)) if (WIFEXITED(grandchild_status))
exit(WEXITSTATUS(grandchild_status)); exit(WEXITSTATUS(grandchild_status));
if (WIFSIGNALED(grandchild_status)) { if (WIFSIGNALED(grandchild_status)) {
switch (WTERMSIG(grandchild_status)) { #ifdef HAVE_STRSIGNAL
char *reason = strsignal(WTERMSIG(grandchild_status));
} write(STDOUT_FILENO, reason, strlen(reason));
if (WCOREDUMP(grandchild_status))
write(STDOUT_FILENO, " (core dumped)", 14);
write(STDOUT_FILENO, "\n", 1);
#endif
exit(WTERMSIG(grandchild_status) | 128); exit(WTERMSIG(grandchild_status) | 128);
} }
exit(1); /* NOTREACHED */
exit(255);
} }
static void static void
@@ -774,8 +779,8 @@ handler(s)
* Signal handler for grandchild and its descendents. * Signal handler for grandchild and its descendents.
*/ */
static void static void
sigchild(signo) sigchild(s)
int signo; int s;
{ {
pid_t pid; pid_t pid;
int serrno = errno; int serrno = errno;