alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

swayidle: doublefork to not leave zombies around

Browse source
This commit is contained in:
Dominique Martinet 2018-06-08 22:02:47 +09:00
parent bf6ca69ae8
commit 2477930d90
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
swayidle/main.c
View file

@ -6,6 +6,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <wayland-client-protocol.h> #include <wayland-client-protocol.h>
#include <wayland-client.h> #include <wayland-client.h>
@ -59,13 +60,25 @@ static void cmd_exec(void *data) {
} }
char *param = (char *)data; char *param = (char *)data;
wlr_log(L_DEBUG, "Cmd exec %s", param); wlr_log(L_DEBUG, "Cmd exec %s", param);
int pid = fork(); pid_t pid = fork();
if (pid == 0) {
pid = fork();
if (pid == 0) { if (pid == 0) {
char *const cmd[] = { "sh", "-c", param, NULL, }; char *const cmd[] = { "sh", "-c", param, NULL, };
execvp(cmd[0], cmd); execvp(cmd[0], cmd);
wlr_log_errno(L_ERROR, "execve failed!");
exit(1);
} else if (pid < 0) {
wlr_log_errno(L_ERROR, "fork failed");
exit(1); exit(1);
} }
wlr_log(L_DEBUG, "Spawned process %d", pid); exit(0);
} else if (pid < 0) {
wlr_log_errno(L_ERROR, "fork failed");
} else {
wlr_log(L_DEBUG, "Spawned process %s", param);
waitpid(pid, NULL, 0);
}
} }
#if defined(SWAY_IDLE_HAS_SYSTEMD) || defined(SWAY_IDLE_HAS_ELOGIND) #if defined(SWAY_IDLE_HAS_SYSTEMD) || defined(SWAY_IDLE_HAS_ELOGIND)