summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2004-08-22 18:33:19 +0000
committerMark Spencer <markster@digium.com>2004-08-22 18:33:19 +0000
commit60707a4172026a2598a800c9c09437ff107812f4 (patch)
tree76a95b10bfe61e3516bac1c187b6a6b7689b926f
parentf2dcfca9c4a8a27db1861005d92bd7b2471d52f0 (diff)
Fix sigchld handling (bug #2245)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3633 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-xasterisk.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/asterisk.c b/asterisk.c
index 71d1ee448..691a3e414 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -170,6 +170,12 @@ static int fdprint(int fd, const char *s)
return write(fd, s, strlen(s) + 1);
}
+/* NULL handler so we can collect the child exit status */
+static void null_sig_handler(int signal)
+{
+
+}
+
int ast_safe_system(const char *s)
{
/* XXX This function needs some optimization work XXX */
@@ -178,6 +184,7 @@ int ast_safe_system(const char *s)
int res;
struct rusage rusage;
int status;
+ void (*prev_handler) = signal(SIGCHLD, null_sig_handler);
pid = fork();
if (pid == 0) {
/* Close file descriptors and launch system command */
@@ -204,6 +211,7 @@ int ast_safe_system(const char *s)
ast_log(LOG_WARNING, "Fork failed: %s\n", strerror(errno));
res = -1;
}
+ signal(SIGCHLD, prev_handler);
return res;
}