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

Status script not spawned if still running

Browse Source
This commit is contained in:
Philippe Pepiot 2010-12-07 01:34:22 +01:00
parent 6c332c9ea5
commit ce3813608c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wmfs.c
View File

@ -135,7 +135,7 @@ quit(void)
XCloseDisplay(dpy);
/* kill status script */
if (conf.status_pid != (pid_t)-1)
if (conf.status_pid != -1)
kill(conf.status_pid, SIGTERM);
return;
@ -374,6 +374,8 @@ update_status(void)
static void
signal_handle(int sig)
{
pid_t pid;
switch (sig)
{
case SIGQUIT:
@ -386,14 +388,17 @@ signal_handle(int sig)
/* re-set signal handler and wait childs */
if (signal(SIGCHLD, &signal_handle) == SIG_ERR)
warn("signal(%d)", SIGCHLD);
while (waitpid(-1, NULL, WNOHANG) > 0);
while ((pid = waitpid(-1, NULL, WNOHANG)) > 0)
if (pid == conf.status_pid)
conf.status_pid = -1;
break;
case SIGALRM:
/* re-set signal handler */
if (signal(SIGALRM, &signal_handle) == SIG_ERR)
warn("signal(%d)", SIGALRM);
/* exec status script */
conf.status_pid = spawn(conf.status_path);
/* exec status script (only if still not running) */
if (conf.status_pid == (pid_t)-1)
conf.status_pid = spawn(conf.status_path);
/* re-set timer */
if (conf.status_timing > 0)
alarm(conf.status_timing);