non-PCH build fix (according to Tinderbox).

[wxWidgets.git] / src / unix / utilsunx.cpp

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index a03b0596c4d4bf613e118d047616b63a74c32254..66068411bebc02b89c219ba63dae9abd0bc8b737 100644 (file)
--- 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$
 // Purpose:     generic Unix implementation of many wx functions
 // Author:      Vadim Zeitlin
 // Id:          $Id$


@@ -15,21 +15,96 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#include "wx/defs.h"
-#include "wx/string.h"
-
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/app.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/utils.h"
 
 #include "wx/utils.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+#endif
+
+#include "wx/apptrait.h"
+

 #include "wx/process.h"
 #include "wx/thread.h"
 
 #include "wx/process.h"
 #include "wx/thread.h"
 

-#include "wx/stream.h"
+#include "wx/wfstream.h"

 
 

-#if wxUSE_GUI
-    #include "wx/unix/execute.h"
+#include "wx/unix/execute.h"
+#include "wx/unix/private.h"
+
+#include <pwd.h>
+
+#ifdef HAVE_SYS_SELECT_H
+#   include <sys/select.h>
+#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 <sys/param.h>
+        #include <sys/mount.h>
+    #else // !__BSD__
+        #include <sys/vfs.h>
+    #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 <sys/statvfs.h>
+
+    #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
 #endif
 
 // SGI signal.h defines signal handler arguments differently depending on


@@ -43,9 +118,8 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>

-#include <unistd.h>

 #include <sys/wait.h>
 #include <sys/wait.h>

-#include <pwd.h>
+#include <unistd.h>

 #include <errno.h>
 #include <netdb.h>
 #include <signal.h>
 #include <errno.h>
 #include <netdb.h>
 #include <signal.h>


@@ -58,6 +132,12 @@
     #include <sys/utsname.h> // for uname()
 #endif // HAVE_UNAME
 
     #include <sys/utsname.h> // for uname()
 #endif // HAVE_UNAME
 

+// Used by wxGetFreeMemory().
+#ifdef __SGI__
+    #include <sys/sysmp.h>
+    #include <sys/sysinfo.h>   // for SAGET and MINFO structures
+#endif
+

 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------


@@ -66,26 +146,22 @@
 // headers - please add your system here if it is the case for your OS.
 // SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this.
 #if !defined(HAVE_USLEEP) && \
 // 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(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \

-     defined(__osf__) || defined(__EMX__)
+     defined(__osf__) || defined(__EMX__))

     extern "C"
     {
     extern "C"
     {

-        #ifdef __SUN__
+        #ifdef __EMX__
+            /* I copied this from the XFree86 diffs. AV. */
+            #define INCL_DOSPROCESS
+            #include <os2.h>
+            inline void usleep(unsigned long delay)
+            {
+                DosSleep(delay ? (delay/1000l) : 1l);
+            }
+        #else // Unix

             int usleep(unsigned int usec);
             int usleep(unsigned int usec);

-        #else // !Sun
-            #ifdef __EMX__
-                /* I copied this from the XFree86 diffs. AV. */
-                #define INCL_DOSPROCESS
-                #include <os2.h>
-                inline void usleep(unsigned long delay)
-                {
-                    DosSleep(delay ? (delay/1000l) : 1l);
-                }
-            #else // !Sun && !EMX
-                void usleep(unsigned long usec);
-            #endif
-        #endif // Sun/EMX/Something else
+        #endif // __EMX__/Unix

     };
 
     #define HAVE_USLEEP 1
     };
 
     #define HAVE_USLEEP 1


@@ -104,12 +180,12 @@ void wxSleep(int nSecs)
     sleep(nSecs);
 }
 
     sleep(nSecs);
 }
 

-void wxUsleep(unsigned long milliseconds)
+void wxMicroSleep(unsigned long microseconds)

 {
 #if defined(HAVE_NANOSLEEP)
     timespec tmReq;
 {
 #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);
 
     // we're not interested in remaining time nor in return value
     (void)nanosleep(&tmReq, (timespec *)NULL);


@@ -122,41 +198,93 @@ void wxUsleep(unsigned long milliseconds)
         #error "usleep() cannot be used in MT programs under Solaris."
     #endif // Sun
 
         #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?)
 #elif defined(HAVE_SLEEP)
     // under BeOS sleep() takes seconds (what about other platforms, if any?)

-    sleep(milliseconds * 1000);
+    sleep(microseconds * 1000000);

 #else // !sleep function
 #else // !sleep function

-    #error "usleep() or nanosleep() function required for wxUsleep"
+    #error "usleep() or nanosleep() function required for wxMicroSleep"

 #endif // sleep function
 }
 
 #endif // sleep function
 }
 

+void wxMilliSleep(unsigned long milliseconds)
+{
+    wxMicroSleep(milliseconds*1000);
+}
+

 // ----------------------------------------------------------------------------
 // process management
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // process management
 // ----------------------------------------------------------------------------
 

-int wxKill(long pid, wxSignal sig)
+int wxKill(long pid, wxSignal sig, wxKillError *rc, int flags)

 {
 {

-    return kill((pid_t)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
 
 }
 
 #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") );
+    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?
 
     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
     {
 
     // split the command line in arguments
     do
     {

-        argument=wxT("");
+        argument = wxEmptyString;

         quotechar = wxT('\0');
 
         // eat leading whitespace:
         quotechar = wxT('\0');
 
         // eat leading whitespace:


@@ -170,14 +298,14 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process )
         {
             if ( *cptr == wxT('\\') && ! escaped )
             {
         {
             if ( *cptr == wxT('\\') && ! escaped )
             {

-                escaped = TRUE;
+                escaped = true;

                 cptr++;
                 continue;
             }
 
             // all other characters:
             argument += *cptr++;
                 cptr++;
                 continue;
             }
 
             // all other characters:
             argument += *cptr++;

-            escaped = FALSE;
+            escaped = false;

 
             // have we reached the end of the argument?
             if ( (*cptr == quotechar && ! escaped)
 
             // have we reached the end of the argument?
             if ( (*cptr == quotechar && ! escaped)


@@ -201,8 +329,18 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process )
     } while(*cptr);
     argv[argc] = NULL;
 
     } 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
     // do execute the command

-    long lRc = wxExecute(argv, sync, process);
+    lRc = wxExecute(argv, flags, process);

 
     // clean up
     argc = 0;
 
     // clean up
     argc = 0;


@@ -235,179 +373,98 @@ static wxString wxMakeShellCommand(const wxString& command)
 
 bool wxShell(const wxString& command)
 {
 
 bool wxShell(const wxString& command)
 {

-    return wxExecute(wxMakeShellCommand(command), TRUE /* sync */) == 0;
+    return wxExecute(wxMakeShellCommand(command), wxEXEC_SYNC) == 0;

 }
 
 bool wxShell(const wxString& command, wxArrayString& output)
 {
 }
 
 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);
 }
 
 
     return wxExecute(wxMakeShellCommand(command), output);
 }
 

-#if wxUSE_GUI
-
-void wxHandleProcessTermination(wxEndProcessData *proc_data)
+// Shutdown or reboot the PC
+bool wxShutdown(wxShutdownFlags wFlags)

 {
 {

-    int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
-
-    // 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;
-    int rc;
-
-    // wait for child termination and if waitpid() was interrupted, try again
-    do
+    wxChar level;
+    switch ( wFlags )

     {
     {

-       rc = waitpid(pid, &status, 0);
-    }
-    while ( rc == -1 && errno == EINTR );
+        case wxSHUTDOWN_POWEROFF:
+            level = _T('0');
+            break;

 
 

+        case wxSHUTDOWN_REBOOT:
+            level = _T('6');
+            break;

 
 

-    if( rc == -1 || ! (WIFEXITED(status) || WIFSIGNALED(status)) )
-    {
-       wxLogSysError(_("Waiting for subprocess termination failed"));
-       /* AFAIK, this can only happen if something went wrong within
-          wxGTK, i.e. due to a race condition or some serious bug.
-          After having fixed the order of statements in
-          GTK_EndProcessDetector(). (KB)
-       */
+        default:
+            wxFAIL_MSG( _T("unknown wxShutdown() flag") );
+            return false;

     }
     }

-    else
-    {
-        // notify user about termination if required
-        if (proc_data->process)
-        {
-            proc_data->process->OnTerminate(proc_data->pid,
-                                            WEXITSTATUS(status));
-        }
-        // clean up
-        if ( proc_data->pid > 0 )
-        {
-           delete proc_data;
-        }
-        else
-        {
-           // wxExecute() will know about it
-           proc_data->exitcode = status;

 
 

-           proc_data->pid = 0;
-        }
-    }
+    return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;

 }
 
 }
 

-#endif // wxUSE_GUI
-

 // ----------------------------------------------------------------------------
 // wxStream classes to support IO redirection in wxExecute
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxStream classes to support IO redirection in wxExecute
 // ----------------------------------------------------------------------------
 

-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;
-};
+#if HAS_PIPE_INPUT_STREAM

 
 

-bool wxProcessFileInputStream::Eof() const
+bool wxPipeInputStream::CanRead() const

 {
     if ( m_lasterror == wxSTREAM_EOF )
 {
     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;
 
 
     // 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_set readfds;

-    FD_ZERO(&readfds);
-    FD_SET(m_fd, &readfds);
-    switch ( select(m_fd + 1, &readfds, NULL, NULL, &tv) )
+
+    wxFD_ZERO(&readfds);
+    wxFD_SET(fd, &readfds);
+
+    switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )

     {
         case -1:
             wxLogSysError(_("Impossible to get child process input"));
             // fall through
 
         case 0:
     {
         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:
 
         default:
             wxFAIL_MSG(_T("unexpected select() return value"));
             // still fall through
 
         case 1:

-            // input available: check if there is any
-            return wxInputStream::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;
+            // 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();

     }
     }

-    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;
-    }
+#endif // HAS_PIPE_INPUT_STREAM

 
 

-    return ret;
-}
+// ----------------------------------------------------------------------------
+// wxExecute: the real worker function
+// ----------------------------------------------------------------------------

 
 

