X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3afdfec4536f413df63a690964a9601076db7652..57f2a6529245d54274a4c56469f1828a6f8fd497:/src/unix/utilsunx.cpp?ds=sidebyside diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 33caa09fb5..429cf3e2f3 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,34 +15,51 @@ // headers // ---------------------------------------------------------------------------- -#include - // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" -#include "wx/string.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/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/wfstream.h" #include "wx/unix/execute.h" +#include "wx/unix/private.h" -#if wxUSE_STREAMS +#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 // wxUSE_STREAMS +#endif // HAS_PIPE_INPUT_STREAM #if wxUSE_BASE @@ -80,6 +97,11 @@ #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 #ifdef HAVE_STATVFS @@ -118,6 +140,12 @@ #include // for uname() #endif // HAVE_UNAME +// Used by wxGetFreeMemory(). +#ifdef __SGI__ + #include + #include // for SAGET and MINFO structures +#endif + // ---------------------------------------------------------------------------- // conditional compilation // ---------------------------------------------------------------------------- @@ -131,21 +159,17 @@ 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 @@ -246,7 +270,8 @@ long wxMacExecute(wxChar **argv, long wxExecute( const wxString& command, int flags, wxProcess *process ) { wxCHECK_MSG( !command.empty(), 0, wxT("can't exec empty command") ); - wxLogDebug(wxString(wxT("Launching: ")) + command); + + wxLogTrace(wxT("exec"), wxT("Executing \"%s\""), command.c_str()); #if wxUSE_THREADS // fork() doesn't mix well with POSIX threads: on many systems the program @@ -268,7 +293,7 @@ long wxExecute( const wxString& command, int flags, wxProcess *process ) // split the command line in arguments do { - argument=wxT(""); + argument = wxEmptyString; quotechar = wxT('\0'); // eat leading whitespace: @@ -316,10 +341,10 @@ long wxExecute( const wxString& command, int flags, wxProcess *process ) long lRc; #if defined(__DARWIN__) // wxMacExecute only executes app bundles. - // It returns -1 if the target is not an app bundle, thus falling through - // to the regular wxExecute for non app bundles. + // It returns an error code if the target is not an app bundle, thus falling + // through to the regular wxExecute for non app bundles. lRc = wxMacExecute(argv, flags, process); - if( lRc != -1) + if( lRc != ((flags & wxEXEC_SYNC) ? -1 : 0)) return lRc; #endif @@ -389,23 +414,11 @@ bool wxShutdown(wxShutdownFlags wFlags) return system(wxString::Format(_T("init %c"), level).mb_str()) == 0; } -wxPowerType wxGetPowerType() -{ - // TODO - return wxPOWER_UNKNOWN; -} - -wxBatteryState wxGetBatteryState() -{ - // TODO - return wxBATTERY_UNKNOWN_STATE; -} - // ---------------------------------------------------------------------------- // wxStream classes to support IO redirection in wxExecute // ---------------------------------------------------------------------------- -#if wxUSE_STREAMS +#if HAS_PIPE_INPUT_STREAM bool wxPipeInputStream::CanRead() const { @@ -420,8 +433,10 @@ bool wxPipeInputStream::CanRead() 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: @@ -443,19 +458,13 @@ bool wxPipeInputStream::CanRead() const } } -#endif // wxUSE_STREAMS +#endif // HAS_PIPE_INPUT_STREAM // ---------------------------------------------------------------------------- // wxExecute: the real worker function // ---------------------------------------------------------------------------- -#ifdef __VMS - #pragma message disable codeunreachable -#endif - -long wxExecute(wxChar **argv, - int flags, - wxProcess *process) +long wxExecute(wxChar **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 @@ -472,7 +481,7 @@ long wxExecute(wxChar **argv, while (argv[mb_argc]) { - wxWX2MBbuf mb_arg = wxConvertWX2MB(argv[mb_argc]); + wxWX2MBbuf mb_arg = wxSafeConvertWX2MB(argv[mb_argc]); mb_argv[mb_argc] = strdup(mb_arg); mb_argc++; } @@ -604,7 +613,7 @@ long wxExecute(wxChar **argv, } 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_++ ) @@ -633,16 +642,16 @@ long wxExecute(wxChar **argv, // 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 +#endif // HAS_PIPE_INPUT_STREAM if ( process && process->IsRedirected() ) { -#if wxUSE_STREAMS +#if HAS_PIPE_INPUT_STREAM wxOutputStream *inStream = new wxFileOutputStream(pipeIn.Detach(wxPipe::Write)); @@ -659,7 +668,7 @@ long wxExecute(wxChar **argv, execData.bufOut = &bufOut; execData.bufErr = &bufErr; -#endif // wxUSE_STREAMS +#endif // HAS_PIPE_INPUT_STREAM } if ( pipeIn.IsOk() ) @@ -672,12 +681,10 @@ long wxExecute(wxChar **argv, 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 @@ -723,7 +730,7 @@ char *wxGetUserHome( const wxString &user ) } 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! @@ -737,13 +744,42 @@ 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) @@ -759,11 +795,17 @@ 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")); @@ -805,7 +847,7 @@ 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")); @@ -815,7 +857,7 @@ bool wxGetFullHostName(wxChar *buf, int sz) 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) @@ -831,7 +873,7 @@ bool wxGetUserId(wxChar *buf, int sz) *buf = wxT('\0'); if ((who = getpwuid(getuid ())) != NULL) { - wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); + wxStrncpy (buf, wxSafeConvertMB2WX(who->pw_name), sz - 1); return true; } @@ -840,45 +882,70 @@ bool wxGetUserId(wxChar *buf, int sz) 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 + wxStrncpy (buf, wxSafeConvertMB2WX(who->pw_gecos), sz - 1); return true; } return false; +#else // !HAVE_PW_GECOS + return wxGetUserId(buf, sz); +#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS } -// this function is in mac/utils.cpp for wxMac +bool wxIsPlatform64Bit() +{ + 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")); +} + +// these functions are in mac/utils.cpp for wxMac #ifndef __WXMAC__ -wxString wxGetOsDescription() +wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin) { - FILE *f = popen("uname -s -r -m", "r"); - if (f) + // get OS version + int major, minor; + wxString release = wxGetCommandOutput(wxT("uname -r")); + if ( release.empty() || + wxSscanf(release.c_str(), wxT("%d.%d"), &major, &minor) != 2 ) { - char buf[256]; - size_t c = fread(buf, 1, sizeof(buf) - 1, f); - pclose(f); - // Trim newline from output. - if (c && buf[c - 1] == '\n') - --c; - buf[c] = '\0'; - return wxString::FromAscii( buf ); + // failed to get version string or unrecognized format + major = + minor = -1; } - wxFAIL_MSG( _T("uname failed") ); - return _T(""); + + 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 wxPlatformInfo::GetOperatingSystemId(kernel); +} + +wxString wxGetOsDescription() +{ + return wxGetCommandOutput(wxT("uname -s -r -m")); } #endif // !__WXMAC__ @@ -900,16 +967,43 @@ wxMemorySize 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 (wxMemorySize)memFree; } -#elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES) - return (wxMemorySize)(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 @@ -917,7 +1011,7 @@ wxMemorySize 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 @@ -932,19 +1026,19 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) // 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; @@ -957,10 +1051,39 @@ 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; @@ -972,13 +1095,22 @@ bool wxGetEnv(const wxString& var, wxString *value) 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 ) @@ -987,16 +1119,37 @@ bool wxSetEnv(const wxString& variable, const wxChar *value) // transform to ANSI 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; #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 // ---------------------------------------------------------------------------- @@ -1070,40 +1223,6 @@ bool wxHandleFatalExceptions(bool doit) #endif // wxUSE_ON_FATAL_EXCEPTION -// ---------------------------------------------------------------------------- -// error and debug output routines (deprecated, use wxLog) -// ---------------------------------------------------------------------------- - -#if WXWIN_COMPATIBILITY_2_2 - -void wxDebugMsg( const char *format, ... ) -{ - va_list ap; - va_start( ap, format ); - vfprintf( stderr, format, ap ); - fflush( stderr ); - va_end(ap); -} - -void wxError( const wxString &msg, const wxString &title ) -{ - 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") ); -} - -void wxFatalError( const wxString &msg, const wxString &title ) -{ - 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() -} - -#endif // WXWIN_COMPATIBILITY_2_2 - #endif // wxUSE_BASE #if wxUSE_GUI @@ -1182,55 +1301,93 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) } + if ( !(flags & wxEXEC_NOEVENTS) ) + { #if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)) - endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid); + endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid); #else - endProcData->tag = wxAddProcessCallback - ( - endProcData, - execData.pipeEndProcDetect.Detach(wxPipe::Read) - ); + endProcData->tag = wxAddProcessCallback + ( + endProcData, + execData.pipeEndProcDetect.Detach(wxPipe::Read) + ); - execData.pipeEndProcDetect.Close(); + execData.pipeEndProcDetect.Close(); #endif // defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)) + } if ( flags & wxEXEC_SYNC ) { wxBusyCursor bc; - wxWindowDisabler *wd = flags & wxEXEC_NODISABLE ? NULL - : new wxWindowDisabler; + int exitcode = 0; + + wxWindowDisabler *wd = flags & (wxEXEC_NODISABLE | wxEXEC_NOEVENTS) + ? NULL + : new wxWindowDisabler; - // endProcData->pid will be set to 0 from GTK_EndProcessDetector when the - // process terminates - while ( endProcData->pid != 0 ) + if ( flags & wxEXEC_NOEVENTS ) { - bool idle = true; + // just block waiting for the child to exit + int status = 0; -#if wxUSE_STREAMS - if ( execData.bufOut ) + int result = waitpid(execData.pid, &status, 0); + + if ( result == -1 ) { - execData.bufOut->Update(); - idle = false; + wxLogLastError(_T("waitpid")); + exitcode = -1; } - - if ( execData.bufErr ) + else { - execData.bufErr->Update(); - idle = false; + wxASSERT_MSG( result == execData.pid, + _T("unexpected waitpid() return value") ); + + if ( WIFEXITED(status) ) + { + exitcode = WEXITSTATUS(status); + } + else // abnormal termination? + { + wxASSERT_MSG( WIFSIGNALED(status), + _T("unexpected child wait status") ); + exitcode = -1; + } } -#endif // wxUSE_STREAMS + } + else // !wxEXEC_NOEVENTS + { + // endProcData->pid will be set to 0 from GTK_EndProcessDetector when the + // process terminates + while ( endProcData->pid != 0 ) + { + bool idle = true; - // don't consume 100% of the CPU while we're sitting in this - // loop - if ( idle ) - wxMilliSleep(1); +#if HAS_PIPE_INPUT_STREAM + if ( execData.bufOut ) + { + execData.bufOut->Update(); + idle = false; + } - // give GTK+ a chance to call GTK_EndProcessDetector here and - // also repaint the GUI - wxYield(); - } + if ( execData.bufErr ) + { + execData.bufErr->Update(); + idle = false; + } +#endif // HAS_PIPE_INPUT_STREAM - int exitcode = endProcData->exitcode; + // don't consume 100% of the CPU while we're sitting in this + // loop + if ( idle ) + wxMilliSleep(1); + + // give GTK+ a chance to call GTK_EndProcessDetector here and + // also repaint the GUI + wxYield(); + } + + exitcode = endProcData->exitcode; + } delete wd; delete endProcData;