X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15b663b4c3ef63658aee62160476e9f3dc8bfb99..d8809820cc7aa3a38355b65cd4cb1d4040cfb499:/src/unix/utilsunx.cpp diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 94ecc08e2d..4d670f4ea0 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utilsunx.cpp +// Name: unix/utilsunx.cpp // Purpose: generic Unix implementation of many wx functions // Author: Vadim Zeitlin // Id: $Id$ @@ -15,36 +15,82 @@ // headers // ---------------------------------------------------------------------------- +#include + +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/defs.h" #include "wx/string.h" #include "wx/intl.h" #include "wx/log.h" #include "wx/app.h" +#include "wx/apptrait.h" #include "wx/utils.h" #include "wx/process.h" #include "wx/thread.h" -#include "wx/stream.h" +#include "wx/wfstream.h" + +#include "wx/unix/execute.h" + +#if wxUSE_STREAMS + +// define this to let wxexec.cpp know that we know what we're doing +#define _WX_USED_BY_WXEXECUTE_ +#include "../common/execcmn.cpp" + +#endif // wxUSE_STREAMS +#if wxUSE_BASE + +#if defined(__MWERKS__) && defined(__MACH__) + #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 #endif // HAVE_STATFS #ifdef HAVE_STATVFS #include - #define statfs statvfs + #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 @@ -58,9 +104,8 @@ #include #include #include -#include #include -#include +#include #include #include #include @@ -81,9 +126,9 @@ // 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__ @@ -119,12 +164,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); @@ -137,25 +182,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; @@ -187,16 +237,33 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc) #define WXEXECUTE_NARGS 127 +#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") ); + wxLogDebug(wxString(wxT("Launching: ")) + command); + +#if wxUSE_THREADS + // fork() doesn't mix well with POSIX threads: on many systems the program + // deadlocks or crashes for some reason. Probably our code is buggy and + // doesn't do something which must be done to allow this to work, but I + // don't know what yet, so for now just warn the user (this is the least we + // can do) about it + wxASSERT_MSG( wxThread::IsMain(), + _T("wxExecute() can be called only from the main thread") ); +#endif // wxUSE_THREADS int argc = 0; wxChar *argv[WXEXECUTE_NARGS]; wxString argument; 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 @@ -215,14 +282,14 @@ long wxExecute( const wxString& command, int flags, 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) @@ -246,8 +313,18 @@ long wxExecute( const wxString& command, int flags, 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, flags, process); + lRc = wxExecute(argv, flags, process); // clean up argc = 0; @@ -285,34 +362,44 @@ bool wxShell(const wxString& command) bool wxShell(const wxString& command, wxArrayString& output) { - wxCHECK_MSG( !!command, FALSE, _T("can't exec shell non interactively") ); + wxCHECK_MSG( !command.empty(), false, _T("can't exec shell non interactively") ); return wxExecute(wxMakeShellCommand(command), output); } -#if wxUSE_GUI - -void wxHandleProcessTermination(wxEndProcessData *proc_data) +// Shutdown or reboot the PC +bool wxShutdown(wxShutdownFlags wFlags) { - // notify user about termination if required - if ( proc_data->process ) + wxChar level; + switch ( wFlags ) { - proc_data->process->OnTerminate(proc_data->pid, proc_data->exitcode); - } + case wxSHUTDOWN_POWEROFF: + level = _T('0'); + break; - // clean up - if ( proc_data->pid > 0 ) - { - delete proc_data; - } - else - { - // let wxExecute() know that the process has terminated - proc_data->pid = 0; + case wxSHUTDOWN_REBOOT: + level = _T('6'); + break; + + default: + wxFAIL_MSG( _T("unknown wxShutdown() flag") ); + return false; } + + return system(wxString::Format(_T("init %c"), level).mb_str()) == 0; } -#endif // wxUSE_GUI +wxPowerType wxGetPowerType() +{ + // TODO + return wxPOWER_UNKNOWN; +} + +wxBatteryState wxGetBatteryState() +{ + // TODO + return wxBATTERY_UNKNOWN_STATE; +} // ---------------------------------------------------------------------------- // wxStream classes to support IO redirection in wxExecute @@ -320,204 +407,52 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data) #if wxUSE_STREAMS -class wxProcessFileInputStream : public wxInputStream -{ -public: - wxProcessFileInputStream(int fd) { m_fd = fd; } - ~wxProcessFileInputStream() { close(m_fd); } - - virtual bool Eof() const; - -protected: - size_t OnSysRead(void *buffer, size_t bufsize); - -protected: - int m_fd; -}; - -class wxProcessFileOutputStream : public wxOutputStream -{ -public: - wxProcessFileOutputStream(int fd) { m_fd = fd; } - ~wxProcessFileOutputStream() { close(m_fd); } - -protected: - size_t OnSysWrite(const void *buffer, size_t bufsize); - -protected: - int m_fd; -}; - -bool wxProcessFileInputStream::Eof() const +bool wxPipeInputStream::CanRead() const { if ( m_lasterror == wxSTREAM_EOF ) - return TRUE; + return false; // check if there is any input available struct timeval tv; tv.tv_sec = 0; tv.tv_usec = 0; + const int fd = m_file->fd(); + fd_set readfds; FD_ZERO(&readfds); - FD_SET(m_fd, &readfds); - switch ( select(m_fd + 1, &readfds, NULL, NULL, &tv) ) + FD_SET(fd, &readfds); + switch ( select(fd + 1, &readfds, NULL, NULL, &tv) ) { case -1: wxLogSysError(_("Impossible to get child process input")); // fall through case 0: - return TRUE; + return false; default: wxFAIL_MSG(_T("unexpected select() return value")); // still fall through case 1: - // input available: check if there is any - return wxInputStream::Eof(); + // input available -- or maybe not, as select() returns 1 when a + // read() will complete without delay, but it could still not read + // anything + return !Eof(); } } -size_t wxProcessFileInputStream::OnSysRead(void *buffer, size_t bufsize) -{ - int ret = read(m_fd, buffer, bufsize); - if ( ret == 0 ) - { - m_lasterror = wxSTREAM_EOF; - } - else if ( ret == -1 ) - { - m_lasterror = wxSTREAM_READ_ERROR; - ret = 0; - } - else - { - m_lasterror = wxSTREAM_NOERROR; - } - - return ret; -} - -size_t wxProcessFileOutputStream::OnSysWrite(const void *buffer, size_t bufsize) -{ - int ret = write(m_fd, buffer, bufsize); - if ( ret == -1 ) - { - m_lasterror = wxSTREAM_WRITE_ERROR; - ret = 0; - } - else - { - m_lasterror = wxSTREAM_NOERROR; - } - - return ret; -} +#endif // wxUSE_STREAMS // ---------------------------------------------------------------------------- -// wxStreamTempBuffer +// wxExecute: the real worker function // ---------------------------------------------------------------------------- -/* - Extract of a mail to wx-users to give the context of the problem we are - trying to solve here: - - MC> If I run the command: - MC> find . -name "*.h" -exec grep linux {} \; - MC> in the exec sample synchronously from the 'Capture command output' - MC> menu, wxExecute never returns. I have to xkill it. Has anyone - MC> else encountered this? - - Yes, I can reproduce it too. - - I even think I understand why it happens: before launching the external - command we set up a pipe with a valid file descriptor on the reading side - when the output is redirected. So the subprocess happily writes to it ... - until the pipe buffer (which is usually quite big on Unix, I think the - default is 4Mb) is full. Then the writing process stops and waits until we - read some data from the pipe to be able to continue writing to it but we - never do it because we wait until it terminates to start reading and so we - have a classical deadlock. - - Here is the fix: we now read the output as soon as it appears into a temp - buffer (wxStreamTempBuffer object) and later just stuff it back into the - stream when the process terminates. See supporting code in wxExecute() - itself as well. -*/ - -class wxStreamTempBuffer -{ -public: - wxStreamTempBuffer(); - - // call to associate a stream with this buffer, otherwise nothing happens - // at all - void Init(wxInputStream *stream); - - // check for input on our stream and cache it in our buffer if any - void Update(); - - ~wxStreamTempBuffer(); - -private: - // the stream we're buffering, if NULL we don't do anything at all - wxInputStream *m_stream; - - // the buffer of size m_size (NULL if m_size == 0) - void *m_buffer; - - // the size of the buffer - size_t m_size; -}; - -wxStreamTempBuffer::wxStreamTempBuffer() -{ - m_stream = NULL; - m_buffer = NULL; - m_size = 0; -} - -void wxStreamTempBuffer::Init(wxInputStream *stream) -{ - m_stream = stream; -} - -void wxStreamTempBuffer::Update() -{ - if ( m_stream && !m_stream->Eof() ) - { - // realloc in blocks of 1Kb - surely not the best strategy but which - // one is? - static const size_t incSize = 1024; - - void *buf = realloc(m_buffer, m_size + incSize); - if ( !buf ) - { - // don't read any more, we don't have enough memory to do it - m_stream = NULL; - } - else // got memory for the buffer - { - m_buffer = buf; - m_stream->Read((char *)m_buffer + m_size, incSize); - m_size += incSize; - } - } -} - -wxStreamTempBuffer::~wxStreamTempBuffer() -{ - if ( m_buffer ) - { - m_stream->Ungetch(m_buffer, m_size); - free(m_buffer); - } -} - -#endif // wxUSE_STREAMS - +#ifdef __VMS + #pragma message disable codeunreachable +#endif + long wxExecute(wxChar **argv, int flags, wxProcess *process) @@ -554,40 +489,38 @@ long wxExecute(wxChar **argv, wxChar **mb_argv = argv; #endif // Unicode/ANSI -#if wxUSE_GUI + // we want this function to work even if there is no wxApp so ensure that + // we have a valid traits pointer + wxConsoleAppTraits traitsConsole; + wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL; + if ( !traits ) + traits = &traitsConsole; + + // this struct contains all information which we pass to and from + // wxAppTraits methods + wxExecuteData execData; + execData.flags = flags; + execData.process = process; + // create pipes - int end_proc_detect[2]; - if ( pipe(end_proc_detect) == -1 ) + if ( !traits->CreateEndProcessPipe(execData) ) { - wxLogSysError( _("Pipe creation failed") ); wxLogError( _("Failed to execute '%s'\n"), *argv ); ARGS_CLEANUP; return ERROR_RETURN_CODE; } -#endif // wxUSE_GUI // pipes for inter process communication - int pipeIn[2], // stdin - pipeOut[2], // stdout - pipeErr[2]; // stderr - - pipeIn[0] = pipeIn[1] = - pipeOut[0] = pipeOut[1] = - pipeErr[0] = pipeErr[1] = -1; + wxPipe pipeIn, // stdin + pipeOut, // stdout + pipeErr; // stderr if ( process && process->IsRedirected() ) { - if ( pipe(pipeIn) == -1 || pipe(pipeOut) == -1 || pipe(pipeErr) == -1 ) + if ( !pipeIn.Create() || !pipeOut.Create() || !pipeErr.Create() ) { -#if wxUSE_GUI - // free previously allocated resources - close(end_proc_detect[0]); - close(end_proc_detect[1]); -#endif // wxUSE_GUI - - wxLogSysError( _("Pipe creation failed") ); wxLogError( _("Failed to execute '%s'\n"), *argv ); ARGS_CLEANUP; @@ -597,25 +530,18 @@ long wxExecute(wxChar **argv, } // fork the process -#ifdef HAVE_VFORK - pid_t pid = vfork(); + // + // NB: do *not* use vfork() here, it completely breaks this code for some + // reason under Solaris (and maybe others, although not under Linux) + // But on OpenVMS we do not have fork so we have to use vfork and + // cross our fingers that it works. +#ifdef __VMS + pid_t pid = vfork(); #else - pid_t pid = fork(); + pid_t pid = fork(); #endif - - if ( pid == -1 ) // error? + if ( pid == -1 ) // error? { -#if wxUSE_GUI - close(end_proc_detect[0]); - close(end_proc_detect[1]); - close(pipeIn[0]); - close(pipeIn[1]); - close(pipeOut[0]); - close(pipeOut[1]); - close(pipeErr[0]); - close(pipeErr[1]); -#endif // wxUSE_GUI - wxLogSysError( _("Fork failed") ); ARGS_CLEANUP; @@ -624,57 +550,66 @@ long wxExecute(wxChar **argv, } else if ( pid == 0 ) // we're in child { -#if wxUSE_GUI - close(end_proc_detect[0]); // close reading side -#endif // wxUSE_GUI - // These lines close the open file descriptors to to avoid any // input/output which might block the process or irritate the user. If // one wants proper IO for the subprocess, the right thing to do is to // start an xterm executing it. if ( !(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[0] || fd == pipeOut[1] || fd == pipeErr[1] -#if wxUSE_GUI - || fd == end_proc_detect[1] -#endif // wxUSE_GUI - ) + if ( fd == pipeIn[wxPipe::Read] + || fd == pipeOut[wxPipe::Write] + || fd == pipeErr[wxPipe::Write] + || traits->IsWriteFDOfEndProcessPipe(execData, fd) ) { // don't close this one, we still need it continue; } - // leave stderr opened too, it won't do any hurm + // leave stderr opened too, it won't do any harm if ( fd != STDERR_FILENO ) close(fd); } + } - 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(); - } +#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); - // redirect stdio, stdout and stderr - if ( pipeIn[0] != -1 ) + // redirect stdin, stdout and stderr + if ( pipeIn.IsOk() ) { - if ( dup2(pipeIn[0], STDIN_FILENO) == -1 || - dup2(pipeOut[1], STDOUT_FILENO) == -1 || - dup2(pipeErr[1], STDERR_FILENO) == -1 ) + if ( dup2(pipeIn[wxPipe::Read], STDIN_FILENO) == -1 || + dup2(pipeOut[wxPipe::Write], STDOUT_FILENO) == -1 || + dup2(pipeErr[wxPipe::Write], STDERR_FILENO) == -1 ) { wxLogSysError(_("Failed to redirect child process input/output")); } - close(pipeIn[0]); - close(pipeOut[1]); - close(pipeErr[1]); + pipeIn.Close(); + pipeOut.Close(); + pipeErr.Close(); } execvp (*mb_argv, mb_argv); + + fprintf(stderr, "execvp("); + // CS changed ppc to ppc_ as ppc is not available under mac os CW Mach-O + for ( char **ppc_ = mb_argv; *ppc_; ppc_++ ) + fprintf(stderr, "%s%s", ppc_ == mb_argv ? "" : ", ", *ppc_); + fprintf(stderr, ") failed with error %d!\n", errno); // there is no return after successful exec() _exit(-1); @@ -682,6 +617,9 @@ long wxExecute(wxChar **argv, // 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 @@ -690,97 +628,57 @@ long wxExecute(wxChar **argv, { ARGS_CLEANUP; - // pipe initialization: construction of the wxStreams + // save it for WaitForChild() use + execData.pid = pid; + + // prepare for IO redirection + #if wxUSE_STREAMS - wxStreamTempBuffer bufIn, bufErr; + // 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 - // in/out for subprocess correspond to our out/in - wxOutputStream *outStream = new wxProcessFileOutputStream(pipeIn[1]); - wxInputStream *inStream = new wxProcessFileInputStream(pipeOut[0]); - wxInputStream *errStream = new wxProcessFileInputStream(pipeErr[0]); + wxOutputStream *inStream = + new wxFileOutputStream(pipeIn.Detach(wxPipe::Write)); - process->SetPipeStreams(inStream, outStream, errStream); + wxPipeInputStream *outStream = + new wxPipeInputStream(pipeOut.Detach(wxPipe::Read)); - bufIn.Init(inStream); - bufErr.Init(inStream); -#endif // wxUSE_STREAMS - - close(pipeIn[0]); // close reading side - close(pipeOut[1]); // close writing side - close(pipeErr[1]); // close writing side - } + wxPipeInputStream *errStream = + new wxPipeInputStream(pipeErr.Detach(wxPipe::Read)); -#if wxUSE_GUI && !defined(__WXMICROWIN__) - wxEndProcessData *data = new wxEndProcessData; + process->SetPipeStreams(outStream, inStream, errStream); - 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; + bufOut.Init(outStream); + bufErr.Init(errStream); - // sync execution: indicate it by negating the pid - data->pid = -pid; - data->tag = wxAddProcessCallback(data, end_proc_detect[0]); - - close(end_proc_detect[1]); // close writing side - - 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 - bufIn.Update(); - bufErr.Update(); + execData.bufOut = &bufOut; + execData.bufErr = &bufErr; #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; - data->tag = wxAddProcessCallback(data, end_proc_detect[0]); - close(end_proc_detect[1]); // close writing side - - return pid; - } -#else // !wxUSE_GUI - - wxASSERT_MSG( flags & wxEXEC_SYNC, - wxT("async execution not supported yet") ); - - int exitcode = 0; - if ( waitpid(pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) ) + if ( pipeIn.IsOk() ) { - wxLogSysError(_("Waiting for subprocess termination failed")); + pipeIn.Close(); + pipeOut.Close(); + pipeErr.Close(); } - return exitcode; -#endif // wxUSE_GUI + return traits->WaitForChild(execData); } + + return ERROR_RETURN_CODE; } +#ifdef __VMS + #pragma message enable codeunreachable +#endif + #undef ERROR_RETURN_CODE #undef ARGS_CLEANUP @@ -790,14 +688,14 @@ long wxExecute(wxChar **argv, const wxChar* wxGetHomeDir( wxString *home ) { - *home = wxGetUserHome( wxString() ); - wxString tmp; - if ( home->IsEmpty() ) + *home = wxGetUserHome( wxEmptyString ); + wxString tmp; + if ( home->empty() ) *home = wxT("/"); #ifdef __VMS - tmp = *home; - if ( tmp.Last() != wxT(']')) - if ( tmp.Last() != wxT('/')) *home << wxT('/'); + tmp = *home; + if ( tmp.Last() != wxT(']')) + if ( tmp.Last() != wxT('/')) *home << wxT('/'); #endif return home->c_str(); } @@ -816,7 +714,12 @@ char *wxGetUserHome( const wxString &user ) if ((ptr = wxGetenv(wxT("HOME"))) != NULL) { +#if wxUSE_UNICODE + wxWCharBuffer buffer( ptr ); + return buffer; +#else return ptr; +#endif } if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL) { @@ -846,7 +749,7 @@ char *wxGetUserHome( const wxString &user ) // 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'); @@ -864,7 +767,7 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz) #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 ) @@ -907,7 +810,7 @@ bool wxGetFullHostName(wxChar *buf, int sz) { wxLogSysError(_("Cannot get the official hostname")); - ok = FALSE; + ok = false; } else { @@ -929,10 +832,10 @@ bool wxGetUserId(wxChar *buf, int sz) if ((who = getpwuid(getuid ())) != NULL) { wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); - return TRUE; + return true; } - return FALSE; + return false; } bool wxGetUserName(wxChar *buf, int sz) @@ -951,49 +854,41 @@ bool wxGetUserName(wxChar *buf, int sz) #else // !HAVE_PW_GECOS wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); #endif // HAVE_PW_GECOS/!HAVE_PW_GECOS - return TRUE; + return true; } - return FALSE; + return false; } +// this function is in mac/utils.cpp for wxMac #ifndef __WXMAC__ -wxString wxGetOsDescription() -{ -#ifndef WXWIN_OS_DESCRIPTION - #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure -#else - return WXWIN_OS_DESCRIPTION; -#endif -} -#endif -// this function returns the GUI toolkit version in GUI programs, but OS -// version in non-GUI ones -#if !wxUSE_GUI - -int wxGetOsVersion(int *majorVsn, int *minorVsn) +wxString wxGetOsDescription() { - int major, minor; - char name[256]; - - if ( sscanf(WXWIN_OS_DESCRIPTION, "%s %d.%d", name, &major, &minor) != 3 ) + FILE *f = popen("uname -s -r -m", "r"); + if (f) { - // unreckognized uname string format - major = minor = -1; + 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 ); } + wxFAIL_MSG( _T("uname failed") ); + return _T(""); +} - if ( majorVsn ) - *majorVsn = major; - if ( minorVsn ) - *minorVsn = minor; +#endif // !__WXMAC__ - return wxUNIX; +unsigned long wxGetProcessId() +{ + return (unsigned long)getpid(); } -#endif // !wxUSE_GUI - -long wxGetFreeMemory() +wxMemorySize wxGetFreeMemory() { #if defined(__LINUX__) // get it from /proc/meminfo @@ -1011,10 +906,10 @@ long wxGetFreeMemory() fclose(fp); - return memFree; + return (wxMemorySize)memFree; } #elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES) - return sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE); + return (wxMemorySize)(sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE)); //#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably #endif @@ -1026,31 +921,36 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) { #if defined(HAVE_STATFS) || defined(HAVE_STATVFS) // the case to "char *" is needed for AIX 4.3 - struct statfs fs; - if ( statfs((char *)path.fn_str(), &fs) != 0 ) + wxStatfs_t fs; + if ( wxStatfs((char *)(const char*)path.fn_str(), &fs) != 0 ) { - wxLogSysError("Failed to get file system statistics"); + wxLogSysError( wxT("Failed to get file system statistics") ); - return FALSE; + return false; } - // under Solaris we might have to use fs.f_frsize instead as I think it - // may be a multiple of the block size in general (TODO) + // under Solaris we also have to use f_frsize field instead of f_bsize + // which is in general a multiple of f_frsize +#ifdef HAVE_STATVFS + wxLongLong blockSize = fs.f_frsize; +#else // HAVE_STATFS + wxLongLong blockSize = fs.f_bsize; +#endif // HAVE_STATVFS/HAVE_STATFS if ( pTotal ) { - *pTotal = wxLongLong(fs.f_blocks) * fs.f_bsize; + *pTotal = wxLongLong(fs.f_blocks) * blockSize; } if ( pFree ) { - *pFree = wxLongLong(fs.f_bavail) * fs.f_bsize; + *pFree = wxLongLong(fs.f_bavail) * blockSize; } - return TRUE; + return true; +#else // !HAVE_STATFS && !HAVE_STATVFS + return false; #endif // HAVE_STATFS - - return FALSE; } // ---------------------------------------------------------------------------- @@ -1062,14 +962,14 @@ bool wxGetEnv(const wxString& var, wxString *value) // wxGetenv is defined as getenv() wxChar *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) @@ -1085,7 +985,7 @@ bool wxSetEnv(const wxString& variable, const wxChar *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); @@ -1093,7 +993,7 @@ bool wxSetEnv(const wxString& variable, const wxChar *value) return putenv(buf) == 0; #else // no way to set an env var - return FALSE; + return false; #endif } @@ -1119,13 +1019,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 @@ -1147,7 +1047,7 @@ bool wxHandleFatalExceptions(bool doit) wxLogDebug(_T("Failed to install our signal handler.")); } - s_savedHandlers = TRUE; + s_savedHandlers = true; } else if ( s_savedHandlers ) { @@ -1161,7 +1061,7 @@ bool wxHandleFatalExceptions(bool doit) wxLogDebug(_T("Failed to uninstall our signal handler.")); } - s_savedHandlers = FALSE; + s_savedHandlers = false; } //else: nothing to do @@ -1204,3 +1104,166 @@ void wxFatalError( const wxString &msg, const wxString &title ) #endif // WXWIN_COMPATIBILITY_2_2 +#endif // wxUSE_BASE + +#if wxUSE_GUI + +// ---------------------------------------------------------------------------- +// wxExecute support +// ---------------------------------------------------------------------------- + +// Darwin doesn't use the same process end detection mechanisms so we don't +// need wxExecute-related helpers for it +#if !(defined(__DARWIN__) && defined(__WXMAC__)) + +bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& execData) +{ + return execData.pipeEndProcDetect.Create(); +} + +bool wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd) +{ + return fd == (execData.pipeEndProcDetect)[wxPipe::Write]; +} + +void wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& execData) +{ + execData.pipeEndProcDetect.Detach(wxPipe::Write); + execData.pipeEndProcDetect.Close(); +} + +#else // !Darwin + +bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& WXUNUSED(execData)) +{ + return true; +} + +bool +wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(execData), + int WXUNUSED(fd)) +{ + return false; +} + +void +wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(execData)) +{ + // nothing to do here, we don't use the pipe +} + +#endif // !Darwin/Darwin + +int wxGUIAppTraits::WaitForChild(wxExecuteData& execData) +{ + wxEndProcessData *endProcData = new wxEndProcessData; + + 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 + { + // async execution, nothing special to do -- caller will be + // notified about the process termination if process != NULL, endProcData + // will be deleted in GTK_EndProcessDetector + endProcData->process = execData.process; + endProcData->pid = execData.pid; + } + + +#if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)) + endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid); +#else + endProcData->tag = wxAddProcessCallback + ( + endProcData, + execData.pipeEndProcDetect.Detach(wxPipe::Read) + ); + + execData.pipeEndProcDetect.Close(); +#endif // defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)) + + if ( flags & wxEXEC_SYNC ) + { + wxBusyCursor bc; + wxWindowDisabler *wd = flags & wxEXEC_NODISABLE ? NULL + : new wxWindowDisabler; + + // endProcData->pid will be set to 0 from GTK_EndProcessDetector when the + // process terminates + while ( endProcData->pid != 0 ) + { + bool idle = true; + +#if wxUSE_STREAMS + if ( execData.bufOut ) + { + execData.bufOut->Update(); + idle = false; + } + + if ( execData.bufErr ) + { + execData.bufErr->Update(); + idle = false; + } +#endif // wxUSE_STREAMS + + // don't consume 100% of the CPU while we're sitting in this + // loop + if ( idle ) + wxMilliSleep(1); + + // give GTK+ a chance to call GTK_EndProcessDetector here and + // also repaint the GUI + wxYield(); + } + + int exitcode = endProcData->exitcode; + + delete wd; + delete endProcData; + + return exitcode; + } + else // async execution + { + return execData.pid; + } +} + +#endif // wxUSE_GUI +#if wxUSE_BASE + +void wxHandleProcessTermination(wxEndProcessData *proc_data) +{ + // notify user about termination if required + if ( proc_data->process ) + { + proc_data->process->OnTerminate(proc_data->pid, proc_data->exitcode); + } + + // clean up + if ( proc_data->pid > 0 ) + { + delete proc_data; + } + else + { + // let wxExecute() know that the process has terminated + proc_data->pid = 0; + } +} + +#endif // wxUSE_BASE