-long wxExecute(wxChar **argv,
-               bool sync,
-               wxProcess *process)
+long wxExecute(wxChar **argv, int flags, wxProcess *process)

 {
     // for the sync execution, we return -1 to indicate failure, but for async
 {
     // for the sync execution, we return -1 to indicate failure, but for async

-    // cse we return 0 which is never a valid PID
-    long errorRetCode = sync ? -1 : 0;
+    // 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, errorRetCode, wxT("can't exec empty command") );
+    wxCHECK_MSG( *argv, ERROR_RETURN_CODE, wxT("can't exec empty command") );

 
 #if wxUSE_UNICODE
     int mb_argc = 0;
 
 #if wxUSE_UNICODE
     int mb_argc = 0;


@@ -432,205 +489,195 @@ long wxExecute(wxChar **argv,
     wxChar **mb_argv = argv;
 #endif // Unicode/ANSI
 
     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
     // 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;
 
         wxLogError( _("Failed to execute '%s'\n"), *argv );
 
         ARGS_CLEANUP;
 

-        return errorRetCode;
+        return ERROR_RETURN_CODE;

     }
     }

-#endif // wxUSE_GUI

 
     // pipes for inter process communication
 
     // 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 ( 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;
 
             wxLogError( _("Failed to execute '%s'\n"), *argv );
 
             ARGS_CLEANUP;
 

-            return errorRetCode;
+            return ERROR_RETURN_CODE;

         }
     }
 
     // fork the process
         }
     }
 
     // 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
 #else

-    pid_t pid = fork();
+   pid_t pid = fork();

 #endif
 #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;
 
         wxLogSysError( _("Fork failed") );
 
         ARGS_CLEANUP;
 

-        return errorRetCode;
+        return ERROR_RETURN_CODE;

     }
     else if ( pid == 0 )  // we're in child
     {
     }
     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.
         // 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 )
+        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;
                 }
 
                 {
                     // 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 ( fd != STDERR_FILENO )
                     close(fd);
             }
         }
 

-        // redirect stdio, stdout and stderr
-        if ( pipeIn[0] != -1 )
+#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 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"));
             }
 
             {
                 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);
 
         }
 
         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);
         // 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 // we're in parent
     {
         ARGS_CLEANUP;
 
     }
     else // we're in parent
     {
         ARGS_CLEANUP;
 

-        // pipe initialization: construction of the wxStreams
-        if ( process && process->IsRedirected() )
-        {
-            // These two streams are relative to this process.
-            wxOutputStream *outStream = new wxProcessFileOutputStream(pipeIn[1]);
-            wxInputStream *inStream = new wxProcessFileInputStream(pipeOut[0]);
-            wxInputStream *errStream = new wxProcessFileInputStream(pipeErr[0]);
+        // save it for WaitForChild() use
+        execData.pid = pid;

 
 

-            close(pipeIn[0]); // close reading side
-            close(pipeOut[1]); // close writing side
-            close(pipeErr[1]); // close writing side
+        // prepare for IO redirection

 
 

-            process->SetPipeStreams(inStream, outStream, errStream);
-        }
-
-#if wxUSE_GUI
-        wxEndProcessData *data = new wxEndProcessData;
+#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

 
 

-        if ( sync )
+        if ( process && process->IsRedirected() )

         {
         {

-            // 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;
-            data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
-
-            close(end_proc_detect[1]); // close writing side
-
-            wxBusyCursor bc;
-            wxWindowDisabler wd;
+#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
-        {
-            // 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]);
+            bufOut.Init(outStream);
+            bufErr.Init(errStream);

 
 

-            close(end_proc_detect[1]); // close writing side
-
-            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);

     }
     }

-#ifdef __VMS
-   // VMS does not recognise exit as a return and complains about
-   // a missing return
-   // I think VMS is wrong in this
-   //     JJ
-   return 0;
+
+#if !defined(__VMS) && !defined(__INTEL_COMPILER)
+    return ERROR_RETURN_CODE;

 #endif
 }
 
 #endif
 }
 

