diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-02-21 19:00:31 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-02-21 19:00:31 +0000 |
| commit | 0bda60aacc113d8387831ef86681695f77bcecda (patch) | |
| tree | 822f90cf94de20b51a36a1d0ca0a7ae8deaa9e29 /slave.c | |
| parent | Merge branch 'refactor-subsurface-creation' (diff) | |
| parent | spawn/slave: restore signal mask after fork (diff) | |
Merge branch 'restore-signals-when-spawning-subprocess'
Closes #366
Diffstat (limited to 'slave.c')
| -rw-r--r-- | slave.c | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -274,15 +274,10 @@ slave_spawn(int ptmx, int argc, const char *cwd, char *const *argv, _exit(_errno); } - /* Restore signals */ + /* Restore signal mask */ sigset_t mask; sigemptyset(&mask); - const struct sigaction sa = {.sa_handler = SIG_DFL}; - if (sigaction(SIGINT, &sa, NULL) < 0 || - sigaction(SIGTERM, &sa, NULL) < 0 || - sigaction(SIGHUP, &sa, NULL) < 0 || - sigprocmask(SIG_SETMASK, &mask, NULL) < 0) - { + if (sigprocmask(SIG_SETMASK, &mask, NULL) < 0) { const int _errno = errno; LOG_ERRNO_P(errno, "failed to restore signals"); (void)!write(fork_pipe[1], &_errno, sizeof(_errno)); |
