X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2fa61e833ffe9789ef3d3327157e17101a4a2ce..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/gtk1/utilsgtk.cpp diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp index 611d02bf16..1bc1106f93 100644 --- a/src/gtk1/utilsgtk.cpp +++ b/src/gtk1/utilsgtk.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utils.cpp +// Name: src/gtk/utilsgtk.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -21,6 +21,7 @@ #include #include #include +#include // for WNOHANG #include #include "glib.h" @@ -138,16 +139,35 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) // subprocess routines // ---------------------------------------------------------------------------- -static void GTK_EndProcessDetector(gpointer data, gint source, - GdkInputCondition WXUNUSED(condition) ) +extern "C" +void GTK_EndProcessDetector(gpointer data, gint source, + GdkInputCondition WXUNUSED(condition) ) { wxEndProcessData *proc_data = (wxEndProcessData *)data; + + // has the process really terminated? unfortunately GDK (or GLib) seem to + // generate G_IO_HUP notification even when it simply tries to read from a + // closed fd and hasn't terminated at all + int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid); + int status = 0; + int rc = waitpid(pid, &status, WNOHANG); + + if ( rc == 0 ) + { + // no, it didn't exit yet, continue waiting + return; + } + + // set exit code to -1 if something bad happened + proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status) + : -1; + + // child exited, end waiting close(source); + + // don't call us again! gdk_input_remove(proc_data->tag); - // This has to come after gdk_input_remove() or we will - // occasionally receive multiple callbacks with corrupt data - // pointers. (KB) wxHandleProcessTermination(proc_data); }