+#undef ERROR_RETURN_CODE

 #undef ARGS_CLEANUP
 
 // ----------------------------------------------------------------------------
 #undef ARGS_CLEANUP
 
 // ----------------------------------------------------------------------------


@@ -639,14 +686,14 @@ long wxExecute(wxChar **argv,
 
 const wxChar* wxGetHomeDir( wxString *home  )
 {
 
 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
         *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();
 }
 #endif
     return home->c_str();
 }


@@ -665,7 +712,12 @@ char *wxGetUserHome( const wxString &user )
 
         if ((ptr = wxGetenv(wxT("HOME"))) != NULL)
         {
 
         if ((ptr = wxGetenv(wxT("HOME"))) != NULL)
         {

+#if wxUSE_UNICODE
+            wxWCharBuffer buffer( ptr );
+            return buffer;
+#else

             return ptr;
             return ptr;

+#endif

         }
         if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL)
         {
         }
         if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL)
         {


@@ -690,12 +742,41 @@ char *wxGetUserHome( const wxString &user )
 // network and user id routines
 // ----------------------------------------------------------------------------
 
 // 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)
 {
 // 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');
 
 
     *buf = wxT('\0');
 


@@ -713,7 +794,7 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz)
 #else // no uname, no gethostname
     wxFAIL_MSG(wxT("don't know host name for this machine"));
 
 #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 )
 #endif // uname/gethostname
 
     if ( !ok )


@@ -756,7 +837,7 @@ bool wxGetFullHostName(wxChar *buf, int sz)
             {
                 wxLogSysError(_("Cannot get the official hostname"));
 
             {
                 wxLogSysError(_("Cannot get the official hostname"));
 

-                ok = FALSE;
+                ok = false;

             }
             else
             {
             }
             else
             {


@@ -778,10 +859,10 @@ bool wxGetUserId(wxChar *buf, int sz)
     if ((who = getpwuid(getuid ())) != NULL)
     {
         wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
     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)
 }
 
 bool wxGetUserName(wxChar *buf, int sz)


@@ -800,47 +881,70 @@ 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
 #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;

 }
 
 }
 

-wxString wxGetOsDescription()
+bool wxIsPlatform64Bit()

 {
 {

-#ifndef WXWIN_OS_DESCRIPTION
-    #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
-#else
-    return WXWIN_OS_DESCRIPTION;
-#endif
+    wxString machine = wxGetCommandOutput(wxT("uname -m"));
+
+    // NOTE: these tests are not 100% reliable!
+    return machine.Contains(wxT("AMD64")) ||
+           machine.Contains(wxT("IA64")) ||
+           machine.Contains(wxT("x64")) ||
+           machine.Contains(wxT("X64")) ||
+           machine.Contains(wxT("alpha")) ||
+           machine.Contains(wxT("hppa64")) ||
+           machine.Contains(wxT("ppc64"));

 }
 
 }
 

