external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-23 04:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

particle: reset signals and signal mask when executing an on-click handler

Browse source
This commit is contained in:
Daniel Eklöf 2020-11-02 19:03:33 +01:00
parent 074af015fb
commit d0360f2de1
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
particle.c
View file

@ -219,14 +219,25 @@ exposable_default_on_mouse(struct exposable *exposable, struct bar *bar,
LOG_DBG("executing on-click handler: %s", cmd); LOG_DBG("executing on-click handler: %s", cmd);
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(SIGCHLD, &sa, NULL) < 0 ||
sigprocmask(SIG_SETMASK, &mask, NULL) < 0)
{
goto fail;
}
/* Redirect stdin/stdout/stderr to /dev/null */ /* Redirect stdin/stdout/stderr to /dev/null */
int dev_null_r = open("/dev/null", O_RDONLY | O_CLOEXEC); int dev_null_r = open("/dev/null", O_RDONLY | O_CLOEXEC);
int dev_null_w = open("/dev/null", O_WRONLY | O_CLOEXEC); int dev_null_w = open("/dev/null", O_WRONLY | O_CLOEXEC);
if (dev_null_r == -1 || dev_null_w == -1) { if (dev_null_r == -1 || dev_null_w == -1) {
LOG_ERRNO("/dev/null: failed to open"); LOG_ERRNO("/dev/null: failed to open");
(void)!write(pipe_fds[1], &errno, sizeof(errno)); goto fail;
_exit(1);
} }
if (dup2(dev_null_r, STDIN_FILENO) == -1 || if (dup2(dev_null_r, STDIN_FILENO) == -1 ||
@ -234,15 +245,20 @@ exposable_default_on_mouse(struct exposable *exposable, struct bar *bar,
dup2(dev_null_w, STDERR_FILENO) == -1) dup2(dev_null_w, STDERR_FILENO) == -1)
{ {
LOG_ERRNO("failed to redirect stdin/stdout/stderr"); LOG_ERRNO("failed to redirect stdin/stdout/stderr");
(void)!write(pipe_fds[1], &errno, sizeof(errno)); goto fail;
_exit(1);
} }
/* Close *all* other FDs (e.g. script modules' FDs) */
for (int i = STDERR_FILENO + 1; i < 65536; i++)
close(i);
execvp(argv[0], argv); execvp(argv[0], argv);
fail:
/* Signal failure to parent process */ /* Signal failure to parent process */
(void)!write(pipe_fds[1], &errno, sizeof(errno)); (void)!write(pipe_fds[1], &errno, sizeof(errno));
_exit(1); close(pipe_fds[1]);
_exit(errno);
break; break;
default: default: