From 745e851faa0a6f83858ef064ca589a33497e0b5a Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 22 Dec 2003 18:37:12 +0000 Subject: dont have glib reap children, we shall reap them instead to avoid zombies from processes tranferred to us --- openbox/openbox.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'openbox/openbox.c') 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 # include #endif +#ifdef HAVE_SYS_WAIT_H +# include +# include +#endif #ifdef HAVE_UNISTD_H # include #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)); -- cgit v1.2.3