From e6ad38a5409b18b573a59177ea8bb21c22747964 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 18 Apr 2014 16:50:32 +0200 Subject: Fix zombie process cleanup --- src/shell.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/shell.c') diff --git a/src/shell.c b/src/shell.c index 0b9bef5..8690a1f 100644 --- a/src/shell.c +++ b/src/shell.c @@ -154,12 +154,22 @@ bool fastd_shell_command_exec_sync(fastd_context_t *ctx, const fastd_shell_comma if (!fastd_shell_command_isset(command)) return true; + /* block SIGCHLD */ + sigset_t set, oldset; + sigemptyset(&set); + sigaddset(&set, SIGCHLD); + pthread_sigmask(SIG_BLOCK, &set, &oldset); + pid_t pid; if (!shell_command_do_exec(ctx, command, peer, local_addr, peer_addr, &pid)) return false; int status; - if (waitpid(pid, &status, 0) <= 0) { + pid_t err = waitpid(pid, &status, 0); + + pthread_sigmask(SIG_SETMASK, &oldset, NULL); + + if (err <= 0) { pr_error_errno(ctx, "fastd_shell_command_exec_sync: waitpid"); return false; } -- cgit v1.2.3