misc/adsb-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get the exec children back in our progress group/session, and unblock signals to them.

Browse Source
This commit is contained in:
Ian Gulliver
2016-03-09 18:40:29 -08:00
parent 94744ef96f
commit 5056380bd4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
adsbus/exec.c
View File

@@ -117,8 +117,6 @@ static void exec_parent(struct exec *exec, pid_t child, int data_fd, int log_fd)
} }
static void __attribute__ ((noreturn)) exec_child(const struct exec *exec, int data_fd, int log_fd) { static void __attribute__ ((noreturn)) exec_child(const struct exec *exec, int data_fd, int log_fd) {
assert(setsid() != -1);
// We leave stderr open from child to parent
// Other than that, fds should have CLOEXEC set // Other than that, fds should have CLOEXEC set
if (data_fd != STDIN_FILENO) { if (data_fd != STDIN_FILENO) {
assert(dup2(data_fd, STDIN_FILENO) == STDIN_FILENO); assert(dup2(data_fd, STDIN_FILENO) == STDIN_FILENO);
@@ -133,6 +131,11 @@ static void __attribute__ ((noreturn)) exec_child(const struct exec *exec, int d
assert(dup2(log_fd, STDERR_FILENO) == STDERR_FILENO); assert(dup2(log_fd, STDERR_FILENO) == STDERR_FILENO);
assert(!close(log_fd)); assert(!close(log_fd));
} }
sigset_t sigmask;
assert(!sigemptyset(&sigmask));
assert(!sigprocmask(SIG_SETMASK, &sigmask, NULL));
assert(!execl("/bin/sh", "sh", "-c", exec->command, NULL)); assert(!execl("/bin/sh", "sh", "-c", exec->command, NULL));
abort(); abort();
} }