/////////////////////////////////////////////////////////////////////////////
-// Name: utilsunx.cpp
+// Name: unix/utilsunx.cpp
// Purpose: generic Unix implementation of many wx functions
// Author: Vadim Zeitlin
// Id: $Id$
// headers
// ----------------------------------------------------------------------------
+#include <pwd.h>
+
+// 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/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 <sys/param.h>
-# include <sys/mount.h>
-# else
-# include <sys/vfs.h>
-# endif
+ #ifdef __BSD__
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #else // !__BSD__
+ #include <sys/vfs.h>
+ #endif // __BSD__/!__BSD__
+
+ #define wxStatfs statfs
#endif // HAVE_STATFS
-// not only the statfs syscall is called differently depending on platform, but
-// we also can't use "struct statvfs" under Solaris because it breaks down if
-// HAVE_LARGEFILE_SUPPORT == 1 and we must use statvfs_t instead
#ifdef HAVE_STATVFS
#include <sys/statvfs.h>
- #define statfs statvfs
- #define wxStatFs statvfs_t
-#elif HAVE_STATFS
- #define wxStatFs struct statfs
-#endif // HAVE_STAT[V]FS
+ #define wxStatfs statvfs
+#endif // HAVE_STATVFS
-#if wxUSE_GUI
- #include "wx/unix/execute.h"
+#if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
+ // WX_STATFS_T is detected by configure
+ #define wxStatfs_t WX_STATFS_T
#endif
// SGI signal.h defines signal handler arguments differently depending on
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <unistd.h>
#include <sys/wait.h>
-#include <pwd.h>
+#include <unistd.h>
#include <errno.h>
#include <netdb.h>
#include <signal.h>
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);
#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
// ----------------------------------------------------------------------------
{
wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") );
+#if wxUSE_THREADS
+ // fork() doesn't mix well with POSIX threads: on many systems the program
+ // deadlocks or crashes for some reason. Probably our code is buggy and
+ // doesn't do something which must be done to allow this to work, but I
+ // don't know what yet, so for now just warn the user (this is the least we
+ // can do) about it
+ wxASSERT_MSG( wxThread::IsMain(),
+ _T("wxExecute() can be called only from the main thread") );
+#endif // wxUSE_THREADS
+
int argc = 0;
wxChar *argv[WXEXECUTE_NARGS];
wxString argument;
argv[argc] = NULL;
// do execute the command
-#if wxUSE_UNICODE
- long lRc = -1;
-#else
long lRc = wxExecute(argv, flags, process);
-#endif
// clean up
argc = 0;
}
-#if wxUSE_GUI
-
-void wxHandleProcessTermination(wxEndProcessData *proc_data)
-{
- // notify user about termination if required
- if ( proc_data->process )
- {
- proc_data->process->OnTerminate(proc_data->pid, proc_data->exitcode);
- }
-
- // clean up
- if ( proc_data->pid > 0 )
- {
- delete proc_data;
- }
- else
- {
- // let wxExecute() know that the process has terminated
- proc_data->pid = 0;
- }
-}
-
-#endif // wxUSE_GUI
-
// ----------------------------------------------------------------------------
// wxStream classes to support IO redirection in wxExecute
// ----------------------------------------------------------------------------
#if wxUSE_STREAMS
-// ----------------------------------------------------------------------------
-// wxProcessFileInputStream: stream for reading from a pipe
-// ----------------------------------------------------------------------------
-
-class wxProcessFileInputStream : public wxFileInputStream
-{
-public:
- wxProcessFileInputStream(int fd) : wxFileInputStream(fd) { }
-
- // return TRUE if we have anything to read, don't block
- bool IsAvailable() const;
-};
-
-bool wxProcessFileInputStream::IsAvailable() const
+bool wxPipeInputStream::CanRead() const
{
if ( m_lasterror == wxSTREAM_EOF )
- return TRUE;
+ return FALSE;
// check if there is any input available
struct timeval tv;
// fall through
case 0:
- return TRUE;
+ return FALSE;
default:
wxFAIL_MSG(_T("unexpected select() return value"));
// still fall through
case 1:
- // input available
- return TRUE;
- }
-}
-
-// ----------------------------------------------------------------------------
-// wxStreamTempInputBuffer
-// ----------------------------------------------------------------------------
-
-/*
- 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 4Kb) 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 (wxStreamTempInputBuffer object) and later just stuff it back into the
- stream when the process terminates. See supporting code in wxExecute()
- itself as well.
-
- Note that this is horribly inefficient for large amounts of output (count
- the number of times we copy the data around) and so a better API is badly
- needed!
-*/
-
-class wxStreamTempInputBuffer
-{
-public:
- wxStreamTempInputBuffer();
-
- // call to associate a stream with this buffer, otherwise nothing happens
- // at all
- void Init(wxProcessFileInputStream *stream);
-
- // check for input on our stream and cache it in our buffer if any
- void Update();
-
- ~wxStreamTempInputBuffer();
-
-private:
- // the stream we're buffering, if NULL we don't do anything at all
- wxProcessFileInputStream *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;
-};
-
-wxStreamTempInputBuffer::wxStreamTempInputBuffer()
-{
- m_stream = NULL;
- m_buffer = NULL;
- m_size = 0;
-}
-
-void wxStreamTempInputBuffer::Init(wxProcessFileInputStream *stream)
-{
- m_stream = stream;
-}
-
-void wxStreamTempInputBuffer::Update()
-{
- if ( m_stream && m_stream->IsAvailable() )
- {
- // realloc in blocks of 4Kb: this is the default (and minimal) buffer
- // size of the Unix pipes so it should be the optimal step
- static const size_t incSize = 4096;
-
- 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 += m_stream->LastRead();
- }
- }
-}
-
-wxStreamTempInputBuffer::~wxStreamTempInputBuffer()
-{
- if ( m_buffer )
- {
- m_stream->Ungetch(m_buffer, m_size);
- free(m_buffer);
+ // 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();
}
}
#endif // wxUSE_STREAMS
-// ----------------------------------------------------------------------------
-// wxPipe: this encapsulates pipe() system call
-// ----------------------------------------------------------------------------
-
-class wxPipe
-{
-public:
- // the symbolic names for the pipe ends
- enum Direction
- {
- Read,
- Write
- };
-
- enum
- {
- INVALID_FD = -1
- };
-
- // default ctor doesn't do anything
- wxPipe() { m_fds[Read] = m_fds[Write] = INVALID_FD; }
-
- // create the pipe, return TRUE if ok, FALSE on error
- bool Create()
- {
- if ( pipe(m_fds) == -1 )
- {
- wxLogSysError(_("Pipe creation failed"));
-
- return FALSE;
- }
-
- return TRUE;
- }
-
- // return TRUE if we were created successfully
- bool IsOk() const { return m_fds[Read] != INVALID_FD; }
-
- // return the descriptor for one of the pipe ends
- int operator[](Direction which) const
- {
- wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds),
- _T("invalid pipe index") );
-
- return m_fds[which];
- }
-
- // detach a descriptor, meaning that the pipe dtor won't close it, and
- // return it
- int Detach(Direction which)
- {
- wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds),
- _T("invalid pipe index") );
-
- int fd = m_fds[which];
- m_fds[which] = INVALID_FD;
-
- return fd;
- }
-
- // close the pipe descriptors
- void Close()
- {
- for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ )
- {
- if ( m_fds[n] != INVALID_FD )
- close(m_fds[n]);
- }
- }
-
- // dtor closes the pipe descriptors
- ~wxPipe() { Close(); }
-
-private:
- int m_fds[2];
-};
-
// ----------------------------------------------------------------------------
// wxExecute: the real worker function
// ----------------------------------------------------------------------------
+
#ifdef __VMS
-#pragma message disable codeunreachable
+ #pragma message disable codeunreachable
#endif
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
- wxPipe pipeEndProcDetect;
- if ( !pipeEndProcDetect.Create() )
+ if ( !traits->CreateEndProcessPipe(execData) )
{
wxLogError( _("Failed to execute '%s'\n"), *argv );
return ERROR_RETURN_CODE;
}
-#endif // wxUSE_GUI
// pipes for inter process communication
wxPipe pipeIn, // stdin
}
// 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?
{
wxLogSysError( _("Fork failed") );
// start an xterm executing it.
if ( !(flags & wxEXEC_SYNC) )
{
- for ( int fd = 0; fd < FD_SETSIZE; fd++ )
+ // FD_SETSIZE is unsigned under BSD, signed under other platforms
+ // so we need a cast to avoid warnings on all platforms
+ for ( int fd = 0; fd < (int)FD_SETSIZE; fd++ )
{
if ( fd == pipeIn[wxPipe::Read]
|| fd == pipeOut[wxPipe::Write]
|| fd == pipeErr[wxPipe::Write]
-#if wxUSE_GUI
- || fd == pipeEndProcDetect[wxPipe::Write]
-#endif // wxUSE_GUI
- )
+ || traits->IsWriteFDOfEndProcessPipe(execData, fd) )
{
// don't close this one, we still need it
continue;
}
}
-#ifndef __VMS
+#if !defined(__VMS) && !defined(__EMX__)
if ( flags & wxEXEC_MAKE_GROUP_LEADER )
{
// Set process group to child process' pid. Then killing -pid
}
#endif // !__VMS
-#if wxUSE_GUI
// reading side can be safely closed but we should keep the write one
// opened
- pipeEndProcDetect.Detach(wxPipe::Write);
- pipeEndProcDetect.Close();
-#endif // wxUSE_GUI
+ traits->DetachWriteFDOfEndProcessPipe(execData);
// redirect stdin, stdout and stderr
if ( pipeIn.IsOk() )
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);
{
ARGS_CLEANUP;
+ // save it for WaitForChild() use
+ execData.pid = pid;
+
// prepare for IO redirection
#if wxUSE_STREAMS
wxOutputStream *inStream =
new wxFileOutputStream(pipeIn.Detach(wxPipe::Write));
- wxProcessFileInputStream *outStream =
- new wxProcessFileInputStream(pipeOut.Detach(wxPipe::Read));
+ wxPipeInputStream *outStream =
+ new wxPipeInputStream(pipeOut.Detach(wxPipe::Read));
- wxProcessFileInputStream *errStream =
- new wxProcessFileInputStream(pipeErr.Detach(wxPipe::Read));
+ wxPipeInputStream *errStream =
+ new wxPipeInputStream(pipeErr.Detach(wxPipe::Read));
process->SetPipeStreams(outStream, inStream, errStream);
bufOut.Init(outStream);
bufErr.Init(errStream);
+
+ execData.bufOut = &bufOut;
+ execData.bufErr = &bufErr;
#endif // wxUSE_STREAMS
}
pipeErr.Close();
}
-#if wxUSE_GUI && !defined(__WXMICROWIN__)
- wxEndProcessData *data = new wxEndProcessData;
-
- data->tag = wxAddProcessCallback
- (
- data,
- pipeEndProcDetect.Detach(wxPipe::Read)
- );
-
- pipeEndProcDetect.Close();
-
- if ( flags & wxEXEC_SYNC )
- {
- // we may have process for capturing the program output, but it's
- // not used in wxEndProcessData in the case of sync execution
- data->process = NULL;
-
- // sync execution: indicate it by negating the pid
- data->pid = -pid;
-
- wxBusyCursor bc;
- wxWindowDisabler wd;
-
- // data->pid will be set to 0 from GTK_EndProcessDetector when the
- // process terminates
- while ( data->pid != 0 )
- {
-#if wxUSE_STREAMS
- bufOut.Update();
- bufErr.Update();
-#endif // wxUSE_STREAMS
-
- // give GTK+ a chance to call GTK_EndProcessDetector here and
- // also repaint the GUI
- wxYield();
- }
-
- int exitcode = data->exitcode;
-
- delete data;
-
- return exitcode;
- }
- else // async execution
- {
- // async execution, nothing special to do - caller will be
- // notified about the process termination if process != NULL, data
- // will be deleted in GTK_EndProcessDetector
- data->process = process;
- data->pid = pid;
-
- return pid;
- }
-#else // !wxUSE_GUI
-
- wxASSERT_MSG( flags & wxEXEC_SYNC,
- wxT("async execution not supported yet") );
-
- int exitcode = 0;
- if ( waitpid(pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
- {
- wxLogSysError(_("Waiting for subprocess termination failed"));
- }
-
- return exitcode;
-#endif // wxUSE_GUI
+ return traits->WaitForChild(execData);
}
return ERROR_RETURN_CODE;
}
+
#ifdef __VMS
-#pragma message enable codeunreachable
+ #pragma message enable codeunreachable
#endif
#undef ERROR_RETURN_CODE
const wxChar* wxGetHomeDir( wxString *home )
{
*home = wxGetUserHome( wxString() );
- wxString tmp;
+ wxString tmp;
if ( home->IsEmpty() )
*home = wxT("/");
#ifdef __VMS
- tmp = *home;
- if ( tmp.Last() != wxT(']'))
- if ( tmp.Last() != wxT('/')) *home << wxT('/');
+ tmp = *home;
+ if ( tmp.Last() != wxT(']'))
+ if ( tmp.Last() != wxT('/')) *home << wxT('/');
#endif
return home->c_str();
}
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)
{
return FALSE;
}
+// this function is in mac/utils.cpp for wxMac
#ifndef __WXMAC__
+
wxString wxGetOsDescription()
{
#ifndef WXWIN_OS_DESCRIPTION
#error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
#else
- return WXWIN_OS_DESCRIPTION;
+ return wxString::FromAscii( WXWIN_OS_DESCRIPTION );
#endif
}
-#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)
-{
- int major, minor;
- char name[256];
-
- if ( sscanf(WXWIN_OS_DESCRIPTION, "%s %d.%d", name, &major, &minor) != 3 )
- {
- // unreckognized uname string format
- major = minor = -1;
- }
-
- if ( majorVsn )
- *majorVsn = major;
- if ( minorVsn )
- *minorVsn = minor;
-
- return wxUNIX;
-}
-
-#endif // !wxUSE_GUI
+#endif // !__WXMAC__
unsigned long wxGetProcessId()
{
{
#if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
// the case to "char *" is needed for AIX 4.3
- wxStatFs fs;
- if ( statfs((char *)(const char*)path.fn_str(), &fs) != 0 )
+ wxStatfs_t fs;
+ if ( wxStatfs((char *)(const char*)path.fn_str(), &fs) != 0 )
{
wxLogSysError( wxT("Failed to get file system statistics") );
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);
return putenv(buf) == 0;
#else // no way to set an env var
- return FALSE;
+ return false;
#endif
}
#endif // WXWIN_COMPATIBILITY_2_2
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// wxExecute support
+// ----------------------------------------------------------------------------
+
+// Darwin doesn't use the same process end detection mechanisms so we don't
+// need wxExecute-related helpers for it
+#if !(defined(__DARWIN__) && defined(__WXMAC__))
+
+bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& execData)
+{
+ return execData.pipeEndProcDetect.Create();
+}
+
+bool wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd)
+{
+ return fd == (execData.pipeEndProcDetect)[wxPipe::Write];
+}
+
+void wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& execData)
+{
+ execData.pipeEndProcDetect.Detach(wxPipe::Write);
+ execData.pipeEndProcDetect.Close();
+}
+
+#else // !Darwin
+
+bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& WXUNUSED(execData))
+{
+ return true;
+}
+
+bool
+wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(execData),
+ int WXUNUSED(fd))
+{
+ return false;
+}
+
+void
+wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(execData))
+{
+ // nothing to do here, we don't use the pipe
+}
+
+#endif // !Darwin/Darwin
+
+int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
+{
+ wxEndProcessData *endProcData = new wxEndProcessData;
+
+ // wxAddProcessCallback is now (with DARWIN) allowed to call the
+ // callback function directly if the process terminates before
+ // the callback can be added to the run loop. Set up the endProcData.
+ if ( execData.flags & wxEXEC_SYNC )
+ {
+ // we may have process for capturing the program output, but it's
+ // not used in wxEndProcessData in the case of sync execution
+ endProcData->process = NULL;
+
+ // sync execution: indicate it by negating the pid
+ endProcData->pid = -execData.pid;
+ }
+ else
+ {
+ // async execution, nothing special to do -- caller will be
+ // notified about the process termination if process != NULL, endProcData
+ // will be deleted in GTK_EndProcessDetector
+ endProcData->process = execData.process;
+ endProcData->pid = execData.pid;
+ }
+
+
+#if defined(__DARWIN__) && (defined(__WXMAC__) || 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 ( execData.flags & wxEXEC_SYNC )
+ {
+ wxBusyCursor bc;
+ wxWindowDisabler wd;
+
+ // endProcData->pid will be set to 0 from GTK_EndProcessDetector when the
+ // process terminates
+ while ( endProcData->pid != 0 )
+ {
+ bool idle = true;
+
+#if wxUSE_STREAMS
+ if ( execData.bufOut )
+ {
+ execData.bufOut->Update();
+ idle = false;
+ }
+
+ if ( execData.bufErr )
+ {
+ execData.bufErr->Update();
+ idle = false;
+ }
+#endif // wxUSE_STREAMS
+
+ // don't consume 100% of the CPU while we're sitting 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 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
projects / wxWidgets.git / blobdiff