aboutsummaryrefslogtreecommitdiff
path: root/slave.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-12-18 22:22:52 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-12-18 22:22:52 +0000
commit027603cbb80b2c9aadd71faaaf75e4912a55a9be (patch)
treedcb6e5e944281848949619efeb1d4e8d6087cc7b /slave.c
parentslave: restore SIGPIPE (diff)
slave: re-use ‘struct sigaction’ variable when resetting SIGHUP+SIGPIPE
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 fa57b86e..c4c6d4d0 100644
--- a/slave.c
+++ b/slave.c
@@ -275,11 +275,13 @@ slave_spawn(int ptmx, int argc, const char *cwd, char *const *argv,
}
/* Restore signal mask, and SIG_IGN'd signals */
+ const struct sigaction dfl = {.sa_handler = SIG_DFL};
sigset_t mask;
sigemptyset(&mask);
+
if (sigprocmask(SIG_SETMASK, &mask, NULL) < 0 ||
- sigaction(SIGHUP, &(struct sigaction){.sa_handler = SIG_DFL}, NULL) < 0 ||
- sigaction(SIGPIPE, &(struct sigaction){.sa_handler = SIG_DFL}, NULL) < 0)
+ sigaction(SIGHUP, &dfl, NULL) < 0 ||
+ sigaction(SIGPIPE, &dfl, NULL) < 0)
{
const int errno_copy = errno;
LOG_ERRNO_P(errno, "failed to restore signals");