aboutsummaryrefslogtreecommitdiff
path: root/slave.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-06-02 18:13:26 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-06-02 18:13:26 +0000
commit6671d538598ac5dda7bb2c6f59cd52bfc46c9ae2 (patch)
tree7cd36921a87903a498c4e2372bfa7c4cd92781c3 /slave.c
parentMerge branch 'dont-split-multi-column-chars-when-resizing-alt-screen' (diff)
parentslave/spawn: restore SIGHUP handler after fork(), before exec() (diff)
Merge branch 'restore-sighup-handler'
Diffstat (limited to 'slave.c')
-rw-r--r--slave.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/slave.c b/slave.c
index 6a431d02..8e800214 100644
--- a/slave.c
+++ b/slave.c
@@ -274,10 +274,12 @@ slave_spawn(int ptmx, int argc, const char *cwd, char *const *argv,
_exit(errno_copy);
}
- /* Restore signal mask */
+ /* Restore signal mask, and SIG_IGN'd signals */
sigset_t mask;
sigemptyset(&mask);
- if (sigprocmask(SIG_SETMASK, &mask, NULL) < 0) {
+ if (sigprocmask(SIG_SETMASK, &mask, NULL) < 0 ||
+ sigaction(SIGHUP, &(struct sigaction){.sa_handler = SIG_DFL}, NULL) < 0)
+ {
const int errno_copy = errno;
LOG_ERRNO_P(errno, "failed to restore signals");
(void)!write(fork_pipe[1], &errno_copy, sizeof(errno_copy));