commit e2eaf7b9b521e67d38d24b5f8a38fee84c9295a2
parent d6095588a143710d25be47577ea65517770e7a74
Author: emersion <contact@emersion.fr>
Date: Thu, 2 Aug 2018 13:03:54 +0100
Merge pull request #2405 from marienz/sigmask
Reset signal mask after fork
Diffstat:
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
@@ -4,6 +4,7 @@
#include <string.h>
#include <sys/wait.h>
#include <unistd.h>
+#include <signal.h>
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/tree/container.h"
@@ -47,6 +48,9 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
if ((pid = fork()) == 0) {
// Fork child process again
setsid();
+ sigset_t set;
+ sigemptyset(&set);
+ sigprocmask(SIG_SETMASK, &set, NULL);
close(fd[0]);
if ((child = fork()) == 0) {
close(fd[1]);
diff --git a/sway/config/bar.c b/sway/config/bar.c
@@ -10,6 +10,7 @@
#include <sys/stat.h>
#include <signal.h>
#include <strings.h>
+#include <signal.h>
#include "sway/config.h"
#include "stringop.h"
#include "list.h"
@@ -175,6 +176,9 @@ void invoke_swaybar(struct bar_config *bar) {
if (bar->pid == 0) {
setpgid(0, 0);
close(filedes[0]);
+ sigset_t set;
+ sigemptyset(&set);
+ sigprocmask(SIG_SETMASK, &set, NULL);
// run custom swaybar
size_t len = snprintf(NULL, 0, "%s -b %s",