X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d8dd65e6225836946dea72ce46cedb325ef3ff0..5c45e86bac1d3f0b08a452f6436481824f79fe5a:/src/unix/utilsunx.cpp diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 1f09b3d448..2447a559fd 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utilsunx.cpp +// Name: unix/utilsunx.cpp // Purpose: generic Unix implementation of many wx functions // Author: Vadim Zeitlin // Id: $Id$ @@ -15,25 +15,65 @@ // headers // ---------------------------------------------------------------------------- +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/defs.h" #include "wx/string.h" #include "wx/intl.h" #include "wx/log.h" #include "wx/app.h" +#include "wx/apptrait.h" #include "wx/utils.h" #include "wx/process.h" #include "wx/thread.h" -#include "wx/stream.h" +#include "wx/wfstream.h" + +#include "wx/unix/execute.h" + +#if wxUSE_STREAMS + +// define this to let wxexec.cpp know that we know what we're doing +#define _WX_USED_BY_WXEXECUTE_ +#include "../common/execcmn.cpp" + +#endif // wxUSE_STREAMS + +#if wxUSE_BASE + +#if defined( __MWERKS__ ) && defined(__MACH__) +#define WXWIN_OS_DESCRIPTION "MacOS X" +#define HAVE_NANOSLEEP +#endif +// not only the statfs syscall is called differently depending on platform, but +// one of its incarnations, statvfs(), takes different arguments under +// different platforms and even different versions of the same system (Solaris +// 7 and 8): if you want to test for this, don't forget that the problems only +// appear if the large files support is enabled #ifdef HAVE_STATFS - #include + #ifdef __BSD__ + #include + #include + #else // !__BSD__ + #include + #endif // __BSD__/!__BSD__ + + #define wxStatfs statfs #endif // HAVE_STATFS -#if wxUSE_GUI - #include "wx/unix/execute.h" +#ifdef HAVE_STATVFS + #include + + #define wxStatfs statvfs +#endif // HAVE_STATVFS + +#if defined(HAVE_STATFS) || defined(HAVE_STATVFS) + // WX_STATFS_T is detected by configure + #define wxStatfs_t WX_STATFS_T #endif // SGI signal.h defines signal handler arguments differently depending on @@ -47,8 +87,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -144,7 +184,7 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc) int err = kill((pid_t)pid, (int)sig); if ( rc ) { - switch ( err ) + switch ( errno ) { case 0: *rc = wxKILL_OK; @@ -176,10 +216,20 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc) #define WXEXECUTE_NARGS 127 -long wxExecute( const wxString& command, bool sync, wxProcess *process ) +long wxExecute( const wxString& command, int flags, wxProcess *process ) { wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") ); +#if wxUSE_THREADS + // fork() doesn't mix well with POSIX threads: on many systems the program + // deadlocks or crashes for some reason. Probably our code is buggy and + // doesn't do something which must be done to allow this to work, but I + // don't know what yet, so for now just warn the user (this is the least we + // can do) about it + wxASSERT_MSG( wxThread::IsMain(), + _T("wxExecute() can be called only from the main thread") ); +#endif // wxUSE_THREADS + int argc = 0; wxChar *argv[WXEXECUTE_NARGS]; wxString argument; @@ -236,7 +286,7 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process ) argv[argc] = NULL; // do execute the command - long lRc = wxExecute(argv, sync, process); + long lRc = wxExecute(argv, flags, process); // clean up argc = 0; @@ -269,7 +319,7 @@ static wxString wxMakeShellCommand(const wxString& command) bool wxShell(const wxString& command) { - return wxExecute(wxMakeShellCommand(command), TRUE /* sync */) == 0; + return wxExecute(wxMakeShellCommand(command), wxEXEC_SYNC) == 0; } bool wxShell(const wxString& command, wxArrayString& output) @@ -279,75 +329,28 @@ bool wxShell(const wxString& command, wxArrayString& output) return wxExecute(wxMakeShellCommand(command), output); } -#if wxUSE_GUI - -void wxHandleProcessTermination(wxEndProcessData *proc_data) +// Shutdown or reboot the PC +bool wxShutdown(wxShutdownFlags wFlags) { - 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 + wxChar level; + switch ( wFlags ) { - rc = waitpid(pid, &status, 0); - } - while ( rc == -1 && errno == EINTR ); + case wxSHUTDOWN_POWEROFF: + level = _T('0'); + break; - if (rc == -1) - { - // JACS: this could happen if the process was terminated and waitpid called, - // so commenting out for now. - //wxLogSysError(_("Waiting for subprocess termination failed (return code = -1)")); - } - else if (! (WIFEXITED(status))) - { - wxLogSysError(_("Waiting for subprocess termination failed (WIFEXITED returned zero)")); - - /* AFAIK, this can only happen if something went wrong within - wxGTK, i.e. due to a race condition or some serious bug. - After having fixed the order of statements in - GTK_EndProcessDetector(). (KB) - */ - } - else if (WIFSIGNALED(status)) - { - wxLogSysError(_("Waiting for subprocess termination failed (signal not caught)")); - - /* AFAIK, this can only happen if something went wrong within - wxGTK, i.e. due to a race condition or some serious bug. - After having fixed the order of statements in - GTK_EndProcessDetector(). (KB) - */ - } - // else - { - // notify user about termination if required - if (proc_data->process) - { - proc_data->process->OnTerminate(proc_data->pid, - WEXITSTATUS(status)); - } - // clean up - if ( proc_data->pid > 0 ) - { - delete proc_data; - } - else - { - // wxExecute() will know about it - proc_data->exitcode = status; + case wxSHUTDOWN_REBOOT: + level = _T('6'); + break; - proc_data->pid = 0; - } + default: + wxFAIL_MSG( _T("unknown wxShutdown() flag") ); + return FALSE; } + + return system(wxString::Format(_T("init %c"), level).mb_str()) == 0; } -#endif // wxUSE_GUI // ---------------------------------------------------------------------------- // wxStream classes to support IO redirection in wxExecute @@ -355,106 +358,54 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data) #if wxUSE_STREAMS -class wxProcessFileInputStream : public wxInputStream -{ -public: - wxProcessFileInputStream(int fd) { m_fd = fd; } - ~wxProcessFileInputStream() { close(m_fd); } - - virtual bool Eof() const; - -protected: - size_t OnSysRead(void *buffer, size_t bufsize); - -protected: - int m_fd; -}; - -class wxProcessFileOutputStream : public wxOutputStream -{ -public: - wxProcessFileOutputStream(int fd) { m_fd = fd; } - ~wxProcessFileOutputStream() { close(m_fd); } - -protected: - size_t OnSysWrite(const void *buffer, size_t bufsize); - -protected: - int m_fd; -}; - -bool wxProcessFileInputStream::Eof() const +bool wxPipeInputStream::CanRead() const { if ( m_lasterror == wxSTREAM_EOF ) - return TRUE; + return FALSE; // check if there is any input available struct timeval tv; tv.tv_sec = 0; tv.tv_usec = 0; + const int fd = m_file->fd(); + fd_set readfds; FD_ZERO(&readfds); - FD_SET(m_fd, &readfds); - switch ( select(m_fd + 1, &readfds, NULL, NULL, &tv) ) + FD_SET(fd, &readfds); + switch ( select(fd + 1, &readfds, NULL, NULL, &tv) ) { case -1: wxLogSysError(_("Impossible to get child process input")); // fall through case 0: - return TRUE; + return FALSE; default: wxFAIL_MSG(_T("unexpected select() return value")); // still fall through case 1: - // input available: check if there is any - return wxInputStream::Eof(); + // input available -- or maybe not, as select() returns 1 when a + // read() will complete without delay, but it could still not read + // anything + return !Eof(); } } -size_t wxProcessFileInputStream::OnSysRead(void *buffer, size_t bufsize) -{ - int ret = read(m_fd, buffer, bufsize); - if ( ret == 0 ) - { - m_lasterror = wxSTREAM_EOF; - } - else if ( ret == -1 ) - { - m_lasterror = wxSTREAM_READ_ERROR; - ret = 0; - } - else - { - m_lasterror = wxSTREAM_NOERROR; - } - - return ret; -} - -size_t wxProcessFileOutputStream::OnSysWrite(const void *buffer, size_t bufsize) -{ - int ret = write(m_fd, buffer, bufsize); - if ( ret == -1 ) - { - m_lasterror = wxSTREAM_WRITE_ERROR; - ret = 0; - } - else - { - m_lasterror = wxSTREAM_NOERROR; - } +#endif // wxUSE_STREAMS - return ret; -} +// ---------------------------------------------------------------------------- +// wxExecute: the real worker function +// ---------------------------------------------------------------------------- -#endif // wxUSE_STREAMS +#ifdef __VMS + #pragma message disable codeunreachable +#endif long wxExecute(wxChar **argv, - bool sync, + int flags, wxProcess *process) { // for the sync execution, we return -1 to indicate failure, but for async @@ -462,7 +413,7 @@ long wxExecute(wxChar **argv, // // we define this as a macro, not a variable, to avoid compiler warnings // about "ERROR_RETURN_CODE value may be clobbered by fork()" - #define ERROR_RETURN_CODE ((sync) ? -1 : 0) + #define ERROR_RETURN_CODE ((flags & wxEXEC_SYNC) ? -1 : 0) wxCHECK_MSG( *argv, ERROR_RETURN_CODE, wxT("can't exec empty command") ); @@ -489,40 +440,38 @@ long wxExecute(wxChar **argv, wxChar **mb_argv = argv; #endif // Unicode/ANSI -#if wxUSE_GUI + // we want this function to work even if there is no wxApp so ensure that + // we have a valid traits pointer + wxConsoleAppTraits traitsConsole; + wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL; + if ( !traits ) + traits = &traitsConsole; + + // this struct contains all information which we pass to and from + // wxAppTraits methods + wxExecuteData execData; + execData.flags = flags; + execData.process = process; + // create pipes - int end_proc_detect[2]; - if ( pipe(end_proc_detect) == -1 ) + if ( !traits->CreateEndProcessPipe(execData) ) { - wxLogSysError( _("Pipe creation failed") ); wxLogError( _("Failed to execute '%s'\n"), *argv ); ARGS_CLEANUP; return ERROR_RETURN_CODE; } -#endif // wxUSE_GUI // pipes for inter process communication - int pipeIn[2], // stdin - pipeOut[2], // stdout - pipeErr[2]; // stderr - - pipeIn[0] = pipeIn[1] = - pipeOut[0] = pipeOut[1] = - pipeErr[0] = pipeErr[1] = -1; + wxPipe pipeIn, // stdin + pipeOut, // stdout + pipeErr; // stderr if ( process && process->IsRedirected() ) { - if ( pipe(pipeIn) == -1 || pipe(pipeOut) == -1 || pipe(pipeErr) == -1 ) + if ( !pipeIn.Create() || !pipeOut.Create() || !pipeErr.Create() ) { -#if wxUSE_GUI - // free previously allocated resources - close(end_proc_detect[0]); - close(end_proc_detect[1]); -#endif // wxUSE_GUI - - wxLogSysError( _("Pipe creation failed") ); wxLogError( _("Failed to execute '%s'\n"), *argv ); ARGS_CLEANUP; @@ -532,25 +481,18 @@ long wxExecute(wxChar **argv, } // fork the process -#ifdef HAVE_VFORK - pid_t pid = vfork(); + // + // NB: do *not* use vfork() here, it completely breaks this code for some + // reason under Solaris (and maybe others, although not under Linux) + // But on OpenVMS we do not have fork so we have to use vfork and + // cross our fingers that it works. +#ifdef __VMS + pid_t pid = vfork(); #else - pid_t pid = fork(); + pid_t pid = fork(); #endif - - if ( pid == -1 ) // error? + if ( pid == -1 ) // error? { -#if wxUSE_GUI - close(end_proc_detect[0]); - close(end_proc_detect[1]); - close(pipeIn[0]); - close(pipeIn[1]); - close(pipeOut[0]); - close(pipeOut[1]); - close(pipeErr[0]); - close(pipeErr[1]); -#endif // wxUSE_GUI - wxLogSysError( _("Fork failed") ); ARGS_CLEANUP; @@ -559,57 +501,74 @@ long wxExecute(wxChar **argv, } else if ( pid == 0 ) // we're in child { -#if wxUSE_GUI - close(end_proc_detect[0]); // close reading side -#endif // wxUSE_GUI - // These lines close the open file descriptors to to avoid any // input/output which might block the process or irritate the user. If // one wants proper IO for the subprocess, the right thing to do is to // start an xterm executing it. - if ( !sync ) + if ( !(flags & wxEXEC_SYNC) ) { for ( int fd = 0; fd < FD_SETSIZE; fd++ ) { - if ( fd == pipeIn[0] || fd == pipeOut[1] || fd == pipeErr[1] -#if wxUSE_GUI - || fd == end_proc_detect[1] -#endif // wxUSE_GUI - ) + if ( fd == pipeIn[wxPipe::Read] + || fd == pipeOut[wxPipe::Write] + || fd == pipeErr[wxPipe::Write] + || traits->IsWriteFDOfEndProcessPipe(execData, fd) ) { // don't close this one, we still need it continue; } - // leave stderr opened too, it won't do any hurm + // leave stderr opened too, it won't do any harm if ( fd != STDERR_FILENO ) close(fd); } } - // redirect stdio, stdout and stderr - if ( pipeIn[0] != -1 ) +#if !defined(__VMS) && !defined(__EMX__) + if ( flags & wxEXEC_MAKE_GROUP_LEADER ) { - if ( dup2(pipeIn[0], STDIN_FILENO) == -1 || - dup2(pipeOut[1], STDOUT_FILENO) == -1 || - dup2(pipeErr[1], STDERR_FILENO) == -1 ) + // Set process group to child process' pid. Then killing -pid + // of the parent will kill the process and all of its children. + setsid(); + } +#endif // !__VMS + + // reading side can be safely closed but we should keep the write one + // opened + traits->DetachWriteFDOfEndProcessPipe(execData); + + // redirect stdin, stdout and stderr + if ( pipeIn.IsOk() ) + { + if ( dup2(pipeIn[wxPipe::Read], STDIN_FILENO) == -1 || + dup2(pipeOut[wxPipe::Write], STDOUT_FILENO) == -1 || + dup2(pipeErr[wxPipe::Write], STDERR_FILENO) == -1 ) { wxLogSysError(_("Failed to redirect child process input/output")); } - close(pipeIn[0]); - close(pipeOut[1]); - close(pipeErr[1]); + pipeIn.Close(); + pipeOut.Close(); + pipeErr.Close(); } execvp (*mb_argv, mb_argv); + fprintf(stderr, "execvp("); + // CS changed ppc to ppc_ as ppc is not available under mac os CW Mach-O + for ( char **ppc_ = mb_argv; *ppc_; ppc_++ ) + fprintf(stderr, "%s%s", ppc_ == mb_argv ? "" : ", ", *ppc_); + fprintf(stderr, ") failed with error %d!\n", errno); + // there is no return after successful exec() _exit(-1); // some compilers complain about missing return - of course, they // should know that exit() doesn't return but what else can we do if // they don't? + // + // and, sure enough, other compilers complain about unreachable code + // after exit() call, so we can just always have return here... #if defined(__VMS) || defined(__INTEL_COMPILER) return 0; #endif @@ -618,78 +577,57 @@ long wxExecute(wxChar **argv, { ARGS_CLEANUP; - // pipe initialization: construction of the wxStreams - if ( process && process->IsRedirected() ) - { -#if wxUSE_STREAMS - // These two streams are relative to this process. - wxOutputStream *outStream = new wxProcessFileOutputStream(pipeIn[1]); - wxInputStream *inStream = new wxProcessFileInputStream(pipeOut[0]); - wxInputStream *errStream = new wxProcessFileInputStream(pipeErr[0]); + // save it for WaitForChild() use + execData.pid = pid; - process->SetPipeStreams(inStream, outStream, errStream); -#endif // wxUSE_STREAMS + // prepare for IO redirection - close(pipeIn[0]); // close reading side - close(pipeOut[1]); // close writing side - close(pipeErr[1]); // close writing side - } - -#if wxUSE_GUI && !defined(__WXMICROWIN__) - wxEndProcessData *data = new wxEndProcessData; +#if wxUSE_STREAMS + // the input buffer bufOut is connected to stdout, this is why it is + // called bufOut and not bufIn + wxStreamTempInputBuffer bufOut, + bufErr; +#endif // wxUSE_STREAMS - if ( sync ) + if ( process && process->IsRedirected() ) { - // we may have process for capturing the program output, but it's - // not used in wxEndProcessData in the case of sync execution - data->process = NULL; - - // sync execution: indicate it by negating the pid - data->pid = -pid; - data->tag = wxAddProcessCallback(data, end_proc_detect[0]); - - close(end_proc_detect[1]); // close writing side +#if wxUSE_STREAMS + wxOutputStream *inStream = + new wxFileOutputStream(pipeIn.Detach(wxPipe::Write)); - wxBusyCursor bc; - wxWindowDisabler wd; + wxPipeInputStream *outStream = + new wxPipeInputStream(pipeOut.Detach(wxPipe::Read)); - // it will be set to 0 from GTK_EndProcessDetector - while (data->pid != 0) - wxYield(); + wxPipeInputStream *errStream = + new wxPipeInputStream(pipeErr.Detach(wxPipe::Read)); - int exitcode = data->exitcode; + process->SetPipeStreams(outStream, inStream, errStream); - delete data; + bufOut.Init(outStream); + bufErr.Init(errStream); - return exitcode; - } - else // async execution - { - // async execution, nothing special to do - caller will be - // notified about the process termination if process != NULL, data - // will be deleted in GTK_EndProcessDetector - data->process = process; - data->pid = pid; - data->tag = wxAddProcessCallback(data, end_proc_detect[0]); - - close(end_proc_detect[1]); // close writing side - - return pid; + execData.bufOut = &bufOut; + execData.bufErr = &bufErr; +#endif // wxUSE_STREAMS } -#else // !wxUSE_GUI - wxASSERT_MSG( sync, wxT("async execution not supported yet") ); - int exitcode = 0; - if ( waitpid(pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) ) + if ( pipeIn.IsOk() ) { - wxLogSysError(_("Waiting for subprocess termination failed")); + pipeIn.Close(); + pipeOut.Close(); + pipeErr.Close(); } - return exitcode; -#endif // wxUSE_GUI + return traits->WaitForChild(execData); } + + return ERROR_RETURN_CODE; } +#ifdef __VMS + #pragma message enable codeunreachable +#endif + #undef ERROR_RETURN_CODE #undef ARGS_CLEANUP @@ -700,13 +638,13 @@ long wxExecute(wxChar **argv, const wxChar* wxGetHomeDir( wxString *home ) { *home = wxGetUserHome( wxString() ); - wxString tmp; + wxString tmp; if ( home->IsEmpty() ) *home = wxT("/"); #ifdef __VMS - tmp = *home; - if ( tmp.Last() != wxT(']')) - if ( tmp.Last() != wxT('/')) *home << wxT('/'); + tmp = *home; + if ( tmp.Last() != wxT(']')) + if ( tmp.Last() != wxT('/')) *home << wxT('/'); #endif return home->c_str(); } @@ -725,7 +663,12 @@ char *wxGetUserHome( const wxString &user ) if ((ptr = wxGetenv(wxT("HOME"))) != NULL) { +#if wxUSE_UNICODE + wxWCharBuffer buffer( ptr ); + return buffer; +#else return ptr; +#endif } if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL) { @@ -866,40 +809,25 @@ bool wxGetUserName(wxChar *buf, int sz) return FALSE; } +// this function is in mac/utils.cpp for wxMac +#ifndef __WXMAC__ + wxString wxGetOsDescription() { #ifndef WXWIN_OS_DESCRIPTION #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure #else - return WXWIN_OS_DESCRIPTION; + return wxString::FromAscii( WXWIN_OS_DESCRIPTION ); #endif } -// this function returns the GUI toolkit version in GUI programs, but OS -// version in non-GUI ones -#if !wxUSE_GUI +#endif // !__WXMAC__ -int wxGetOsVersion(int *majorVsn, int *minorVsn) +unsigned long wxGetProcessId() { - int major, minor; - char name[256]; - - if ( sscanf(WXWIN_OS_DESCRIPTION, "%s %d.%d", name, &major, &minor) != 3 ) - { - // unreckognized uname string format - major = minor = -1; - } - - if ( majorVsn ) - *majorVsn = major; - if ( minorVsn ) - *minorVsn = minor; - - return wxUNIX; + return (unsigned long)getpid(); } -#endif // !wxUSE_GUI - long wxGetFreeMemory() { #if defined(__LINUX__) @@ -931,30 +859,38 @@ long wxGetFreeMemory() bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) { -#ifdef HAVE_STATFS - - struct statfs fs; - if ( statfs(path, &fs) != 0 ) +#if defined(HAVE_STATFS) || defined(HAVE_STATVFS) + // the case to "char *" is needed for AIX 4.3 + wxStatfs_t fs; + if ( wxStatfs((char *)(const char*)path.fn_str(), &fs) != 0 ) { - wxLogSysError("Failed to get file system statistics"); + wxLogSysError( wxT("Failed to get file system statistics") ); return FALSE; } + // under Solaris we also have to use f_frsize field instead of f_bsize + // which is in general a multiple of f_frsize +#ifdef HAVE_STATVFS + wxLongLong blockSize = fs.f_frsize; +#else // HAVE_STATFS + wxLongLong blockSize = fs.f_bsize; +#endif // HAVE_STATVFS/HAVE_STATFS + if ( pTotal ) { - *pTotal = wxLongLong(fs.f_blocks) * fs.f_bsize; + *pTotal = wxLongLong(fs.f_blocks) * blockSize; } if ( pFree ) { - *pFree = wxLongLong(fs.f_bavail) * fs.f_bsize; + *pFree = wxLongLong(fs.f_bavail) * blockSize; } return TRUE; -#endif // HAVE_STATFS - +#else // !HAVE_STATFS && !HAVE_STATVFS return FALSE; +#endif // HAVE_STATFS } // ---------------------------------------------------------------------------- @@ -979,8 +915,10 @@ bool wxGetEnv(const wxString& var, wxString *value) bool wxSetEnv(const wxString& variable, const wxChar *value) { #if defined(HAVE_SETENV) - return setenv(variable.mb_str(), value ? wxString(value).mb_str().data() - : NULL, 1 /* overwrite */) == 0; + return setenv(variable.mb_str(), + value ? (const char *)wxString(value).mb_str() + : NULL, + 1 /* overwrite */) == 0; #elif defined(HAVE_PUTENV) wxString s = variable; if ( value ) @@ -1007,7 +945,7 @@ bool wxSetEnv(const wxString& variable, const wxChar *value) #include -static void wxFatalSignalHandler(wxTYPE_SA_HANDLER) +extern "C" void wxFatalSignalHandler(wxTYPE_SA_HANDLER) { if ( wxTheApp ) { @@ -1076,6 +1014,8 @@ bool wxHandleFatalExceptions(bool doit) // error and debug output routines (deprecated, use wxLog) // ---------------------------------------------------------------------------- +#if WXWIN_COMPATIBILITY_2_2 + void wxDebugMsg( const char *format, ... ) { va_list ap; @@ -1102,3 +1042,164 @@ void wxFatalError( const wxString &msg, const wxString &title ) exit(3); // the same exit code as for abort() } +#endif // WXWIN_COMPATIBILITY_2_2 + +#endif // wxUSE_BASE + +#if wxUSE_GUI + +// ---------------------------------------------------------------------------- +// wxExecute support +// ---------------------------------------------------------------------------- + +// Darwin doesn't use the same process end detection mechanisms so we don't +// need wxExecute-related helpers for it +#if !(defined(__DARWIN__) && defined(__WXMAC__)) + +bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& execData) +{ + return execData.pipeEndProcDetect.Create(); +} + +bool wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd) +{ + return fd == (execData.pipeEndProcDetect)[wxPipe::Write]; +} + +void wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& execData) +{ + execData.pipeEndProcDetect.Detach(wxPipe::Write); + execData.pipeEndProcDetect.Close(); +} + +#else // !Darwin + +bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& WXUNUSED(execData)) +{ + return true; +} + +bool +wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(execData), + int WXUNUSED(fd)) +{ + return false; +} + +void +wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(execData)) +{ + // nothing to do here, we don't use the pipe +} + +#endif // !Darwin/Darwin + +int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) +{ + wxEndProcessData *endProcData = new wxEndProcessData; + + // wxAddProcessCallback is now (with DARWIN) allowed to call the + // callback function directly if the process terminates before + // the callback can be added to the run loop. Set up the endProcData. + if ( execData.flags & wxEXEC_SYNC ) + { + // we may have process for capturing the program output, but it's + // not used in wxEndProcessData in the case of sync execution + endProcData->process = NULL; + + // sync execution: indicate it by negating the pid + endProcData->pid = -execData.pid; + } + else + { + // async execution, nothing special to do -- caller will be + // notified about the process termination if process != NULL, endProcData + // will be deleted in GTK_EndProcessDetector + endProcData->process = execData.process; + endProcData->pid = execData.pid; + } + + +#if defined(__DARWIN__) && defined(__WXMAC__) + endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid); +#else + endProcData->tag = wxAddProcessCallback + ( + endProcData, + execData.pipeEndProcDetect.Detach(wxPipe::Read) + ); + + execData.pipeEndProcDetect.Close(); +#endif // defined(__DARWIN__) && defined(__WXMAC__) + + if ( execData.flags & wxEXEC_SYNC ) + { + wxBusyCursor bc; + wxWindowDisabler wd; + + // endProcData->pid will be set to 0 from GTK_EndProcessDetector when the + // process terminates + while ( endProcData->pid != 0 ) + { + bool idle = true; + +#if wxUSE_STREAMS + if ( execData.bufOut ) + { + execData.bufOut->Update(); + idle = false; + } + + if ( execData.bufErr ) + { + execData.bufErr->Update(); + idle = false; + } +#endif // wxUSE_STREAMS + + // don't consume 100% of the CPU while we're sitting this in this + // loop + if ( idle ) + wxUsleep(1); + + // give GTK+ a chance to call GTK_EndProcessDetector here and + // also repaint the GUI + wxYield(); + } + + int exitcode = endProcData->exitcode; + + delete endProcData; + + return exitcode; + } + else // async execution + { + return execData.pid; + } +} + +#endif // wxUSE_GUI +#if wxUSE_BASE + +void wxHandleProcessTermination(wxEndProcessData *proc_data) +{ + // notify user about termination if required + if ( proc_data->process ) + { + proc_data->process->OnTerminate(proc_data->pid, proc_data->exitcode); + } + + // clean up + if ( proc_data->pid > 0 ) + { + delete proc_data; + } + else + { + // let wxExecute() know that the process has terminated + proc_data->pid = 0; + } +} + +#endif // wxUSE_BASE