X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30760ce7e58df02af3308cd7de8bd7694e791b8d..657309a52bd20b14d5a431a6d4d107fd76f9569a:/src/unix/utilsunx.cpp diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index b87a2a4bb0..7f275de250 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utilsunx.cpp +// Name: src/unix/utilsunx.cpp // Purpose: generic Unix implementation of many wx functions // Author: Vadim Zeitlin // Id: $Id$ @@ -15,39 +15,137 @@ // headers // ---------------------------------------------------------------------------- -#include "wx/defs.h" -#include "wx/string.h" - -#include "wx/intl.h" -#include "wx/log.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/wfstream.h" #include "wx/unix/execute.h" +#include "wx/unix/private.h" + +#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 wxUSE_BASE + +#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 // !__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 + +#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 +// whether _LANGUAGE_C_PLUS_PLUS is set or not - do set it +#if defined(__SGI__) && !defined(_LANGUAGE_C_PLUS_PLUS) + #define _LANGUAGE_C_PLUS_PLUS 1 +#endif // SGI hack #include #include #include #include #include -#include #include -#include +#include #include #include #include #include // for O_WRONLY and friends #include // nanosleep() and/or usleep() #include // isspace() +#include // needed for FD_SETSIZE -// JACS: needed for FD_SETSIZE -#include - -#if HAVE_UNAME +#ifdef HAVE_UNAME #include // for uname() #endif // HAVE_UNAME +// Used by wxGetFreeMemory(). +#ifdef __SGI__ + #include + #include // for SAGET and MINFO structures +#endif + // ---------------------------------------------------------------------------- // conditional compilation // ---------------------------------------------------------------------------- @@ -56,28 +154,25 @@ // 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__ - int usleep(unsigned int usec); - #else // !Sun - #ifdef __EMX + #ifdef __EMX__ /* I copied this from the XFree86 diffs. AV. */ #define INCL_DOSPROCESS #include - void usleep(unsigned long delay) + inline void usleep(unsigned long delay) { DosSleep(delay ? (delay/1000l) : 1l); } - #else - void usleep(unsigned long usec); - #endif - #endif // Sun/EMX/Something else + #else // Unix + int usleep(unsigned int usec); + #endif // __EMX__/Unix }; -#define HAVE_USLEEP 1 + + #define HAVE_USLEEP 1 #endif // Unices without usleep() // ============================================================================ @@ -93,16 +188,16 @@ void wxSleep(int nSecs) sleep(nSecs); } -void wxUsleep(unsigned long milliseconds) +void wxMicroSleep(unsigned long microseconds) { -#if HAVE_NANOSLEEP +#if defined(HAVE_NANOSLEEP) timespec tmReq; - tmReq.tv_sec = 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); -#elif HAVE_USLEEP +#elif defined(HAVE_USLEEP) // uncomment this if you feel brave or if you are sure that your version // of Solaris has a safe usleep() function but please notice that usleep() // is known to lead to crashes in MT programs in Solaris 2.[67] and is not @@ -111,38 +206,94 @@ 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(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) +int wxKill(long pid, wxSignal sig, wxKillError *rc, int flags) { - return kill(pid, (int)sig); + int err = kill((pid_t) (flags & wxKILL_CHILDREN) ? -pid : pid, (int)sig); + if ( rc ) + { + switch ( err ? errno : 0 ) + { + case 0: + *rc = wxKILL_OK; + break; + + case EINVAL: + *rc = wxKILL_BAD_SIGNAL; + break; + + case EPERM: + *rc = wxKILL_ACCESS_DENIED; + break; + + case ESRCH: + *rc = wxKILL_NO_PROCESS; + break; + + default: + // this goes against Unix98 docs so log it + wxLogDebug(_T("unexpected kill(2) return value %d"), err); + + // something else... + *rc = wxKILL_ERROR; + } + } + + return err; } #define WXEXECUTE_NARGS 127 -long wxExecute( const wxString& command, bool sync, wxProcess *process ) +#if defined(__DARWIN__) +long wxMacExecute(wxChar **argv, + int flags, + wxProcess *process); +#endif + +long wxExecute( const wxString& command, int flags, wxProcess *process ) { - wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") ); + wxCHECK_MSG( !command.empty(), 0, wxT("can't exec empty 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 + // 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; const wxChar *cptr = command.c_str(); wxChar quotechar = wxT('\0'); // is arg quoted? - bool escaped = FALSE; + bool escaped = false; // split the command line in arguments do { - argument=wxT(""); + argument = wxEmptyString; quotechar = wxT('\0'); // eat leading whitespace: @@ -156,14 +307,14 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process ) { if ( *cptr == wxT('\\') && ! escaped ) { - escaped = TRUE; + escaped = true; cptr++; continue; } // all other characters: argument += *cptr++; - escaped = FALSE; + escaped = false; // have we reached the end of the argument? if ( (*cptr == quotechar && ! escaped) @@ -187,8 +338,18 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process ) } while(*cptr); argv[argc] = NULL; + long lRc; +#if defined(__DARWIN__) + // wxMacExecute only executes 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 != ((flags & wxEXEC_SYNC) ? -1 : 0)) + return lRc; +#endif + // do execute the command - long lRc = wxExecute(argv, sync, process); + lRc = wxExecute(argv, flags, process); // clean up argc = 0; @@ -198,56 +359,121 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process ) return lRc; } -bool wxShell(const wxString& command) +// ---------------------------------------------------------------------------- +// wxShell +// ---------------------------------------------------------------------------- + +static wxString wxMakeShellCommand(const wxString& command) { wxString cmd; - if ( !!command ) - cmd.Printf(wxT("xterm -e %s"), command.c_str()); + if ( !command ) + { + // just an interactive shell + cmd = _T("xterm"); + } else - cmd = command; + { + // execute command in a shell + cmd << _T("/bin/sh -c '") << command << _T('\''); + } - return wxExecute(cmd) != 0; + return cmd; } -void wxHandleProcessTermination(wxEndProcessData *proc_data) +bool wxShell(const wxString& command) { - int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid); + return wxExecute(wxMakeShellCommand(command), wxEXEC_SYNC) == 0; +} - // 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; - if ( waitpid(pid, &status, 0) == -1 || !WIFEXITED(status) ) - { - wxLogSysError(_("Waiting for subprocess termination failed")); - } - else - { - // notify user about termination if required - if (proc_data->process) - { - proc_data->process->OnTerminate(proc_data->pid, - WEXITSTATUS(status)); - } - } +bool wxShell(const wxString& command, wxArrayString& output) +{ + wxCHECK_MSG( !command.empty(), false, _T("can't exec shell non interactively") ); - // clean up - if ( proc_data->pid > 0 ) + return wxExecute(wxMakeShellCommand(command), output); +} + +// Shutdown or reboot the PC +bool wxShutdown(wxShutdownFlags wFlags) +{ + wxChar level; + switch ( wFlags ) { - delete proc_data; + case wxSHUTDOWN_POWEROFF: + level = _T('0'); + break; + + case wxSHUTDOWN_REBOOT: + level = _T('6'); + break; + + default: + wxFAIL_MSG( _T("unknown wxShutdown() flag") ); + return false; } - else + + return system(wxString::Format(_T("init %c"), level).mb_str()) == 0; +} + +// ---------------------------------------------------------------------------- +// wxStream classes to support IO redirection in wxExecute +// ---------------------------------------------------------------------------- + +#if HAS_PIPE_INPUT_STREAM + +bool wxPipeInputStream::CanRead() const +{ + if ( m_lasterror == wxSTREAM_EOF ) + 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; + + wxFD_ZERO(&readfds); + wxFD_SET(fd, &readfds); + + switch ( select(fd + 1, &readfds, NULL, NULL, &tv) ) { - // wxExecute() will know about it - proc_data->exitcode = status; + case -1: + wxLogSysError(_("Impossible to get child process input")); + // fall through - proc_data->pid = 0; + case 0: + return false; + + default: + wxFAIL_MSG(_T("unexpected select() return value")); + // still fall through + + case 1: + // 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(); } } -long wxExecute( wxChar **argv, bool sync, wxProcess *process ) +#endif // HAS_PIPE_INPUT_STREAM + +// ---------------------------------------------------------------------------- +// wxExecute: the real worker function +// ---------------------------------------------------------------------------- + +long wxExecute(wxChar **argv, int flags, wxProcess *process) { - wxCHECK_MSG( *argv, 0, wxT("can't exec empty command") ); + // for the sync execution, we return -1 to indicate failure, but for async + // case we return 0 which is never a valid PID + // + // 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 ((flags & wxEXEC_SYNC) ? -1 : 0) + + wxCHECK_MSG( *argv, ERROR_RETURN_CODE, wxT("can't exec empty command") ); #if wxUSE_UNICODE int mb_argc = 0; @@ -255,15 +481,15 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) while (argv[mb_argc]) { - wxWX2MBbuf mb_arg = wxConvertWX2MB(argv[mb_argc]); - mb_argv[mb_argc] = strdup(mb_arg); - mb_argc++; + wxWX2MBbuf mb_arg = wxSafeConvertWX2MB(argv[mb_argc]); + mb_argv[mb_argc] = strdup(mb_arg); + mb_argc++; } mb_argv[mb_argc] = (char *) NULL; // this macro will free memory we used above #define ARGS_CLEANUP \ - for ( mb_argc = 0; mb_argb[mb_argc]; mb_argc++ ) \ + for ( mb_argc = 0; mb_argv[mb_argc]; mb_argc++ ) \ free(mb_argv[mb_argc]) #else // ANSI // no need for cleanup @@ -272,149 +498,216 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) 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 0; + return ERROR_RETURN_CODE; + } + + // pipes for inter process communication + wxPipe pipeIn, // stdin + pipeOut, // stdout + pipeErr; // stderr + + if ( process && process->IsRedirected() ) + { + if ( !pipeIn.Create() || !pipeOut.Create() || !pipeErr.Create() ) + { + wxLogError( _("Failed to execute '%s'\n"), *argv ); + + ARGS_CLEANUP; + + return ERROR_RETURN_CODE; + } } -#endif // wxUSE_GUI // fork the process -#if 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) + if ( pid == -1 ) // error? { wxLogSysError( _("Fork failed") ); ARGS_CLEANUP; - return 0; + return ERROR_RETURN_CODE; } - else if (pid == 0) + else if ( pid == 0 ) // we're in child { -#if wxUSE_GUI - // we're in child - close(end_proc_detect[0]); // close reading side -#endif // wxUSE_GUI - - // These three lines close the open file descriptors to to avoid any + // 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 == 0) + // one wants proper IO for the subprocess, the right thing to do is to + // start an xterm executing it. + if ( !(flags & wxEXEC_SYNC) ) { - // leave stderr opened, it won't do any hurm - 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 wxUSE_GUI - if ( fd == end_proc_detect[1] ) + 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; -#endif // wxUSE_GUI + } + // leave stderr opened too, it won't do any harm if ( fd != STDERR_FILENO ) close(fd); } } -#if 0 - close(STDERR_FILENO); +#if !defined(__VMS) && !defined(__EMX__) + if ( flags & wxEXEC_MAKE_GROUP_LEADER ) + { + // 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); - // some programs complain about stderr not being open, so redirect - // them: - open("/dev/null", O_RDONLY); // stdin - open("/dev/null", O_WRONLY); // stdout - open("/dev/null", O_WRONLY); // stderr -#endif + // 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")); + } + + pipeIn.Close(); + pipeOut.Close(); + pipeErr.Close(); + } execvp (*mb_argv, mb_argv); - // there is no return after successful exec() - wxFprintf(stderr, _("Can't execute '%s'\n"), *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 } - else + else // we're in parent { -#if wxUSE_GUI - // we're in parent - close(end_proc_detect[1]); // close writing side + ARGS_CLEANUP; - wxEndProcessData *data = new wxEndProcessData; - data->tag = wxAddProcessCallback(data, end_proc_detect[0]); + // save it for WaitForChild() use + execData.pid = pid; - ARGS_CLEANUP; + // prepare for IO redirection - if ( sync ) - { - wxASSERT_MSG( !process, wxT("wxProcess param ignored for sync exec") ); - data->process = NULL; +#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 // HAS_PIPE_INPUT_STREAM - // sync execution: indicate it by negating the pid - data->pid = -pid; + if ( process && process->IsRedirected() ) + { +#if HAS_PIPE_INPUT_STREAM + wxOutputStream *inStream = + new wxFileOutputStream(pipeIn.Detach(wxPipe::Write)); - // it will be set to 0 from GTK_EndProcessDetector - while (data->pid != 0) - wxYield(); + wxPipeInputStream *outStream = + new wxPipeInputStream(pipeOut.Detach(wxPipe::Read)); - int exitcode = data->exitcode; + wxPipeInputStream *errStream = + new wxPipeInputStream(pipeErr.Detach(wxPipe::Read)); - delete data; + process->SetPipeStreams(outStream, inStream, errStream); - return exitcode; - } - else - { - // async execution, nothing special to do - caller will be - // notified about the process terminationif process != NULL, data - // will be deleted in GTK_EndProcessDetector - data->process = process; - data->pid = pid; + bufOut.Init(outStream); + bufErr.Init(errStream); - return pid; + execData.bufOut = &bufOut; + execData.bufErr = &bufErr; +#endif // HAS_PIPE_INPUT_STREAM } -#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); } - #undef ARGS_CLEANUP +#if !defined(__VMS) && !defined(__INTEL_COMPILER) + return ERROR_RETURN_CODE; +#endif } +#undef ERROR_RETURN_CODE +#undef ARGS_CLEANUP + // ---------------------------------------------------------------------------- // file and directory functions // ---------------------------------------------------------------------------- const wxChar* wxGetHomeDir( wxString *home ) { - *home = wxGetUserHome( wxString() ); - if ( home->IsEmpty() ) + *home = wxGetUserHome(); + wxString tmp; + if ( home->empty() ) *home = wxT("/"); - +#ifdef __VMS + tmp = *home; + if ( tmp.Last() != wxT(']')) + if ( tmp.Last() != wxT('/')) *home << wxT('/'); +#endif 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; @@ -426,13 +719,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()); } @@ -442,19 +737,48 @@ char *wxGetUserHome( const wxString &user ) who = getpwnam (user.mb_str()); } - return wxConvertMB2WX(who ? who->pw_dir : NULL); + 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'); @@ -464,15 +788,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 ) @@ -510,17 +840,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) @@ -536,402 +866,597 @@ 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; - char *comma; *buf = wxT('\0'); - if ((who = getpwuid (getuid ())) != NULL) { - comma = strchr(who->pw_gecos, ','); + if ((who = getpwuid (getuid ())) != NULL) + { + char *comma = strchr(who->pw_gecos, ','); if (comma) *comma = '\0'; // cut off non-name comment fields - wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1); - 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 } -#if wxUSE_GUI +bool wxIsPlatform64Bit() +{ + const wxString machine = wxGetCommandOutput(wxT("uname -m")); -// ---------------------------------------------------------------------------- -// error and debug output routines (deprecated, use wxLog) -// ---------------------------------------------------------------------------- + // 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__ + +wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin) +{ + // 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 ) + { + // failed to get version string or unrecognized format + major = + minor = -1; + } + + 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")); -void wxDebugMsg( const char *format, ... ) + if ( kernel.empty() ) + return wxOS_UNKNOWN; + + return wxPlatformInfo::GetOperatingSystemId(kernel); +} + +wxString wxGetOsDescription() +{ + return wxGetCommandOutput(wxT("uname -s -r -m")); +} + +#endif // !__WXMAC__ + +unsigned long wxGetProcessId() { - va_list ap; - va_start( ap, format ); - vfprintf( stderr, format, ap ); - fflush( stderr ); - va_end(ap); + return (unsigned long)getpid(); } -void wxError( const wxString &msg, const wxString &title ) +wxMemorySize wxGetFreeMemory() { - 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") ); +#if defined(__LINUX__) + // get it from /proc/meminfo + FILE *fp = fopen("/proc/meminfo", "r"); + if ( fp ) + { + long memFree = -1; + + char buf[1024]; + if ( fgets(buf, WXSIZEOF(buf), fp) && fgets(buf, WXSIZEOF(buf), fp) ) + { + // /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(__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 + + // can't find it out + return -1; } -void wxFatalError( const wxString &msg, const wxString &title ) +bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree) { - 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 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( 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 + wxDiskspaceSize_t blockSize = fs.f_frsize; +#else // HAVE_STATFS + wxDiskspaceSize_t blockSize = fs.f_bsize; +#endif // HAVE_STATVFS/HAVE_STATFS + + if ( pTotal ) + { + *pTotal = wxDiskspaceSize_t(fs.f_blocks) * blockSize; + } + + if ( pFree ) + { + *pFree = wxDiskspaceSize_t(fs.f_bavail) * blockSize; + } + + return true; +#else // !HAVE_STATFS && !HAVE_STATVFS + return false; +#endif // HAVE_STATFS } // ---------------------------------------------------------------------------- -// font-related functions +// env vars // ---------------------------------------------------------------------------- -// define the functions to create and destroy native fonts for this toolkit -#ifdef __X__ - static inline wxNativeFont wxLoadFont(const wxString& fontSpec) +#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() { - return XLoadQueryFont((Display *)wxGetDisplay(), fontSpec); + for ( wxEnvVars::const_iterator i = gs_envVars.begin(); + i != gs_envVars.end(); + ++i ) + { + free(i->second); + } + + gs_envVars.clear(); } - static inline void wxFreeFont(wxNativeFont font) + DECLARE_DYNAMIC_CLASS(wxSetEnvModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxSetEnvModule, wxModule) + +#endif // USE_PUTENV + +bool wxGetEnv(const wxString& var, wxString *value) +{ + // wxGetenv is defined as getenv() + char *p = wxGetenv(var); + if ( !p ) + return false; + + if ( value ) { - XFreeFont((Display *)wxGetDisplay(), font); + *value = p; } -#elif defined(__WXGTK__) - #include "gdk/gdk.h" + return true; +} - static inline wxNativeFont wxLoadFont(const wxString& fontSpec) +static bool wxDoSetEnv(const wxString& variable, const char *value) +{ +#if defined(HAVE_SETENV) + if ( !value ) { - return gdk_font_load( wxConvertWX2MB(fontSpec) ); +#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 } - static inline void wxFreeFont(wxNativeFont font) + 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 wxWX2MBbuf p = s.mb_str(); + + 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() ) { - gdk_font_unref(font); + free(i->second); + i->second = buf; } -#else - #error "Unknown GUI toolkit" + 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 +// ---------------------------------------------------------------------------- + +#if wxUSE_ON_FATAL_EXCEPTION -// returns TRUE if there are any fonts matching this font spec -static bool wxTestFontSpec(const wxString& fontspec) +#include + +extern "C" void wxFatalSignalHandler(wxTYPE_SA_HANDLER) +{ + if ( wxTheApp ) + { + // give the user a chance to do something special about this + wxTheApp->OnFatalException(); + } + + abort(); +} + +bool wxHandleFatalExceptions(bool doit) { - wxNativeFont test = wxLoadFont(fontspec); - if ( test ) + // old sig handlers + static bool s_savedHandlers = false; + static struct sigaction s_handlerFPE, + s_handlerILL, + s_handlerBUS, + s_handlerSEGV; + + bool ok = true; + if ( doit && !s_savedHandlers ) { - wxFreeFont(test); + // install the signal handler + struct sigaction act; + + // some systems extend it with non std fields, so zero everything + memset(&act, 0, sizeof(act)); - return TRUE; + act.sa_handler = wxFatalSignalHandler; + sigemptyset(&act.sa_mask); + act.sa_flags = 0; + + ok &= sigaction(SIGFPE, &act, &s_handlerFPE) == 0; + ok &= sigaction(SIGILL, &act, &s_handlerILL) == 0; + ok &= sigaction(SIGBUS, &act, &s_handlerBUS) == 0; + ok &= sigaction(SIGSEGV, &act, &s_handlerSEGV) == 0; + if ( !ok ) + { + wxLogDebug(_T("Failed to install our signal handler.")); + } + + s_savedHandlers = true; } - else + else if ( s_savedHandlers ) { - return FALSE; + // uninstall the signal handler + ok &= sigaction(SIGFPE, &s_handlerFPE, NULL) == 0; + ok &= sigaction(SIGILL, &s_handlerILL, NULL) == 0; + ok &= sigaction(SIGBUS, &s_handlerBUS, NULL) == 0; + ok &= sigaction(SIGSEGV, &s_handlerSEGV, NULL) == 0; + if ( !ok ) + { + wxLogDebug(_T("Failed to uninstall our signal handler.")); + } + + s_savedHandlers = false; } + //else: nothing to do + + return ok; } -// TODO encoding test logic should be moved to wxLoadQueryNearestFont() -static wxNativeFont wxLoadQueryFont(int pointSize, - int family, - int style, - int weight, - bool WXUNUSED(underlined), - const wxString &facename, - wxFontEncoding encoding ) +#endif // wxUSE_ON_FATAL_EXCEPTION + +#endif // wxUSE_BASE + +#if wxUSE_GUI + +#ifdef __DARWIN__ + #include +#endif +// ---------------------------------------------------------------------------- +// wxExecute support +// ---------------------------------------------------------------------------- + +/* + NOTE: If this proves not to work well for wxMac then move back to the old + behavior. If, however, it proves to work just fine, nuke all of the code + for the old behavior. I strongly suggest backporting this to 2.8 as well. + However, beware that while you can nuke the old code here, you cannot + nuke the wxAddProcessCallbackForPid from the 2.8 branch (found in + utilsexc_cf since it's an exported symbol). + */ +// #define USE_OLD_DARWIN_END_PROCESS_DETECT (defined(__DARWIN__) && defined(__WXMAC__)) +#define USE_OLD_DARWIN_END_PROCESS_DETECT 0 + +// wxMac/wxCocoa don't use the same process end detection mechanisms so we don't +// need wxExecute-related helpers for them +#if !USE_OLD_DARWIN_END_PROCESS_DETECT + +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) { - wxString xfamily; - switch (family) + wxEndProcessData *endProcData = new wxEndProcessData; + + const int flags = execData.flags; + + // 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 ( 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 { - case wxDECORATIVE: xfamily = wxT("lucida"); break; - case wxROMAN: xfamily = wxT("times"); break; - case wxMODERN: xfamily = wxT("courier"); break; - case wxSWISS: xfamily = wxT("helvetica"); break; - case wxTELETYPE: xfamily = wxT("lucidatypewriter"); break; - case wxSCRIPT: xfamily = wxT("utopia"); break; - default: xfamily = wxT("*"); + // 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; } - wxString fontSpec; - if (!facename.IsEmpty()) + + if ( !(flags & wxEXEC_NOEVENTS) ) { - fontSpec.Printf(wxT("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), - facename.c_str()); +#if USE_OLD_DARWIN_END_PROCESS_DETECT + endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid); +#else + endProcData->tag = wxAddProcessCallback + ( + endProcData, + execData.pipeEndProcDetect.Detach(wxPipe::Read) + ); + + execData.pipeEndProcDetect.Close(); +#endif // USE_OLD_DARWIN_END_PROCESS_DETECT + } - if ( wxTestFontSpec(fontSpec) ) + if ( flags & wxEXEC_SYNC ) + { + wxBusyCursor bc; + int exitcode = 0; + + wxWindowDisabler *wd = flags & (wxEXEC_NODISABLE | wxEXEC_NOEVENTS) + ? NULL + : new wxWindowDisabler; + + if ( flags & wxEXEC_NOEVENTS ) { - xfamily = facename; - } - //else: no such family, use default one instead - } - - wxString xstyle; - switch (style) - { - case wxITALIC: xstyle = wxT("i"); break; - case wxSLANT: xstyle = wxT("o"); break; - case wxNORMAL: xstyle = wxT("r"); break; - default: xstyle = wxT("*"); break; - } - - wxString xweight; - switch (weight) - { - case wxBOLD: - { - fontSpec.Printf(wxT("-*-%s-bold-*-*-*-*-*-*-*-*-*-*-*"), - xfamily.c_str()); - if ( wxTestFontSpec(fontSpec) ) - { - xweight = wxT("bold"); - break; - } - fontSpec.Printf(wxT("-*-%s-heavy-*-*-*-*-*-*-*-*-*-*-*"), - xfamily.c_str()); - if ( wxTestFontSpec(fontSpec) ) - { - xweight = wxT("heavy"); - break; - } - fontSpec.Printf(wxT("-*-%s-extrabold-*-*-*-*-*-*-*-*-*-*-*"), - xfamily.c_str()); - if ( wxTestFontSpec(fontSpec) ) - { - xweight = wxT("extrabold"); - break; - } - fontSpec.Printf(wxT("-*-%s-demibold-*-*-*-*-*-*-*-*-*-*-*"), - xfamily.c_str()); - if ( wxTestFontSpec(fontSpec) ) - { - xweight = wxT("demibold"); - break; - } - fontSpec.Printf(wxT("-*-%s-black-*-*-*-*-*-*-*-*-*-*-*"), - xfamily.c_str()); - if ( wxTestFontSpec(fontSpec) ) - { - xweight = wxT("black"); - break; - } - fontSpec.Printf(wxT("-*-%s-ultrablack-*-*-*-*-*-*-*-*-*-*-*"), - xfamily.c_str()); - if ( wxTestFontSpec(fontSpec) ) - { - xweight = wxT("ultrablack"); - break; - } - } - break; - case wxLIGHT: - { - fontSpec.Printf(wxT("-*-%s-light-*-*-*-*-*-*-*-*-*-*-*"), - xfamily.c_str()); - if ( wxTestFontSpec(fontSpec) ) - { - xweight = wxT("light"); - break; - } - fontSpec.Printf(wxT("-*-%s-thin-*-*-*-*-*-*-*-*-*-*-*"), - xfamily.c_str()); - if ( wxTestFontSpec(fontSpec) ) - { - xweight = wxT("thin"); - break; - } - } - break; - case wxNORMAL: - { - fontSpec.Printf(wxT("-*-%s-medium-*-*-*-*-*-*-*-*-*-*-*"), - xfamily.c_str()); - if ( wxTestFontSpec(fontSpec) ) - { - xweight = wxT("medium"); - break; - } - fontSpec.Printf(wxT("-*-%s-normal-*-*-*-*-*-*-*-*-*-*-*"), - xfamily.c_str()); - if ( wxTestFontSpec(fontSpec) ) - { - xweight = wxT("normal"); - break; - } - fontSpec.Printf(wxT("-*-%s-regular-*-*-*-*-*-*-*-*-*-*-*"), - xfamily.c_str()); - if ( wxTestFontSpec(fontSpec) ) - { - xweight = wxT("regular"); - break; - } - xweight = wxT("*"); - } - break; - default: xweight = wxT("*"); break; - } - - wxString xregistry, xencoding; - if ( encoding == wxFONTENCODING_DEFAULT ) - { - // use the apps default - encoding = wxFont::GetDefaultEncoding(); - } - - bool test = TRUE; // should we test for availability of encoding? - switch ( encoding ) - { - case wxFONTENCODING_ISO8859_1: - case wxFONTENCODING_ISO8859_2: - case wxFONTENCODING_ISO8859_3: - case wxFONTENCODING_ISO8859_4: - case wxFONTENCODING_ISO8859_5: - case wxFONTENCODING_ISO8859_6: - case wxFONTENCODING_ISO8859_7: - case wxFONTENCODING_ISO8859_8: - case wxFONTENCODING_ISO8859_9: - case wxFONTENCODING_ISO8859_10: - case wxFONTENCODING_ISO8859_11: - case wxFONTENCODING_ISO8859_13: - case wxFONTENCODING_ISO8859_14: - case wxFONTENCODING_ISO8859_15: + // just block waiting for the child to exit + int status = 0; + + int result = waitpid(execData.pid, &status, 0); +#ifdef __DARWIN__ + /* DE: waitpid manpage states that waitpid can fail with EINTR + if the call is interrupted by a caught signal. I suppose + that means that this ought to be a while loop. + + The odd thing is that it seems to fail EVERY time. It fails + with a quickly exiting process (e.g. echo), and fails with a + slowly exiting process (e.g. sleep 2) but clearly after + having waited for the child to exit. Maybe it's a bug in + my particular version. + + It works, however, from the CFSocket callback without this + trick but in that case it's used only after CFSocket calls + the callback and with the WNOHANG flag which would seem to + preclude it from being interrupted or at least make it much + less likely since it would not then be waiting. + + If Darwin's man page is to be believed then this is definitely + necessary. It's just weird that I've never seen it before + and apparently no one else has either or you'd think they'd + have reported it by now. Perhaps blocking the GUI while + waiting for a child process to exit is simply not that common. + */ + if(result == -1 && errno == EINTR) { - int cp = encoding - wxFONTENCODING_ISO8859_1 + 1; - xregistry = wxT("iso8859"); - xencoding.Printf(wxT("%d"), cp); + result = waitpid(execData.pid, &status, 0); } - break; - case wxFONTENCODING_KOI8: - xregistry = wxT("koi8"); - if ( wxTestFontSpec(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-koi8-1")) ) - { - xencoding = wxT("1"); +#endif - // test passed, no need to do it once more - test = FALSE; + if ( result == -1 ) + { + wxLogLastError(_T("waitpid")); + exitcode = -1; } else { - xencoding = wxT("*"); - } - break; + wxASSERT_MSG( result == execData.pid, + _T("unexpected waitpid() return value") ); - case wxFONTENCODING_CP1250: - case wxFONTENCODING_CP1251: - case wxFONTENCODING_CP1252: - { - int cp = encoding - wxFONTENCODING_CP1250 + 1250; - fontSpec.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-microsoft-cp%d"), - cp); - if ( wxTestFontSpec(fontSpec) ) + if ( WIFEXITED(status) ) { - xregistry = wxT("microsoft"); - xencoding.Printf(wxT("cp%d"), cp); - - // test passed, no need to do it once more - test = FALSE; + exitcode = WEXITSTATUS(status); } - else + else // abnormal termination? { - // fall back to LatinX - xregistry = wxT("iso8859"); - xencoding.Printf(wxT("%d"), cp - 1249); + wxASSERT_MSG( WIFSIGNALED(status), + _T("unexpected child wait status") ); + exitcode = -1; } } - break; - - case wxFONTENCODING_SYSTEM: - default: - test = FALSE; - xregistry = - xencoding = wxT("*"); - } - - if ( test ) - { - fontSpec.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-%s-%s"), - xregistry.c_str(), xencoding.c_str()); - if ( !wxTestFontSpec(fontSpec) ) - { - // this encoding isn't available - what to do? - xregistry = - xencoding = wxT("*"); } - } - - // construct the X font spec from our data - fontSpec.Printf(wxT("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-%s-%s"), - xfamily.c_str(), xweight.c_str(), xstyle.c_str(), - pointSize, xregistry.c_str(), xencoding.c_str()); + else // !wxEXEC_NOEVENTS + { + // endProcData->pid will be set to 0 from GTK_EndProcessDetector when the + // process terminates + while ( endProcData->pid != 0 ) + { + bool idle = true; - return wxLoadFont(fontSpec); -} +#if HAS_PIPE_INPUT_STREAM + if ( execData.bufOut ) + { + execData.bufOut->Update(); + idle = false; + } -wxNativeFont wxLoadQueryNearestFont(int pointSize, - int family, - int style, - int weight, - bool underlined, - const wxString &facename, - wxFontEncoding encoding) -{ - wxNativeFont font = wxLoadQueryFont( pointSize, family, style, weight, - underlined, facename, encoding ); + if ( execData.bufErr ) + { + execData.bufErr->Update(); + idle = false; + } +#endif // HAS_PIPE_INPUT_STREAM - if (!font) - { - // search up and down by stepsize 10 - int max_size = pointSize + 20 * (1 + (pointSize/180)); - int min_size = pointSize - 20 * (1 + (pointSize/180)); + // don't consume 100% of the CPU while we're sitting in this + // loop + if ( idle ) + wxMilliSleep(1); - int i; + // give GTK+ a chance to call GTK_EndProcessDetector here and + // also repaint the GUI + wxYield(); + } - // Search for smaller size (approx.) - for ( i = pointSize - 10; !font && i >= 10 && i >= min_size; i -= 10 ) - { - font = wxLoadQueryFont(i, family, style, weight, underlined, - facename, encoding ); + exitcode = endProcData->exitcode; } - // Search for larger size (approx.) - for ( i = pointSize + 10; !font && i <= max_size; i += 10 ) - { - font = wxLoadQueryFont( i, family, style, weight, underlined, - facename, encoding ); - } + delete wd; + delete endProcData; - // Try default family - if ( !font && family != wxDEFAULT ) - { - font = wxLoadQueryFont( pointSize, wxDEFAULT, style, weight, - underlined, facename, encoding ); - } + return exitcode; + } + else // async execution + { + return execData.pid; + } +} - // Bogus font I - if ( !font ) - { - font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL, - underlined, facename, encoding ); - } - - // Bogus font II - if ( !font ) - { - font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL, - underlined, wxEmptyString, encoding ); - } +#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); } - return font; + // 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 +#endif // wxUSE_BASE