-// this function returns the GUI toolkit version in GUI programs, but OS
-// version in non-GUI ones
-#if !wxUSE_GUI
+// these functions are in mac/utils.cpp for wxMac
+#ifndef __WXMAC__

 
 

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)

 {
 {

+    // get OS version

     int major, minor;
     int major, minor;

-    char name[256];
-
-    if ( sscanf(WXWIN_OS_DESCRIPTION, "%s %d.%d", name, &major, &minor) != 3 )
+    wxString release = wxGetCommandOutput(wxT("uname -r"));
+    if ( !release.empty() && wxSscanf(release, wxT("%d.%d"), &major, &minor) != 2 )

     {
     {

-        // unreckognized uname string format
-        major = minor = -1;
+        // unrecognized uname string format
+        major =
+        minor = -1;

     }
 
     }
 

-    if ( majorVsn )
-        *majorVsn = major;
-    if ( minorVsn )
-        *minorVsn = minor;
+    if ( verMaj )
+        *verMaj = major;
+    if ( verMin )
+        *verMin = minor;
+
+    // try to understand which OS are we running
+    wxString kernel = wxGetCommandOutput(wxT("uname -s"));
+    if ( kernel.empty() )
+        kernel = wxGetCommandOutput(wxT("uname -o"));
+
+    if ( kernel.empty() )
+        return wxOS_UNKNOWN;

 
 

-    return wxUNIX;
+    return wxPlatformInfo::GetOperatingSystemId(kernel);

 }
 
 }
 

-#endif // !wxUSE_GUI
+wxString wxGetOsDescription()
+{
+    return wxGetCommandOutput(wxT("uname -s -r -m"));
+}
+
+#endif // !__WXMAC__

 
 

-long wxGetFreeMemory()
+unsigned long wxGetProcessId()
+{
+    return (unsigned long)getpid();
+}
+
+wxMemorySize wxGetFreeMemory()

 {
 #if defined(__LINUX__)
     // get it from /proc/meminfo
 {
 #if defined(__LINUX__)
     // get it from /proc/meminfo


@@ -852,16 +956,43 @@ long wxGetFreeMemory()
         char buf[1024];
         if ( fgets(buf, WXSIZEOF(buf), fp) && fgets(buf, WXSIZEOF(buf), fp) )
         {
         char buf[1024];
         if ( fgets(buf, WXSIZEOF(buf), fp) && fgets(buf, WXSIZEOF(buf), fp) )
         {

-            long memTotal, memUsed;
-            sscanf(buf, "Mem: %ld %ld %ld", &memTotal, &memUsed, &memFree);
+            // /proc/meminfo changed its format in kernel 2.6
+            if ( wxPlatformInfo().CheckOSVersion(2, 6) )
+            {
+                unsigned long cached, buffers;
+                sscanf(buf, "MemFree: %ld", &memFree);
+
+                fgets(buf, WXSIZEOF(buf), fp);
+                sscanf(buf, "Buffers: %lu", &buffers);
+
+                fgets(buf, WXSIZEOF(buf), fp);
+                sscanf(buf, "Cached: %lu", &cached);
+
+                // add to "MemFree" also the "Buffers" and "Cached" values as
+                // free(1) does as otherwise the value never makes sense: for
+                // kernel 2.6 it's always almost 0
+                memFree += buffers + cached;
+
+                // values here are always expressed in kB and we want bytes
+                memFree *= 1024;
+            }
+            else // Linux 2.4 (or < 2.6, anyhow)
+            {
+                long memTotal, memUsed;
+                sscanf(buf, "Mem: %ld %ld %ld", &memTotal, &memUsed, &memFree);
+            }

         }
 
         fclose(fp);
 
         }
 
         fclose(fp);
 

-        return memFree;
+        return (wxMemorySize)memFree;

     }
 #elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES)
     }
 #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(__SGI__)
+    struct rminfo realmem;
+    if ( sysmp(MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0 )
+        return ((wxMemorySize)realmem.physmem * sysconf(_SC_PAGESIZE));

 //#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably
 #endif
 
 //#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably
 #endif
 


@@ -869,6 +1000,42 @@ long wxGetFreeMemory()
     return -1;
 }
 
     return -1;
 }
 

+bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)
+{
+#if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
+    // the case to "char *" is needed for AIX 4.3
+    wxStatfs_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
+}
+

 // ----------------------------------------------------------------------------
 // env vars
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // env vars
 // ----------------------------------------------------------------------------


@@ -878,28 +1045,30 @@ bool wxGetEnv(const wxString& var, wxString *value)
     // wxGetenv is defined as getenv()
     wxChar *p = wxGetenv(var);
     if ( !p )
     // wxGetenv is defined as getenv()
     wxChar *p = wxGetenv(var);
     if ( !p )

