nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dont have glib reap children, we shall reap them instead to avoid zombies from processes tranferred to us

Browse source
This commit is contained in:
Dana Jansens 2003-12-22 18:37:12 +00:00
parent 05c1f33323
commit 745e851faa
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
openbox/action.c
View file

@ -979,14 +979,23 @@ void action_run_string(const gchar *name, struct _ObClient *c)
void action_execute(union ActionData *data)
{
GError *e = NULL;
gchar *cmd;
gchar *cmd, **argv = 0;
if (data->execute.path) {
cmd = g_filename_from_utf8(data->execute.path, -1, NULL, NULL, NULL);
if (cmd) {
if (!g_spawn_command_line_async(cmd, &e)) {
if (!g_shell_parse_argv (cmd, NULL, &argv, &e)) {
g_warning("failed to execute '%s': %s",
cmd, e->message);
g_error_free(e);
} else {
if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH |
G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, NULL, &e)) {
g_warning("failed to execute '%s': %s",
cmd, e->message);
g_error_free(e);
}
g_strfreev(argv);
}
g_free(cmd);
} else {

20
openbox/openbox.c
View file

@ -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));