godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle signals TERM, QUIT and CHLD for zombies

Browse Source
This commit is contained in:
Martin Duquesnoy 2012-01-29 04:24:28 +01:00
parent 69391afed8
commit 25dec6073c
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util.c
View File

@ -108,16 +108,12 @@ spawn(const char *format, ...)
if(!(sh = getenv("SHELL")) || sh[0] != '/') if(!(sh = getenv("SHELL")) || sh[0] != '/')
sh = "/bin/sh"; sh = "/bin/sh";
if((pid = fork()) == 0) if(!(pid = fork()))
{ {
if((pid = fork()) == 0) setsid();
{ if (execl(sh, sh, "-c", cmd, (char*)NULL) == -1)
setsid(); warnl("execl(sh -c %s)", cmd);
if (execl(sh, sh, "-c", cmd, (char*)NULL) == -1) exit(EXIT_FAILURE);
warnl("execl(sh -c %s)", cmd);
exit(EXIT_FAILURE);
}
exit(EXIT_SUCCESS);
} }
else if (pid == -1) else if (pid == -1)
warnl("fork"); warnl("fork");

26
src/wmfs.c
View File

@ -5,6 +5,8 @@
#include <string.h> #include <string.h>
#include <getopt.h> #include <getopt.h>
#include <signal.h>
#include <sys/wait.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
@ -538,6 +540,21 @@ exec_uicb_function(Display *dpy, Window root, char *func, char *cmd)
XSync(dpy, False); XSync(dpy, False);
} }
static void
signal_handle(int sig)
{
switch (sig)
{
case SIGQUIT:
case SIGTERM:
W->flags &= ~WMFS_RUNNING;
break;
case SIGCHLD:
while(waitpid(-1, NULL, WNOHANG) > 0);
break;
}
}
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
@ -545,6 +562,7 @@ main(int argc, char **argv)
bool r; bool r;
Display *dpy; Display *dpy;
char path[MAX_PATH_LEN] = { 0 }; char path[MAX_PATH_LEN] = { 0 };
struct sigaction sa;
(void)argc; (void)argc;
sprintf(path, "%s/"CONFIG_DEFAULT_PATH, getenv("HOME")); sprintf(path, "%s/"CONFIG_DEFAULT_PATH, getenv("HOME"));
@ -600,6 +618,14 @@ main(int argc, char **argv)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* Set signal handler */
memset(&sa, 0, sizeof(sa));
sa.sa_handler = signal_handle;
sigemptyset(&sa.sa_mask);
sigaction(SIGQUIT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL);
sigaction(SIGCHLD, &sa, NULL);
/* Core */ /* Core */
wmfs_init(); wmfs_init();
wmfs_scan(); wmfs_scan();