aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--spawn.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/spawn.c b/spawn.c
index d200ed12..99f1dc7e 100644
--- a/spawn.c
+++ b/spawn.c
@@ -35,15 +35,14 @@ spawn(struct reaper *reaper, const char *cwd, char *const argv[],
/* Child */
close(pipe_fds[0]);
+ if (setsid() < 0)
+ goto child_err;
+
/* Clear signal mask */
sigset_t mask;
sigemptyset(&mask);
- if (sigprocmask(SIG_SETMASK, &mask, NULL) < 0) {
- const int errno_copy = errno;
- LOG_ERRNO("failed to restore signals");
- (void)!write(pipe_fds[1], &errno_copy, sizeof(errno_copy));
- _exit(errno_copy);
- }
+ if (sigprocmask(SIG_SETMASK, &mask, NULL) < 0)
+ goto child_err;
bool close_stderr = stderr_fd >= 0;
bool close_stdout = stdout_fd >= 0 && stdout_fd != stderr_fd;
@@ -58,12 +57,17 @@ spawn(struct reaper *reaper, const char *cwd, char *const argv[],
(cwd != NULL && chdir(cwd) < 0) ||
execvp(argv[0], argv) < 0)
{
- const int errno_copy = errno;
- (void)!write(pipe_fds[1], &errno_copy, sizeof(errno_copy));
- _exit(errno_copy);
+ goto child_err;
}
+
xassert(false);
_exit(errno);
+
+ child_err:
+ ;
+ const int errno_copy = errno;
+ (void)!write(pipe_fds[1], &errno_copy, sizeof(errno_copy));
+ _exit(errno_copy);
}
/* Parent */