-        return FALSE;
+        return false;

 
     if ( value )
     {
         *value = p;
     }
 
 
     if ( value )
     {
         *value = p;
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxSetEnv(const wxString& variable, const wxChar *value)
 {
 #if defined(HAVE_SETENV)
 }
 
 bool wxSetEnv(const wxString& variable, const wxChar *value)
 {
 #if defined(HAVE_SETENV)

-    return setenv(variable.mb_str(), value ? wxString(value).mb_str().data()
-                                           : NULL, 1 /* overwrite */) == 0;
+    return setenv(variable.mb_str(),
+                  value ? (const char *)wxString(value).mb_str()
+                        : NULL,
+                  1 /* overwrite */) == 0;

 #elif defined(HAVE_PUTENV)
     wxString s = variable;
     if ( value )
         s << _T('=') << value;
 
     // transform to ANSI
 #elif defined(HAVE_PUTENV)
     wxString s = variable;
     if ( value )
         s << _T('=') << value;
 
     // transform to ANSI

-    const char *p = s.mb_str();
+    const wxWX2MBbuf p = s.mb_str();

 
     // the string will be free()d by libc
     char *buf = (char *)malloc(strlen(p) + 1);
 
     // the string will be free()d by libc
     char *buf = (char *)malloc(strlen(p) + 1);


@@ -907,7 +1076,7 @@ bool wxSetEnv(const wxString& variable, const wxChar *value)
 
     return putenv(buf) == 0;
 #else // no way to set an env var
 
     return putenv(buf) == 0;
 #else // no way to set an env var

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -919,7 +1088,7 @@ bool wxSetEnv(const wxString& variable, const wxChar *value)
 
 #include <signal.h>
 
 
 #include <signal.h>
 

-static void wxFatalSignalHandler(wxTYPE_SA_HANDLER)
+extern "C" void wxFatalSignalHandler(wxTYPE_SA_HANDLER)

 {
     if ( wxTheApp )
     {
 {
     if ( wxTheApp )
     {


@@ -933,13 +1102,13 @@ static void wxFatalSignalHandler(wxTYPE_SA_HANDLER)
 bool wxHandleFatalExceptions(bool doit)
 {
     // old sig handlers
 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;
 
     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
     if ( doit && !s_savedHandlers )
     {
         // install the signal handler


@@ -961,7 +1130,7 @@ bool wxHandleFatalExceptions(bool doit)
             wxLogDebug(_T("Failed to install our signal handler."));
         }
 
             wxLogDebug(_T("Failed to install our signal handler."));
         }
 

-        s_savedHandlers = TRUE;
+        s_savedHandlers = true;

     }
     else if ( s_savedHandlers )
     {
     }
     else if ( s_savedHandlers )
     {


@@ -975,7 +1144,7 @@ bool wxHandleFatalExceptions(bool doit)
             wxLogDebug(_T("Failed to uninstall our signal handler."));
         }
 
             wxLogDebug(_T("Failed to uninstall our signal handler."));
         }
 

-        s_savedHandlers = FALSE;
+        s_savedHandlers = false;

     }
     //else: nothing to do
 
     }
     //else: nothing to do
 


@@ -984,33 +1153,166 @@ bool wxHandleFatalExceptions(bool doit)
 
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
 
 #endif // wxUSE_ON_FATAL_EXCEPTION
 

+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// error and debug output routines (deprecated, use wxLog)
+// wxExecute support

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxDebugMsg( const char *format, ... )
+// 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)

 {
 {

-  va_list ap;
-  va_start( ap, format );
-  vfprintf( stderr, format, ap );
-  fflush( stderr );
-  va_end(ap);
+    execData.pipeEndProcDetect.Detach(wxPipe::Write);
+    execData.pipeEndProcDetect.Close();

 }
 
 }
 

-void wxError( const wxString &msg, const wxString &title )
+#else // !Darwin
+
+bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& WXUNUSED(execData))
+{
+    return true;
+}
+
+bool
+wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(execData),
+                                          int WXUNUSED(fd))

 {
 {

-  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") );
+    return false;

 }
 
 }
 

-void wxFatalError( const wxString &msg, const wxString &title )
+void
+wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(execData))
+{
+    // nothing to do here, we don't use the pipe
+}
+
+#endif // !Darwin/Darwin
+
+int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)

 {
 {

-  wxFprintf( stderr, _("Error ") );
-  if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) );
-  if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) );
-  wxFprintf( stderr, wxT(".\n") );
-  exit(3); // the same exit code as for abort()
+    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 HAS_PIPE_INPUT_STREAM
+            if ( execData.bufOut )
+            {
+                execData.bufOut->Update();
+                idle = false;
+            }
+
+            if ( execData.bufErr )
+            {
+                execData.bufErr->Update();
+                idle = false;
+            }
+#endif // HAS_PIPE_INPUT_STREAM
+
+            // 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