X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c03f242ce0c73c76f0fb7d292b59b1647baf967..fc26f4abdec4efbdcb3ede3ae34ba5488de1c732:/src/unix/utilsunx.cpp diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index fbf5377f76..0581126a28 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -288,32 +288,12 @@ bool wxShell(const wxString& command, wxArrayString& output) void wxHandleProcessTermination(wxEndProcessData *proc_data) { - int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid); - - // waitpid is POSIX so should be available everywhere, however on older - // systems wait() might be used instead in a loop (until the right pid - // terminates) - int status = 0; - int rc; - - // wait for child termination and if waitpid() was interrupted, try again - do - { - rc = waitpid(pid, &status, 0); - } - while ( rc == -1 && errno == EINTR ); - // notify user about termination if required if ( proc_data->process ) { - proc_data->process->OnTerminate - ( - proc_data->pid, - (rc == 0) && WIFEXITED(status) - ? WEXITSTATUS(status) - : -1 - ); + proc_data->process->OnTerminate(proc_data->pid, proc_data->exitcode); } + // clean up if ( proc_data->pid > 0 ) { @@ -321,9 +301,7 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data) } else { - // wxExecute() will know about it - proc_data->exitcode = status; - + // let wxExecute() know that the process has terminated proc_data->pid = 0; } }