mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-18 05:34:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

slave: restore signals before calling exec()

Browse source
This commit is contained in:
Daniel Eklöf 2019-11-03 13:24:15 +01:00
parent d26c67e589
commit 61dfa1365e
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
main.c
View file

@ -205,6 +205,7 @@ main(int argc, char *const *argv)
if (as_server && (server = server_init(&conf, fdm, wayl)) == NULL) if (as_server && (server = server_init(&conf, fdm, wayl)) == NULL)
goto out; goto out;
/* Remember to restore signals in slave */
const struct sigaction sa = {.sa_handler = &sig_handler}; const struct sigaction sa = {.sa_handler = &sig_handler};
if (sigaction(SIGINT, &sa, NULL) < 0 || sigaction(SIGTERM, &sa, NULL) < 0) { if (sigaction(SIGINT, &sa, NULL) < 0 || sigaction(SIGTERM, &sa, NULL) < 0) {
LOG_ERRNO("failed to register signal handlers"); LOG_ERRNO("failed to register signal handlers");

14
slave.c
View file

@ -5,6 +5,7 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include <signal.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
@ -88,6 +89,18 @@ slave_spawn(int ptmx, int argc, char *const *argv,
/* Child */ /* Child */
close(fork_pipe[0]); /* Close read end */ close(fork_pipe[0]); /* Close read end */
/* Restore signals */
const struct sigaction sa = {.sa_handler = SIG_DFL};
if (sigaction(SIGINT, &sa, NULL) < 0 ||
sigaction(SIGTERM, &sa, NULL) < 0 ||
sigaction(SIGHUP, &sa, NULL) < 0)
{
const int _errno = errno;
LOG_ERRNO_P("failed to restore signals", errno);
(void)!write(fork_pipe[1], &_errno, sizeof(_errno));
_exit(_errno);
}
setenv("TERM", term_env, 1); setenv("TERM", term_env, 1);
char **_shell_argv = NULL; char **_shell_argv = NULL;
@ -134,7 +147,6 @@ slave_spawn(int ptmx, int argc, char *const *argv,
LOG_ERRNO("failed to set FD_CLOEXEC on ptmx"); LOG_ERRNO("failed to set FD_CLOEXEC on ptmx");
return -1; return -1;
} }
break; break;
} }
} }