diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-12-22 18:37:12 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-12-22 18:37:12 +0000 |
| commit | 745e851faa0a6f83858ef064ca589a33497e0b5a (patch) | |
| tree | 83c117da9b6a53bfc1fa3fbbd61d31f55fca5dd0 /openbox/openbox.c | |
| parent | 05c1f333238ba2eccf22f334072cb653c0d64957 (diff) | |
dont have glib reap children, we shall reap them instead to avoid zombies from processes tranferred to us
Diffstat (limited to 'openbox/openbox.c')
| -rw-r--r-- | openbox/openbox.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c index b6882965..ef3f8ac5 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -59,6 +59,10 @@ # include <sys/stat.h> # include <sys/types.h> #endif +#ifdef HAVE_SYS_WAIT_H +# include <sys/types.h> +# include <sys/wait.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -128,6 +132,7 @@ gint main(gint argc, gchar **argv) ob_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler, NULL, NULL); ob_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL, NULL); ob_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL, NULL); + ob_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL, NULL); ob_screen = DefaultScreen(ob_display); @@ -328,13 +333,20 @@ gint main(gint argc, gchar **argv) static void signal_handler(gint signal, gpointer data) { - if (signal == SIGUSR1) { + switch (signal) { + case SIGUSR1: ob_debug("Caught signal %d. Restarting.\n", signal); ob_restart(); - } else if (signal == SIGUSR2) { + break; + case SIGUSR2: ob_debug("Caught signal %d. Reconfiguring.\n", signal); - ob_reconfigure(); - } else { + ob_reconfigure(); + break; + case SIGCHLD: + /* reap children */ + while (waitpid(-1, NULL, WNOHANG) > 0); + break; + default: ob_debug("Caught signal %d. Exiting.\n", signal); /* TERM and INT return a 0 code */ ob_exit(!(signal == SIGTERM || signal == SIGINT)); |