X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2ddee86fe73c5ae8edc59871fea9f40e84cbc2d..8ba80c6f8325e61de2e3fc4bbd7cf3d750f432cd:/src/unix/utilsunx.cpp diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 4cb88a61b9..9a1243beb7 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: unix/utilsunx.cpp +// Name: src/unix/utilsunx.cpp // Purpose: generic Unix implementation of many wx functions // Author: Vadim Zeitlin // Id: $Id$ @@ -15,42 +15,110 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/defs.h" -#include "wx/string.h" - -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/app.h" +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/utils.h" + +#define USE_PUTENV (!defined(HAVE_SETENV) && defined(HAVE_PUTENV)) + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" + #include "wx/wxcrtvararg.h" + #if USE_PUTENV + #include "wx/module.h" + #include "wx/hashmap.h" + #endif +#endif + +#include "wx/apptrait.h" + #include "wx/process.h" #include "wx/thread.h" +#include "wx/cmdline.h" + #include "wx/wfstream.h" +#include "wx/private/selectdispatcher.h" +#include "wx/private/fdiodispatcher.h" +#include "wx/unix/execute.h" +#include "wx/unix/private.h" + +#ifdef wxHAS_GENERIC_PROCESS_CALLBACK +#include "wx/private/fdiodispatcher.h" +#endif + +#include +#include // waitpid() + +#ifdef HAVE_SYS_SELECT_H +# include +#endif + +#define HAS_PIPE_INPUT_STREAM (wxUSE_STREAMS && wxUSE_FILE) + +#if HAS_PIPE_INPUT_STREAM + +// define this to let wxexec.cpp know that we know what we're doing +#define _WX_USED_BY_WXEXECUTE_ +#include "../common/execcmn.cpp" + +#endif // HAS_PIPE_INPUT_STREAM + +#if defined(__MWERKS__) && defined(__MACH__) + #ifndef WXWIN_OS_DESCRIPTION + #define WXWIN_OS_DESCRIPTION "MacOS X" + #endif + #ifndef HAVE_NANOSLEEP + #define HAVE_NANOSLEEP + #endif + #ifndef HAVE_UNAME + #define HAVE_UNAME + #endif + + // our configure test believes we can use sigaction() if the function is + // available but Metrowekrs with MSL run-time does have the function but + // doesn't have sigaction struct so finally we can't use it... + #ifdef __MSL__ + #undef wxUSE_ON_FATAL_EXCEPTION + #define wxUSE_ON_FATAL_EXCEPTION 0 + #endif +#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 -# ifdef __BSD__ -# include -# include -# else -# include -# endif + #ifdef __BSD__ + #include + #include + #else // !__BSD__ + #include + #endif // __BSD__/!__BSD__ + + #define wxStatfs statfs + + #ifndef HAVE_STATFS_DECL + // some systems lack statfs() prototype in the system headers (AIX 4) + extern "C" int statfs(const char *path, struct statfs *buf); + #endif #endif // HAVE_STATFS -// not only the statfs syscall is called differently depending on platform, but -// we also can't use "struct statvfs" under Solaris because it breaks down if -// HAVE_LARGEFILE_SUPPORT == 1 and we must use statvfs_t instead #ifdef HAVE_STATVFS #include - #define statfs statvfs - #define wxStatFs statvfs_t -#elif HAVE_STATFS - #define wxStatFs struct statfs -#endif // HAVE_STAT[V]FS + #define wxStatfs statvfs +#endif // HAVE_STATVFS -#if wxUSE_GUI - #include "wx/unix/execute.h" +#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 @@ -64,9 +132,8 @@ #include #include #include -#include #include -#include +#include #include #include #include @@ -79,6 +146,12 @@ #include // for uname() #endif // HAVE_UNAME +// Used by wxGetFreeMemory(). +#ifdef __SGI__ + #include + #include // for SAGET and MINFO structures +#endif + // ---------------------------------------------------------------------------- // conditional compilation // ---------------------------------------------------------------------------- @@ -87,26 +160,22 @@ // headers - please add your system here if it is the case for your OS. // SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this. #if !defined(HAVE_USLEEP) && \ - (defined(__SUN__) && !defined(__SunOs_5_6) && \ + ((defined(__SUN__) && !defined(__SunOs_5_6) && \ !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \ - defined(__osf__) || defined(__EMX__) + defined(__osf__) || defined(__EMX__)) extern "C" { - #ifdef __SUN__ + #ifdef __EMX__ + /* I copied this from the XFree86 diffs. AV. */ + #define INCL_DOSPROCESS + #include + inline void usleep(unsigned long delay) + { + DosSleep(delay ? (delay/1000l) : 1l); + } + #else // Unix int usleep(unsigned int usec); - #else // !Sun - #ifdef __EMX__ - /* I copied this from the XFree86 diffs. AV. */ - #define INCL_DOSPROCESS - #include - inline void usleep(unsigned long delay) - { - DosSleep(delay ? (delay/1000l) : 1l); - } - #else // !Sun && !EMX - void usleep(unsigned long usec); - #endif - #endif // Sun/EMX/Something else + #endif // __EMX__/Unix }; #define HAVE_USLEEP 1 @@ -125,12 +194,12 @@ void wxSleep(int nSecs) sleep(nSecs); } -void wxUsleep(unsigned long milliseconds) +void wxMicroSleep(unsigned long microseconds) { #if defined(HAVE_NANOSLEEP) timespec tmReq; - tmReq.tv_sec = (time_t)(milliseconds / 1000); - tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000; + tmReq.tv_sec = (time_t)(microseconds / 1000000); + tmReq.tv_nsec = (microseconds % 1000000) * 1000; // we're not interested in remaining time nor in return value (void)nanosleep(&tmReq, (timespec *)NULL); @@ -143,25 +212,30 @@ void wxUsleep(unsigned long milliseconds) #error "usleep() cannot be used in MT programs under Solaris." #endif // Sun - usleep(milliseconds * 1000); // usleep(3) wants microseconds + usleep(microseconds); #elif defined(HAVE_SLEEP) // under BeOS sleep() takes seconds (what about other platforms, if any?) - sleep(milliseconds * 1000); + sleep(microseconds * 1000000); #else // !sleep function - #error "usleep() or nanosleep() function required for wxUsleep" + #error "usleep() or nanosleep() function required for wxMicroSleep" #endif // sleep function } +void wxMilliSleep(unsigned long milliseconds) +{ + wxMicroSleep(milliseconds*1000); +} + // ---------------------------------------------------------------------------- // process management // ---------------------------------------------------------------------------- -int wxKill(long pid, wxSignal sig, wxKillError *rc) +int wxKill(long pid, wxSignal sig, wxKillError *rc, int flags) { - int err = kill((pid_t)pid, (int)sig); + int err = kill((pid_t) (flags & wxKILL_CHILDREN) ? -pid : pid, (int)sig); if ( rc ) { - switch ( errno ) + switch ( err ? errno : 0 ) { case 0: *rc = wxKILL_OK; @@ -191,120 +265,13 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc) return err; } -#define WXEXECUTE_NARGS 127 - -long wxExecute( const wxString& command, int flags, wxProcess *process ) -{ - wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") ); - - int argc = 0; - wxChar *argv[WXEXECUTE_NARGS]; - wxString argument; - const wxChar *cptr = command.c_str(); - wxChar quotechar = wxT('\0'); // is arg quoted? - bool escaped = FALSE; - - // split the command line in arguments - do - { - argument=wxT(""); - quotechar = wxT('\0'); - - // eat leading whitespace: - while ( wxIsspace(*cptr) ) - cptr++; - - if ( *cptr == wxT('\'') || *cptr == wxT('"') ) - quotechar = *cptr++; - - do - { - if ( *cptr == wxT('\\') && ! escaped ) - { - escaped = TRUE; - cptr++; - continue; - } - - // all other characters: - argument += *cptr++; - escaped = FALSE; - - // have we reached the end of the argument? - if ( (*cptr == quotechar && ! escaped) - || (quotechar == wxT('\0') && wxIsspace(*cptr)) - || *cptr == wxT('\0') ) - { - wxASSERT_MSG( argc < WXEXECUTE_NARGS, - wxT("too many arguments in wxExecute") ); - - argv[argc] = new wxChar[argument.length() + 1]; - wxStrcpy(argv[argc], argument.c_str()); - argc++; - - // if not at end of buffer, swallow last character: - if(*cptr) - cptr++; - - break; // done with this one, start over - } - } while(*cptr); - } while(*cptr); - argv[argc] = NULL; - - // do execute the command -#if wxUSE_UNICODE - long lRc = -1; -#else - long lRc = wxExecute(argv, flags, process); -#endif - - // clean up - argc = 0; - while( argv[argc] ) - delete [] argv[argc++]; - - return lRc; -} - -// ---------------------------------------------------------------------------- -// wxShell -// ---------------------------------------------------------------------------- - -static wxString wxMakeShellCommand(const wxString& command) -{ - wxString cmd; - if ( !command ) - { - // just an interactive shell - cmd = _T("xterm"); - } - else - { - // execute command in a shell - cmd << _T("/bin/sh -c '") << command << _T('\''); - } - - return cmd; -} - -bool wxShell(const wxString& command) -{ - return wxExecute(wxMakeShellCommand(command), wxEXEC_SYNC) == 0; -} - -bool wxShell(const wxString& command, wxArrayString& output) -{ - wxCHECK_MSG( !!command, FALSE, _T("can't exec shell non interactively") ); - - return wxExecute(wxMakeShellCommand(command), output); -} - // Shutdown or reboot the PC -bool wxShutdown(wxShutdownFlags wFlags) +bool wxShutdown(int flags) { + flags &= ~wxSHUTDOWN_FORCE; + wxChar level; - switch ( wFlags ) + switch ( flags ) { case wxSHUTDOWN_POWEROFF: level = _T('0'); @@ -314,65 +281,28 @@ bool wxShutdown(wxShutdownFlags wFlags) level = _T('6'); break; + case wxSHUTDOWN_LOGOFF: + // TODO: use dcop to log off? + return false; + default: wxFAIL_MSG( _T("unknown wxShutdown() flag") ); - return FALSE; + return false; } - return system(wxString::Format(_T("init %c"), level).mb_str()) == 0; + return system(wxString::Format("init %c", level).mb_str()) == 0; } - -#if wxUSE_GUI - -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_GUI - // ---------------------------------------------------------------------------- // wxStream classes to support IO redirection in wxExecute // ---------------------------------------------------------------------------- -#if wxUSE_STREAMS +#if HAS_PIPE_INPUT_STREAM -// ---------------------------------------------------------------------------- -// wxPipeInputStream: stream for reading from a pipe -// ---------------------------------------------------------------------------- - -class wxPipeInputStream : public wxFileInputStream -{ -public: - wxPipeInputStream(int fd) : wxFileInputStream(fd) { } - - // return TRUE if the pipe is still opened - bool IsOpened() const { return !Eof(); } - - // return TRUE if we have anything to read, don't block - bool IsAvailable() const; -}; - -bool wxPipeInputStream::IsAvailable() const +bool wxPipeInputStream::CanRead() const { if ( m_lasterror == wxSTREAM_EOF ) - return FALSE; + return false; // check if there is any input available struct timeval tv; @@ -382,8 +312,10 @@ bool wxPipeInputStream::IsAvailable() const const int fd = m_file->fd(); fd_set readfds; - FD_ZERO(&readfds); - FD_SET(fd, &readfds); + + wxFD_ZERO(&readfds); + wxFD_SET(fd, &readfds); + switch ( select(fd + 1, &readfds, NULL, NULL, &tv) ) { case -1: @@ -391,7 +323,7 @@ bool wxPipeInputStream::IsAvailable() const // fall through case 0: - return FALSE; + return false; default: wxFAIL_MSG(_T("unexpected select() return value")); @@ -405,100 +337,132 @@ bool wxPipeInputStream::IsAvailable() const } } -// 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 +#endif // HAS_PIPE_INPUT_STREAM // ---------------------------------------------------------------------------- -// wxPipe: this encapsulates pipe() system call +// wxShell // ---------------------------------------------------------------------------- -class wxPipe +static wxString wxMakeShellCommand(const wxString& command) { -public: - // the symbolic names for the pipe ends - enum Direction + wxString cmd; + if ( !command ) { - Read, - Write - }; - - enum + // just an interactive shell + cmd = _T("xterm"); + } + else { - INVALID_FD = -1 - }; + // execute command in a shell + cmd << _T("/bin/sh -c '") << command << _T('\''); + } - // default ctor doesn't do anything - wxPipe() { m_fds[Read] = m_fds[Write] = INVALID_FD; } + return cmd; +} - // create the pipe, return TRUE if ok, FALSE on error - bool Create() - { - if ( pipe(m_fds) == -1 ) - { - wxLogSysError(_("Pipe creation failed")); +bool wxShell(const wxString& command) +{ + return wxExecute(wxMakeShellCommand(command), wxEXEC_SYNC) == 0; +} - return FALSE; - } +bool wxShell(const wxString& command, wxArrayString& output) +{ + wxCHECK_MSG( !command.empty(), false, _T("can't exec shell non interactively") ); - return TRUE; - } + return wxExecute(wxMakeShellCommand(command), output); +} - // return TRUE if we were created successfully - bool IsOk() const { return m_fds[Read] != INVALID_FD; } +namespace +{ - // return the descriptor for one of the pipe ends - int operator[](Direction which) const +// helper class for storing arguments as char** array suitable for passing to +// execvp(), whatever form they were passed to us +class ArgsArray +{ +public: + ArgsArray(const wxArrayString& args) { - wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds), - _T("invalid pipe index") ); + Init(args.size()); - return m_fds[which]; + for ( int i = 0; i < m_argc; i++ ) + { + m_argv[i] = wxStrdup(args[i]); + } } - // detach a descriptor, meaning that the pipe dtor won't close it, and - // return it - int Detach(Direction which) +#if wxUSE_UNICODE + ArgsArray(wchar_t **wargv) { - wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds), - _T("invalid pipe index") ); + int argc = 0; + while ( *wargv++ ) + argc++; - int fd = m_fds[which]; - m_fds[which] = INVALID_FD; + Init(argc); - return fd; + for ( int i = 0; i < m_argc; i++ ) + { + m_argv[i] = wxSafeConvertWX2MB(wargv[i]).release(); + } } +#endif // wxUSE_UNICODE - // close the pipe descriptors - void Close() + ~ArgsArray() { - for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ ) + for ( int i = 0; i < m_argc; i++ ) { - if ( m_fds[n] != INVALID_FD ) - close(m_fds[n]); + free(m_argv[i]); } + + delete [] m_argv; } - // dtor closes the pipe descriptors - ~wxPipe() { Close(); } + operator char**() const { return m_argv; } private: - int m_fds[2]; + void Init(int argc) + { + m_argc = argc; + m_argv = new char *[m_argc + 1]; + m_argv[m_argc] = NULL; + } + + int m_argc; + char **m_argv; + + DECLARE_NO_COPY_CLASS(ArgsArray) }; +} // anonymous namespace + // ---------------------------------------------------------------------------- -// wxExecute: the real worker function +// wxExecute implementations // ---------------------------------------------------------------------------- -#ifdef __VMS - #pragma message disable codeunreachable +#if defined(__DARWIN__) +bool wxMacLaunch(char **argv); #endif -long wxExecute(wxChar **argv, - int flags, - wxProcess *process) +long wxExecute(const wxString& command, int flags, wxProcess *process) +{ + ArgsArray argv(wxCmdLineParser::ConvertStringToArgs(command, + wxCMD_LINE_SPLIT_UNIX)); + + return wxExecute(argv, flags, process); +} + +#if wxUSE_UNICODE + +long wxExecute(wchar_t **wargv, int flags, wxProcess *process) +{ + ArgsArray argv(wargv); + + return wxExecute(argv, flags, process); +} + +#endif // wxUSE_UNICODE + +// wxExecute: the real worker function +long wxExecute(char **argv, int flags, wxProcess *process) { // for the sync execution, we return -1 to indicate failure, but for async // case we return 0 which is never a valid PID @@ -509,41 +473,40 @@ long wxExecute(wxChar **argv, wxCHECK_MSG( *argv, ERROR_RETURN_CODE, wxT("can't exec empty command") ); -#if wxUSE_UNICODE - int mb_argc = 0; - char *mb_argv[WXEXECUTE_NARGS]; - - while (argv[mb_argc]) +#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 + +#if defined(__WXCOCOA__) || ( defined(__WXOSX_MAC__) && wxOSX_USE_COCOA_OR_CARBON ) + // wxMacLaunch() only executes app bundles and only does it asynchronously. + // It returns false if the target is not an app bundle, thus falling + // through to the regular code for non app bundles. + if ( !(flags & wxEXEC_SYNC) && wxMacLaunch(argv) ) { - wxWX2MBbuf mb_arg = wxConvertWX2MB(argv[mb_argc]); - mb_argv[mb_argc] = strdup(mb_arg); - mb_argc++; + // we don't have any PID to return so just make up something non null + return -1; } - mb_argv[mb_argc] = (char *) NULL; +#endif // __DARWIN__ - // this macro will free memory we used above - #define ARGS_CLEANUP \ - for ( mb_argc = 0; mb_argv[mb_argc]; mb_argc++ ) \ - free(mb_argv[mb_argc]) -#else // ANSI - // no need for cleanup - #define ARGS_CLEANUP - wxChar **mb_argv = argv; -#endif // Unicode/ANSI + // this struct contains all information which we use for housekeeping + wxExecuteData execData; + execData.flags = flags; + execData.process = process; -#if wxUSE_GUI // create pipes - wxPipe pipeEndProcDetect; - if ( !pipeEndProcDetect.Create() ) + if ( !execData.pipeEndProcDetect.Create() ) { wxLogError( _("Failed to execute '%s'\n"), *argv ); - ARGS_CLEANUP; - return ERROR_RETURN_CODE; } -#endif // wxUSE_GUI // pipes for inter process communication wxPipe pipeIn, // stdin @@ -556,8 +519,6 @@ long wxExecute(wxChar **argv, { wxLogError( _("Failed to execute '%s'\n"), *argv ); - ARGS_CLEANUP; - return ERROR_RETURN_CODE; } } @@ -577,8 +538,6 @@ long wxExecute(wxChar **argv, { wxLogSysError( _("Fork failed") ); - ARGS_CLEANUP; - return ERROR_RETURN_CODE; } else if ( pid == 0 ) // we're in child @@ -589,15 +548,14 @@ long wxExecute(wxChar **argv, // start an xterm executing it. if ( !(flags & wxEXEC_SYNC) ) { - for ( int fd = 0; fd < FD_SETSIZE; fd++ ) + // FD_SETSIZE is unsigned under BSD, signed under other platforms + // so we need a cast to avoid warnings on all platforms + for ( int fd = 0; fd < (int)FD_SETSIZE; fd++ ) { if ( fd == pipeIn[wxPipe::Read] || fd == pipeOut[wxPipe::Write] || fd == pipeErr[wxPipe::Write] -#if wxUSE_GUI - || fd == pipeEndProcDetect[wxPipe::Write] -#endif // wxUSE_GUI - ) + || fd == (execData.pipeEndProcDetect)[wxPipe::Write] ) { // don't close this one, we still need it continue; @@ -618,12 +576,11 @@ long wxExecute(wxChar **argv, } #endif // !__VMS -#if wxUSE_GUI // reading side can be safely closed but we should keep the write one - // opened - pipeEndProcDetect.Detach(wxPipe::Write); - pipeEndProcDetect.Close(); -#endif // wxUSE_GUI + // opened, it will be only closed when the process terminates resulting + // in a read notification to the parent + execData.pipeEndProcDetect.Detach(wxPipe::Write); + execData.pipeEndProcDetect.Close(); // redirect stdin, stdout and stderr if ( pipeIn.IsOk() ) @@ -640,7 +597,12 @@ long wxExecute(wxChar **argv, pipeErr.Close(); } - execvp (*mb_argv, mb_argv); + execvp(*argv, argv); + + fprintf(stderr, "execvp("); + for ( char **a = argv; *a; a++ ) + fprintf(stderr, "%s%s", a == argv ? "" : ", ", *a); + fprintf(stderr, ") failed with error %d!\n", errno); // there is no return after successful exec() _exit(-1); @@ -657,35 +619,40 @@ long wxExecute(wxChar **argv, } else // we're in parent { - ARGS_CLEANUP; + // save it for WaitForChild() use + execData.pid = pid; // prepare for IO redirection -#if wxUSE_STREAMS +#if HAS_PIPE_INPUT_STREAM // 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 ( process && process->IsRedirected() ) { -#if wxUSE_STREAMS wxOutputStream *inStream = new wxFileOutputStream(pipeIn.Detach(wxPipe::Write)); - wxPipeInputStream *outStream = - new wxPipeInputStream(pipeOut.Detach(wxPipe::Read)); + const int fdOut = pipeOut.Detach(wxPipe::Read); + wxPipeInputStream *outStream = new wxPipeInputStream(fdOut); - wxPipeInputStream *errStream = - new wxPipeInputStream(pipeErr.Detach(wxPipe::Read)); + const int fdErr = pipeErr.Detach(wxPipe::Read); + wxPipeInputStream *errStream = new wxPipeInputStream(fdErr); process->SetPipeStreams(outStream, inStream, errStream); bufOut.Init(outStream); bufErr.Init(errStream); -#endif // wxUSE_STREAMS + + execData.bufOut = &bufOut; + execData.bufErr = &bufErr; + + execData.fdOut = fdOut; + execData.fdErr = fdErr; } +#endif // HAS_PIPE_INPUT_STREAM if ( pipeIn.IsOk() ) { @@ -694,83 +661,22 @@ long wxExecute(wxChar **argv, pipeErr.Close(); } -#if wxUSE_GUI && !defined(__WXMICROWIN__) - wxEndProcessData *data = new wxEndProcessData; - - data->tag = wxAddProcessCallback - ( - data, - pipeEndProcDetect.Detach(wxPipe::Read) - ); - - pipeEndProcDetect.Close(); - - if ( 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 - data->process = NULL; - - // sync execution: indicate it by negating the pid - data->pid = -pid; - - wxBusyCursor bc; - wxWindowDisabler wd; - - // data->pid will be set to 0 from GTK_EndProcessDetector when the - // process terminates - while ( data->pid != 0 ) - { -#if wxUSE_STREAMS - bufOut.Update(); - bufErr.Update(); -#endif // wxUSE_STREAMS - - // give GTK+ a chance to call GTK_EndProcessDetector here and - // also repaint the GUI - wxYield(); - } - - int exitcode = data->exitcode; - - delete data; - - 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; - - return pid; - } -#else // !wxUSE_GUI - - wxASSERT_MSG( flags & wxEXEC_SYNC, - wxT("async execution not supported yet") ); + // 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; - int exitcode = 0; - if ( waitpid(pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) ) - { - wxLogSysError(_("Waiting for subprocess termination failed")); - } - - return exitcode; -#endif // wxUSE_GUI + return traits->WaitForChild(execData); } +#if !defined(__VMS) && !defined(__INTEL_COMPILER) return ERROR_RETURN_CODE; -} - -#ifdef __VMS - #pragma message enable codeunreachable #endif +} #undef ERROR_RETURN_CODE -#undef ARGS_CLEANUP // ---------------------------------------------------------------------------- // file and directory functions @@ -778,9 +684,9 @@ long wxExecute(wxChar **argv, const wxChar* wxGetHomeDir( wxString *home ) { - *home = wxGetUserHome( wxString() ); + *home = wxGetUserHome(); wxString tmp; - if ( home->IsEmpty() ) + if ( home->empty() ) *home = wxT("/"); #ifdef __VMS tmp = *home; @@ -790,11 +696,7 @@ const wxChar* wxGetHomeDir( wxString *home ) return home->c_str(); } -#if wxUSE_UNICODE -const wxMB2WXbuf wxGetUserHome( const wxString &user ) -#else // just for binary compatibility -- there is no 'const' here -char *wxGetUserHome( const wxString &user ) -#endif +wxString wxGetUserHome( const wxString &user ) { struct passwd *who = (struct passwd *) NULL; @@ -806,13 +708,15 @@ char *wxGetUserHome( const wxString &user ) { return ptr; } - if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL) + + if ((ptr = wxGetenv(wxT("USER"))) != NULL || + (ptr = wxGetenv(wxT("LOGNAME"))) != NULL) { - who = getpwnam(wxConvertWX2MB(ptr)); + who = getpwnam(wxSafeConvertWX2MB(ptr)); } - // We now make sure the the user exists! - if (who == NULL) + // make sure the user exists! + if ( !who ) { who = getpwuid(getuid()); } @@ -822,19 +726,48 @@ char *wxGetUserHome( const wxString &user ) who = getpwnam (user.mb_str()); } - return wxConvertMB2WX(who ? who->pw_dir : 0); + return wxSafeConvertMB2WX(who ? who->pw_dir : 0); } // ---------------------------------------------------------------------------- // network and user id routines // ---------------------------------------------------------------------------- +// private utility function which returns output of the given command, removing +// the trailing newline +static wxString wxGetCommandOutput(const wxString &cmd) +{ + FILE *f = popen(cmd.ToAscii(), "r"); + if ( !f ) + { + wxLogSysError(_T("Executing \"%s\" failed"), cmd.c_str()); + return wxEmptyString; + } + + wxString s; + char buf[256]; + while ( !feof(f) ) + { + if ( !fgets(buf, sizeof(buf), f) ) + break; + + s += wxString::FromAscii(buf); + } + + pclose(f); + + if ( !s.empty() && s.Last() == _T('\n') ) + s.RemoveLast(); + + return s; +} + // retrieve either the hostname or FQDN depending on platform (caller must // check whether it's one or the other, this is why this function is for // private use only) static bool wxGetHostNameInternal(wxChar *buf, int sz) { - wxCHECK_MSG( buf, FALSE, wxT("NULL pointer in wxGetHostNameInternal") ); + wxCHECK_MSG( buf, false, wxT("NULL pointer in wxGetHostNameInternal") ); *buf = wxT('\0'); @@ -844,15 +777,21 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz) bool ok = uname(&uts) != -1; if ( ok ) { - wxStrncpy(buf, wxConvertMB2WX(uts.nodename), sz - 1); + wxStrncpy(buf, wxSafeConvertMB2WX(uts.nodename), sz - 1); buf[sz] = wxT('\0'); } #elif defined(HAVE_GETHOSTNAME) - bool ok = gethostname(buf, sz) != -1; + char cbuf[sz]; + bool ok = gethostname(cbuf, sz) != -1; + if ( ok ) + { + wxStrncpy(buf, wxSafeConvertMB2WX(cbuf), sz - 1); + buf[sz] = wxT('\0'); + } #else // no uname, no gethostname wxFAIL_MSG(wxT("don't know host name for this machine")); - bool ok = FALSE; + bool ok = false; #endif // uname/gethostname if ( !ok ) @@ -890,17 +829,17 @@ bool wxGetFullHostName(wxChar *buf, int sz) { if ( !wxStrchr(buf, wxT('.')) ) { - struct hostent *host = gethostbyname(wxConvertWX2MB(buf)); + struct hostent *host = gethostbyname(wxSafeConvertWX2MB(buf)); if ( !host ) { wxLogSysError(_("Cannot get the official hostname")); - ok = FALSE; + ok = false; } else { // the canonical name - wxStrncpy(buf, wxConvertMB2WX(host->h_name), sz); + wxStrncpy(buf, wxSafeConvertMB2WX(host->h_name), sz); } } //else: it's already a FQDN (BSD behaves this way) @@ -916,77 +855,89 @@ bool wxGetUserId(wxChar *buf, int sz) *buf = wxT('\0'); if ((who = getpwuid(getuid ())) != NULL) { - wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); - return TRUE; + wxStrncpy (buf, wxSafeConvertMB2WX(who->pw_name), sz - 1); + return true; } - return FALSE; + return false; } bool wxGetUserName(wxChar *buf, int sz) { +#ifdef HAVE_PW_GECOS struct passwd *who; *buf = wxT('\0'); if ((who = getpwuid (getuid ())) != NULL) { - // pw_gecos field in struct passwd is not standard -#ifdef HAVE_PW_GECOS char *comma = strchr(who->pw_gecos, ','); if (comma) *comma = '\0'; // cut off non-name comment fields - wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1); -#else // !HAVE_PW_GECOS - wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); -#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS - return TRUE; + wxStrncpy (buf, wxSafeConvertMB2WX(who->pw_gecos), sz - 1); + return true; } - return FALSE; + return false; +#else // !HAVE_PW_GECOS + return wxGetUserId(buf, sz); +#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS } -#ifndef __WXMAC__ -wxString wxGetOsDescription() +bool wxIsPlatform64Bit() { -#ifndef WXWIN_OS_DESCRIPTION - #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure -#else - return WXWIN_OS_DESCRIPTION; -#endif + const wxString machine = wxGetCommandOutput(wxT("uname -m")); + + // the test for "64" is obviously not 100% reliable but seems to work fine + // in practice + return machine.Contains(wxT("64")) || + machine.Contains(wxT("alpha")); } -#endif -// this function returns the GUI toolkit version in GUI programs, but OS -// version in non-GUI ones -#if !wxUSE_GUI +// these functions are in mac/utils.cpp for wxMac +#ifndef __WXMAC__ -int wxGetOsVersion(int *majorVsn, int *minorVsn) +wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin) { + // get OS version int major, minor; - char name[256]; - - if ( sscanf(WXWIN_OS_DESCRIPTION, "%s %d.%d", name, &major, &minor) != 3 ) + wxString release = wxGetCommandOutput(wxT("uname -r")); + if ( release.empty() || + wxSscanf(release.c_str(), wxT("%d.%d"), &major, &minor) != 2 ) { - // unreckognized uname string format - major = minor = -1; + // failed to get version string or unrecognized format + major = + minor = -1; } - if ( majorVsn ) - *majorVsn = major; - if ( minorVsn ) - *minorVsn = minor; + if ( verMaj ) + *verMaj = major; + if ( verMin ) + *verMin = minor; + + // try to understand which OS are we running + wxString kernel = wxGetCommandOutput(wxT("uname -s")); + if ( kernel.empty() ) + kernel = wxGetCommandOutput(wxT("uname -o")); + + if ( kernel.empty() ) + return wxOS_UNKNOWN; - return wxUNIX; + return wxPlatformInfo::GetOperatingSystemId(kernel); } -#endif // !wxUSE_GUI +wxString wxGetOsDescription() +{ + return wxGetCommandOutput(wxT("uname -s -r -m")); +} + +#endif // !__WXMAC__ unsigned long wxGetProcessId() { return (unsigned long)getpid(); } -long wxGetFreeMemory() +wxMemorySize wxGetFreeMemory() { #if defined(__LINUX__) // get it from /proc/meminfo @@ -998,16 +949,43 @@ long wxGetFreeMemory() char buf[1024]; if ( fgets(buf, WXSIZEOF(buf), fp) && fgets(buf, WXSIZEOF(buf), fp) ) { - long memTotal, memUsed; - sscanf(buf, "Mem: %ld %ld %ld", &memTotal, &memUsed, &memFree); + // /proc/meminfo changed its format in kernel 2.6 + if ( wxPlatformInfo().CheckOSVersion(2, 6) ) + { + unsigned long cached, buffers; + sscanf(buf, "MemFree: %ld", &memFree); + + fgets(buf, WXSIZEOF(buf), fp); + sscanf(buf, "Buffers: %lu", &buffers); + + fgets(buf, WXSIZEOF(buf), fp); + sscanf(buf, "Cached: %lu", &cached); + + // add to "MemFree" also the "Buffers" and "Cached" values as + // free(1) does as otherwise the value never makes sense: for + // kernel 2.6 it's always almost 0 + memFree += buffers + cached; + + // values here are always expressed in kB and we want bytes + memFree *= 1024; + } + else // Linux 2.4 (or < 2.6, anyhow) + { + long memTotal, memUsed; + sscanf(buf, "Mem: %ld %ld %ld", &memTotal, &memUsed, &memFree); + } } fclose(fp); - return memFree; + return (wxMemorySize)memFree; } -#elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES) - return sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE); +#elif defined(__SGI__) + struct rminfo realmem; + if ( sysmp(MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0 ) + return ((wxMemorySize)realmem.physmem * sysconf(_SC_PAGESIZE)); +#elif defined(_SC_AVPHYS_PAGES) + return ((wxMemorySize)sysconf(_SC_AVPHYS_PAGES))*sysconf(_SC_PAGESIZE); //#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably #endif @@ -1015,39 +993,39 @@ long wxGetFreeMemory() return -1; } -bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) +bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree) { #if defined(HAVE_STATFS) || defined(HAVE_STATVFS) // the case to "char *" is needed for AIX 4.3 - wxStatFs fs; - if ( statfs((char *)(const char*)path.fn_str(), &fs) != 0 ) + wxStatfs_t fs; + if ( wxStatfs((char *)(const char*)path.fn_str(), &fs) != 0 ) { wxLogSysError( wxT("Failed to get file system statistics") ); - return FALSE; + 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; + wxDiskspaceSize_t blockSize = fs.f_frsize; #else // HAVE_STATFS - wxLongLong blockSize = fs.f_bsize; + wxDiskspaceSize_t blockSize = fs.f_bsize; #endif // HAVE_STATVFS/HAVE_STATFS if ( pTotal ) { - *pTotal = wxLongLong(fs.f_blocks) * blockSize; + *pTotal = wxDiskspaceSize_t(fs.f_blocks) * blockSize; } if ( pFree ) { - *pFree = wxLongLong(fs.f_bavail) * blockSize; + *pFree = wxDiskspaceSize_t(fs.f_bavail) * blockSize; } - return TRUE; + return true; #else // !HAVE_STATFS && !HAVE_STATVFS - return FALSE; + return false; #endif // HAVE_STATFS } @@ -1055,46 +1033,105 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) // env vars // ---------------------------------------------------------------------------- +#if USE_PUTENV + +WX_DECLARE_STRING_HASH_MAP(char *, wxEnvVars); + +static wxEnvVars gs_envVars; + +class wxSetEnvModule : public wxModule +{ +public: + virtual bool OnInit() { return true; } + virtual void OnExit() + { + for ( wxEnvVars::const_iterator i = gs_envVars.begin(); + i != gs_envVars.end(); + ++i ) + { + free(i->second); + } + + gs_envVars.clear(); + } + + DECLARE_DYNAMIC_CLASS(wxSetEnvModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxSetEnvModule, wxModule) + +#endif // USE_PUTENV + bool wxGetEnv(const wxString& var, wxString *value) { // wxGetenv is defined as getenv() - wxChar *p = wxGetenv(var); + char *p = wxGetenv(var); if ( !p ) - return FALSE; + return false; if ( value ) { *value = p; } - return TRUE; + return true; } -bool wxSetEnv(const wxString& variable, const wxChar *value) +static bool wxDoSetEnv(const wxString& variable, const char *value) { #if defined(HAVE_SETENV) - return setenv(variable.mb_str(), - value ? (const char *)wxString(value).mb_str() - : NULL, - 1 /* overwrite */) == 0; + if ( !value ) + { +#ifdef HAVE_UNSETENV + // don't test unsetenv() return value: it's void on some systems (at + // least Darwin) + unsetenv(variable.mb_str()); + return true; +#else + value = ""; // we can't pass NULL to setenv() +#endif + } + + return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0; #elif defined(HAVE_PUTENV) wxString s = variable; if ( value ) s << _T('=') << value; // transform to ANSI - const char *p = s.mb_str(); + const wxWX2MBbuf p = s.mb_str(); - // the string will be free()d by libc char *buf = (char *)malloc(strlen(p) + 1); strcpy(buf, p); + // store the string to free() it later + wxEnvVars::iterator i = gs_envVars.find(variable); + if ( i != gs_envVars.end() ) + { + free(i->second); + i->second = buf; + } + else // this variable hadn't been set before + { + gs_envVars[variable] = buf; + } + return putenv(buf) == 0; #else // no way to set an env var - return FALSE; + return false; #endif } +bool wxSetEnv(const wxString& variable, const wxString& value) +{ + return wxDoSetEnv(variable, value.mb_str()); +} + +bool wxUnsetEnv(const wxString& variable) +{ + return wxDoSetEnv(variable, NULL); +} + // ---------------------------------------------------------------------------- // signal handling // ---------------------------------------------------------------------------- @@ -1117,13 +1154,13 @@ extern "C" void wxFatalSignalHandler(wxTYPE_SA_HANDLER) bool wxHandleFatalExceptions(bool doit) { // old sig handlers - static bool s_savedHandlers = FALSE; + static bool s_savedHandlers = false; static struct sigaction s_handlerFPE, s_handlerILL, s_handlerBUS, s_handlerSEGV; - bool ok = TRUE; + bool ok = true; if ( doit && !s_savedHandlers ) { // install the signal handler @@ -1145,7 +1182,7 @@ bool wxHandleFatalExceptions(bool doit) wxLogDebug(_T("Failed to install our signal handler.")); } - s_savedHandlers = TRUE; + s_savedHandlers = true; } else if ( s_savedHandlers ) { @@ -1159,7 +1196,7 @@ bool wxHandleFatalExceptions(bool doit) wxLogDebug(_T("Failed to uninstall our signal handler.")); } - s_savedHandlers = FALSE; + s_savedHandlers = false; } //else: nothing to do @@ -1169,36 +1206,262 @@ bool wxHandleFatalExceptions(bool doit) #endif // wxUSE_ON_FATAL_EXCEPTION // ---------------------------------------------------------------------------- -// error and debug output routines (deprecated, use wxLog) +// wxExecute support // ---------------------------------------------------------------------------- -#if WXWIN_COMPATIBILITY_2_2 +int wxAppTraits::AddProcessCallback(wxEndProcessData *data, int fd) +{ + // define a custom handler processing only the closure of the descriptor + struct wxEndProcessFDIOHandler : public wxFDIOHandler + { + wxEndProcessFDIOHandler(wxEndProcessData *data, int fd) + : m_data(data), m_fd(fd) + { + } + + virtual void OnReadWaiting() + { + wxFDIODispatcher::Get()->UnregisterFD(m_fd); + close(m_fd); + + wxHandleProcessTermination(m_data); + + delete this; + } + + virtual void OnWriteWaiting() { wxFAIL_MSG("unreachable"); } + virtual void OnExceptionWaiting() { wxFAIL_MSG("unreachable"); } + + wxEndProcessData * const m_data; + const int m_fd; + }; -void wxDebugMsg( const char *format, ... ) + wxFDIODispatcher::Get()->RegisterFD + ( + fd, + new wxEndProcessFDIOHandler(data, fd), + wxFDIO_INPUT + ); + return fd; // unused, but return something unique for the tag +} + +bool wxAppTraits::CheckForRedirectedIO(wxExecuteData& execData) { - va_list ap; - va_start( ap, format ); - vfprintf( stderr, format, ap ); - fflush( stderr ); - va_end(ap); +#if HAS_PIPE_INPUT_STREAM + bool hasIO = false; + + if ( execData.bufOut && execData.bufOut->Update() ) + hasIO = true; + + if ( execData.bufErr && execData.bufErr->Update() ) + hasIO = true; + + return hasIO; +#else // !HAS_PIPE_INPUT_STREAM + return false; +#endif // HAS_PIPE_INPUT_STREAM/!HAS_PIPE_INPUT_STREAM } -void wxError( const wxString &msg, const wxString &title ) +// helper classes/functions used by WaitForChild() +namespace +{ + +// convenient base class for IO handlers which are registered for read +// notifications only and which also stores the FD we're reading from +// +// the derived classes still have to implement OnReadWaiting() +class wxReadFDIOHandler : public wxFDIOHandler { - wxFprintf( stderr, _("Error ") ); - if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) ); - if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) ); - wxFprintf( stderr, wxT(".\n") ); +public: + wxReadFDIOHandler(wxFDIODispatcher& disp, int fd) : m_fd(fd) + { + if ( fd ) + disp.RegisterFD(fd, this, wxFDIO_INPUT); + } + + virtual void OnWriteWaiting() { wxFAIL_MSG("unreachable"); } + virtual void OnExceptionWaiting() { wxFAIL_MSG("unreachable"); } + +protected: + const int m_fd; + + DECLARE_NO_COPY_CLASS(wxReadFDIOHandler) +}; + +// class for monitoring our end of the process detection pipe, simply sets a +// flag when input on the pipe (which must be due to EOF) is detected +class wxEndHandler : public wxReadFDIOHandler +{ +public: + wxEndHandler(wxFDIODispatcher& disp, int fd) + : wxReadFDIOHandler(disp, fd) + { + m_terminated = false; + } + + bool Terminated() const { return m_terminated; } + + virtual void OnReadWaiting() { m_terminated = true; } + +private: + bool m_terminated; + + DECLARE_NO_COPY_CLASS(wxEndHandler) +}; + +#if HAS_PIPE_INPUT_STREAM + +// class for monitoring our ends of child stdout/err, should be constructed +// with the FD and stream from wxExecuteData and will do nothing if they're +// invalid +// +// unlike wxEndHandler this class registers itself with the provided dispatcher +class wxRedirectedIOHandler : public wxReadFDIOHandler +{ +public: + wxRedirectedIOHandler(wxFDIODispatcher& disp, + int fd, + wxStreamTempInputBuffer *buf) + : wxReadFDIOHandler(disp, fd), + m_buf(buf) + { + } + + virtual void OnReadWaiting() + { + m_buf->Update(); + } + +private: + wxStreamTempInputBuffer * const m_buf; + + DECLARE_NO_COPY_CLASS(wxRedirectedIOHandler) +}; + +#endif // HAS_PIPE_INPUT_STREAM + +// helper function which calls waitpid() and analyzes the result +int DoWaitForChild(int pid, int flags = 0) +{ + wxASSERT_MSG( pid > 0, "invalid PID" ); + + int status, rc; + + // loop while we're getting EINTR + for ( ;; ) + { + rc = waitpid(pid, &status, flags); + + if ( rc != -1 || errno != EINTR ) + break; + } + + if ( rc == 0 ) + { + // This can only happen if the child application closes our dummy pipe + // that is used to monitor its lifetime; in that case, our best bet is + // to pretend the process did terminate, because otherwise wxExecute() + // would hang indefinitely (OnReadWaiting() won't be called again, the + // descriptor is closed now). + wxLogDebug("Child process (PID %d) still alive but pipe closed so " + "generating a close notification", pid); + } + else if ( rc == -1 ) + { + wxLogLastError(wxString::Format("waitpid(%d)", pid)); + } + else // child did terminate + { + wxASSERT_MSG( rc == pid, "unexpected waitpid() return value" ); + + if ( WIFEXITED(status) ) + return WEXITSTATUS(status); + else if ( WIFSIGNALED(status) ) + return -WTERMSIG(status); + else + { + wxLogError("Child process (PID %d) exited for unknown reason, " + "status = %d", pid, status); + } + } + + return -1; } -void wxFatalError( const wxString &msg, const wxString &title ) +} // anonymous namespace + +int wxAppTraits::WaitForChild(wxExecuteData& execData) { - wxFprintf( stderr, _("Error ") ); - if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) ); - if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) ); - wxFprintf( stderr, wxT(".\n") ); - exit(3); // the same exit code as for abort() + if ( !(execData.flags & wxEXEC_SYNC) ) + { + // asynchronous execution: just launch the process and return, + // endProcData will be destroyed when it terminates (currently we leak + // it if the process doesn't terminate before we do and this should be + // fixed but it's not a real leak so it's not really very high + // priority) + wxEndProcessData *endProcData = new wxEndProcessData; + endProcData->process = execData.process; + endProcData->pid = execData.pid; + endProcData->tag = AddProcessCallback + ( + endProcData, + execData.GetEndProcReadFD() + ); + endProcData->async = true; + + return execData.pid; + } + //else: synchronous execution case + +#if HAS_PIPE_INPUT_STREAM + wxProcess * const process = execData.process; + if ( process && process->IsRedirected() ) + { + // we can't simply block waiting for the child to terminate as we would + // dead lock if it writes more than the pipe buffer size (typically + // 4KB) bytes of output -- it would then block waiting for us to read + // the data while we'd block waiting for it to terminate + // + // so multiplex here waiting for any input from the child or closure of + // the pipe used to indicate its termination + wxSelectDispatcher disp; + + wxEndHandler endHandler(disp, execData.GetEndProcReadFD()); + + wxRedirectedIOHandler outHandler(disp, execData.fdOut, execData.bufOut), + errHandler(disp, execData.fdErr, execData.bufErr); + + while ( !endHandler.Terminated() ) + { + disp.Dispatch(); + } + } + //else: no IO redirection, just block waiting for the child to exit +#endif // HAS_PIPE_INPUT_STREAM + + return DoWaitForChild(execData.pid); } -#endif // WXWIN_COMPATIBILITY_2_2 +void wxHandleProcessTermination(wxEndProcessData *data) +{ + data->exitcode = DoWaitForChild(data->pid, WNOHANG); + + // notify user about termination if required + if ( data->process ) + { + data->process->OnTerminate(data->pid, data->exitcode); + } + + if ( data->async ) + { + // in case of asynchronous execution we don't need this data any more + // after the child terminates + delete data; + } + else // sync execution + { + // let wxExecute() know that the process has terminated + data->pid = 0; + } +}