Fix insertion of radio menu items in wxOSX wxMenu.

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 83e04373a4b4b4c65d8318907cab548e88be6e00..1a8c0b6ad3eedca9b374536a077305e281707e42 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -1,9 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utilsunx.cpp
-// Purpose:     generic Unix implementation of many wx functions
+// Name:        src/unix/utilsunx.cpp
+// Purpose:     generic Unix implementation of many wx functions (for wxBase)

 // Author:      Vadim Zeitlin
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
 // Author:      Vadim Zeitlin
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin

+//              (c) 2013 Rob Bresalier, Vadim Zeitlin

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -15,36 +16,92 @@
 // 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"

+
+#define USE_PUTENV (!defined(HAVE_SETENV) && defined(HAVE_PUTENV))
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/wxcrtvararg.h"
+    #if USE_PUTENV
+        #include "wx/module.h"
+        #include "wx/hashmap.h"
+    #endif
+#endif
+
+#include "wx/apptrait.h"
+

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

+#include "wx/scopedptr.h"

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

-#include "wx/stream.h"
+#include "wx/cmdline.h"
+
+#include "wx/wfstream.h"
+
+#include "wx/private/selectdispatcher.h"
+#include "wx/private/fdiodispatcher.h"
+#include "wx/unix/execute.h"
+#include "wx/unix/pipe.h"
+#include "wx/unix/private.h"
+
+#include "wx/evtloop.h"
+#include "wx/mstream.h"
+#include "wx/private/fdioeventloopsourcehandler.h"
+
+#include <pwd.h>
+#include <sys/wait.h>       // waitpid()
+
+#ifdef HAVE_SYS_SELECT_H
+#   include <sys/select.h>
+#endif
+
+#define HAS_PIPE_STREAMS (wxUSE_STREAMS && wxUSE_FILE)

 
 

+#if HAS_PIPE_STREAMS
+
+#include "wx/private/pipestream.h"
+#include "wx/private/streamtempinput.h"
+#include "wx/unix/private/executeiohandler.h"
+
+#endif // HAS_PIPE_STREAMS
+
+// 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 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
+
+    #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>
 
 #endif // HAVE_STATFS
 
 #ifdef HAVE_STATVFS
     #include <sys/statvfs.h>
 

-    #define statfs statvfs
+    #define wxStatfs statvfs

 #endif // HAVE_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
 #endif
 
 // SGI signal.h defines signal handler arguments differently depending on


@@ -58,13 +115,11 @@
 #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>

-#include <fcntl.h>          // for O_WRONLY and friends

 #include <time.h>           // nanosleep() and/or usleep()
 #include <ctype.h>          // isspace()
 #include <sys/time.h>       // needed for FD_SETSIZE
 #include <time.h>           // nanosleep() and/or usleep()
 #include <ctype.h>          // isspace()
 #include <sys/time.h>       // needed for FD_SETSIZE


@@ -73,6 +128,16 @@
     #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
+
+#ifdef HAVE_SETPRIORITY
+    #include <sys/resource.h>   // for setpriority()
+#endif
+

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


@@ -81,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


@@ -119,15 +180,15 @@ 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
 
     // we're not interested in remaining time nor in return value

-    (void)nanosleep(&tmReq, (timespec *)NULL);
+    (void)nanosleep(&tmReq, NULL);

 #elif defined(HAVE_USLEEP)
     // uncomment this if you feel brave or if you are sure that your version
     // of Solaris has a safe usleep() function but please notice that usleep()
 #elif defined(HAVE_USLEEP)
     // uncomment this if you feel brave or if you are sure that your version
     // of Solaris has a safe usleep() function but please notice that usleep()


@@ -137,25 +198,30 @@ 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, 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 )
     {
     if ( rc )
     {

-        switch ( err )
+        switch ( err ? errno : 0 )

         {
             case 0:
                 *rc = wxKILL_OK;
         {
             case 0:
                 *rc = wxKILL_OK;


@@ -175,7 +241,7 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc)
 
             default:
                 // this goes against Unix98 docs so log it
 
             default:
                 // this goes against Unix98 docs so log it

-                wxLogDebug(_T("unexpected kill(2) return value %d"), err);
+                wxLogDebug(wxT("unexpected kill(2) return value %d"), err);

 
                 // something else...
                 *rc = wxKILL_ERROR;
 
                 // something else...
                 *rc = wxKILL_ERROR;


@@ -185,78 +251,119 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc)
     return err;
 }
 
     return err;
 }
 

-#define WXEXECUTE_NARGS   127
-
-long wxExecute( const wxString& command, int flags, wxProcess *process )
+// Shutdown or reboot the PC
+bool wxShutdown(int flags)

 {
 {

-    wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") );
+    flags &= ~wxSHUTDOWN_FORCE;

 
 

-    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;
-
-    // split the command line in arguments
-    do
+    wxChar level;
+    switch ( flags )

     {
     {

-        argument=wxT("");
-        quotechar = wxT('\0');
+        case wxSHUTDOWN_POWEROFF:
+            level = wxT('0');
+            break;

 
 

-        // eat leading whitespace:
-        while ( wxIsspace(*cptr) )
-            cptr++;
+        case wxSHUTDOWN_REBOOT:
+            level = wxT('6');
+            break;

 
 

-        if ( *cptr == wxT('\'') || *cptr == wxT('"') )
-            quotechar = *cptr++;
+        case wxSHUTDOWN_LOGOFF:
+            // TODO: use dcop to log off?
+            return false;

 
 

-        do
-        {
-            if ( *cptr == wxT('\\') && ! escaped )
-            {
-                escaped = TRUE;
-                cptr++;
-                continue;
-            }
+        default:
+            wxFAIL_MSG( wxT("unknown wxShutdown() flag") );
+            return false;
+    }

 
 

-            // all other characters:
-            argument += *cptr++;
-            escaped = FALSE;
+    return system(wxString::Format("init %c", level).mb_str()) == 0;
+}

 
 

-            // have we reached the end of the argument?
-            if ( (*cptr == quotechar && ! escaped)
-                 || (quotechar == wxT('\0') && wxIsspace(*cptr))
-                 || *cptr == wxT('\0') )
-            {
-                wxASSERT_MSG( argc < WXEXECUTE_NARGS,
-                              wxT("too many arguments in wxExecute") );
+// ----------------------------------------------------------------------------
+// wxStream classes to support IO redirection in wxExecute
+// ----------------------------------------------------------------------------

 
 

-                argv[argc] = new wxChar[argument.length() + 1];
-                wxStrcpy(argv[argc], argument.c_str());
-                argc++;
+#if HAS_PIPE_STREAMS

 
 

-                // if not at end of buffer, swallow last character:
-                if(*cptr)
-                    cptr++;
+bool wxPipeInputStream::CanRead() const
+{
+    if ( m_lasterror == wxSTREAM_EOF )
+        return false;

 
 

-                break; // done with this one, start over
-            }
-        } while(*cptr);
-    } while(*cptr);
-    argv[argc] = NULL;
+    // check if there is any input available
+    struct timeval tv;
+    tv.tv_sec = 0;
+    tv.tv_usec = 0;

 
 

-    // do execute the command
-    long lRc = wxExecute(argv, flags, process);
+    const int fd = m_file->fd();

 
 

-    // clean up
-    argc = 0;
-    while( argv[argc] )
-        delete [] argv[argc++];
+    fd_set readfds;
+
+    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:
+            return false;
+
+        default:
+            wxFAIL_MSG(wxT("unexpected select() return value"));
+            // still fall through
+
+        case 1:
+            // input available -- or maybe not, as select() returns 1 when a
+            // read() will complete without delay, but it could still not read
+            // anything
+            return !Eof();
+    }
+}
+
+size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+    // We need to suppress error logging here, because on writing to a pipe
+    // which is full, wxFile::Write reports a system error. However, this is
+    // not an extraordinary situation, and it should not be reported to the
+    // user (but if really needed, the program can recognize it by checking
+    // whether LastRead() == 0.) Other errors will be reported below.
+    size_t ret;
+    {
+        wxLogNull logNo;
+        ret = m_file->Write(buffer, size);
+    }
+
+    switch ( m_file->GetLastError() )
+    {
+       // pipe is full
+#ifdef EAGAIN
+       case EAGAIN:
+#endif
+#if defined(EWOULDBLOCK) && (EWOULDBLOCK != EAGAIN)
+       case EWOULDBLOCK:
+#endif
+           // do not treat it as an error
+           m_file->ClearLastError();
+           // fall through
+
+       // no error
+       case 0:
+           break;
+
+       // some real error
+       default:
+           wxLogSysError(_("Can't write to child process's stdin"));
+           m_lasterror = wxSTREAM_WRITE_ERROR;
+    }

 
 

-    return lRc;
+    return ret;

 }
 
 }
 

+#endif // HAS_PIPE_STREAMS
+

 // ----------------------------------------------------------------------------
 // wxShell
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxShell
 // ----------------------------------------------------------------------------


@@ -267,12 +374,12 @@ static wxString wxMakeShellCommand(const wxString& command)
     if ( !command )
     {
         // just an interactive shell
     if ( !command )
     {
         // just an interactive shell

-        cmd = _T("xterm");
+        cmd = wxT("xterm");

     }
     else
     {
         // execute command in a shell
     }
     else
     {
         // execute command in a shell

-        cmd << _T("/bin/sh -c '") << command << _T('\'');
+        cmd << wxT("/bin/sh -c '") << command << wxT('\'');

     }
 
     return cmd;
     }
 
     return cmd;


@@ -285,242 +392,182 @@ bool wxShell(const wxString& command)
 
 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, wxT("can't exec shell non interactively") );

 
     return wxExecute(wxMakeShellCommand(command), output);
 }
 
 
     return wxExecute(wxMakeShellCommand(command), output);
 }
 

-#if wxUSE_GUI
-
-void wxHandleProcessTermination(wxEndProcessData *proc_data)
+namespace

 {
 {

-    // 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
-
-class wxProcessFileInputStream : public wxInputStream
+// helper class for storing arguments as char** array suitable for passing to
+// execvp(), whatever form they were passed to us
+class ArgsArray

 {
 public:
 {
 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
-{
-    if ( m_lasterror == wxSTREAM_EOF )
-        return TRUE;
+    ArgsArray(const wxArrayString& args)
+    {
+        Init(args.size());

 
 

-    // check if there is any input available
-    struct timeval tv;
-    tv.tv_sec = 0;
-    tv.tv_usec = 0;
+        for ( int i = 0; i < m_argc; i++ )
+        {
+            m_argv[i] = wxStrdup(args[i]);
+        }
+    }

 
 

-    fd_set readfds;
-    FD_ZERO(&readfds);
-    FD_SET(m_fd, &readfds);
-    switch ( select(m_fd + 1, &readfds, NULL, NULL, &tv) )
+#if wxUSE_UNICODE
+    ArgsArray(wchar_t **wargv)

     {
     {

-        case -1:
-            wxLogSysError(_("Impossible to get child process input"));
-            // fall through
-
-        case 0:
-            return TRUE;
+        int argc = 0;
+        while ( wargv[argc] )
+            argc++;

 
 

-        default:
-            wxFAIL_MSG(_T("unexpected select() return value"));
-            // still fall through
+        Init(argc);

 
 

-        case 1:
-            // input available: check if there is any
-            return wxInputStream::Eof();
+        for ( int i = 0; i < m_argc; i++ )
+        {
+            m_argv[i] = wxSafeConvertWX2MB(wargv[i]).release();
+        }

     }
     }

-}
+#endif // wxUSE_UNICODE

 
 

-size_t wxProcessFileInputStream::OnSysRead(void *buffer, size_t bufsize)
-{
-    int ret = read(m_fd, buffer, bufsize);
-    if ( ret == 0 )
+    ~ArgsArray()

     {
     {

-        m_lasterror = wxSTREAM_EOF;
-    }
-    else if ( ret == -1 )
-    {
-        m_lasterror = wxSTREAM_READ_ERROR;
-        ret = 0;
-    }
-    else
-    {
-        m_lasterror = wxSTREAM_NOERROR;
+        for ( int i = 0; i < m_argc; i++ )
+        {
+            free(m_argv[i]);
+        }
+
+        delete [] m_argv;

     }
 
     }
 

-    return ret;
-}
+    operator char**() const { return m_argv; }

 
 

-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
+private:
+    void Init(int argc)

     {
     {

-        m_lasterror = wxSTREAM_NOERROR;
+        m_argc = argc;
+        m_argv = new char *[m_argc + 1];
+        m_argv[m_argc] = NULL;

     }
 
     }
 

-    return ret;
-}
+    int m_argc;
+    char **m_argv;
+
+    wxDECLARE_NO_COPY_CLASS(ArgsArray);
+};
+
+} // anonymous namespace

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

-// wxStreamTempBuffer
+// wxExecute implementations

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

-/*
-   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();
+#if defined(__DARWIN__)
+bool wxMacLaunch(char **argv);
+#endif

 
 

-    // call to associate a stream with this buffer, otherwise nothing happens
-    // at all
-    void Init(wxInputStream *stream);
+long wxExecute(const wxString& command, int flags, wxProcess *process,
+        const wxExecuteEnv *env)
+{
+    ArgsArray argv(wxCmdLineParser::ConvertStringToArgs(command,
+                                                        wxCMD_LINE_SPLIT_UNIX));

 
 

-    // check for input on our stream and cache it in our buffer if any
-    void Update();
+    return wxExecute(argv, flags, process, env);
+}

 
 

-    ~wxStreamTempBuffer();
+#if wxUSE_UNICODE

 
 

-private:
-    // the stream we're buffering, if NULL we don't do anything at all
-    wxInputStream *m_stream;
+long wxExecute(wchar_t **wargv, int flags, wxProcess *process,
+        const wxExecuteEnv *env)
+{
+    ArgsArray argv(wargv);

 
 

-    // the buffer of size m_size (NULL if m_size == 0)
-    void *m_buffer;
+    return wxExecute(argv, flags, process, env);
+}

 
 

-    // the size of the buffer
-    size_t m_size;
-};
+#endif // wxUSE_UNICODE

 
 

-wxStreamTempBuffer::wxStreamTempBuffer()
+namespace

 {
 {

-    m_stream = NULL; 
-    m_buffer = NULL;
-    m_size = 0;
-}

 
 

-void wxStreamTempBuffer::Init(wxInputStream *stream)
+// Helper function of wxExecute(): wait for the process termination without
+// dispatching any events.
+//
+// This is used in wxEXEC_NOEVENTS case.
+int BlockUntilChildExit(wxExecuteData& execData)

 {
 {

-    m_stream = stream;
-}
+    wxCHECK_MSG( wxTheApp, -1,
+                    wxS("Can't block until child exit without wxTheApp") );

 
 

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

 
 

-        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;
-        }
+    // Even if we don't want to dispatch events, we still need to handle
+    // child IO notifications and process termination concurrently, i.e.
+    // we can't simply block waiting for the child to terminate as we would
+    // dead lock if it writes more than the pipe buffer size (typically
+    // 4KB) bytes of output -- it would then block waiting for us to read
+    // the data while we'd block waiting for it to terminate.
+    //
+    // So while we don't use the full blown event loop, we still do use a
+    // dispatcher with which we register just the 3 FDs we're interested
+    // in: the child stdout and stderr and the pipe written to by the
+    // signal handler so that we could react to the child process
+    // termination too.
+
+    // Notice that we must create a new dispatcher object here instead of
+    // reusing the global wxFDIODispatcher::Get() because we want to
+    // monitor only the events on the FDs explicitly registered with this
+    // one and not all the other ones that could be registered with the
+    // global dispatcher (think about the case of nested wxExecute() calls).
+    wxSelectDispatcher dispatcher;
+
+    // Do register all the FDs we want to monitor here: first, the one used to
+    // handle the signals asynchronously.
+    wxScopedPtr<wxFDIOHandler>
+        signalHandler(wxTheApp->RegisterSignalWakeUpPipe(dispatcher));
+
+#if wxUSE_STREAMS
+    // And then the two for the child output and error streams if necessary.
+    wxScopedPtr<wxFDIOHandler>
+        stdoutHandler,
+        stderrHandler;
+    if ( execData.IsRedirected() )
+    {
+        stdoutHandler.reset(new wxExecuteFDIOHandler
+                                (
+                                    dispatcher,
+                                    execData.fdOut,
+                                    execData.bufOut
+                                ));
+        stderrHandler.reset(new wxExecuteFDIOHandler
+                                (
+                                    dispatcher,
+                                    execData.fdErr,
+                                    execData.bufErr
+                                ));

     }
     }

-}
+#endif // wxUSE_STREAMS

 
 

-wxStreamTempBuffer::~wxStreamTempBuffer()
-{
-    if ( m_buffer )
+    // And dispatch until the PID is reset from wxExecuteData::OnExit().
+    while ( execData.pid )

     {
     {

-        m_stream->Ungetch(m_buffer, m_size);
-        free(m_buffer);
+        dispatcher.Dispatch();

     }
     }

+
+    return execData.exitcode;
+#else // !wxUSE_SELECT_DISPATCHER
+    wxFAIL_MSG( wxS("Can't block until child exit without wxSelectDispatcher") );
+
+    return -1;
+#endif // wxUSE_SELECT_DISPATCHER/!wxUSE_SELECT_DISPATCHER

 }
 
 }
 

-#endif // wxUSE_STREAMS
+} // anonymous namespace

 
 

-long wxExecute(wxChar **argv,
-               int flags,
-               wxProcess *process)
+// wxExecute: the real worker function
+long wxExecute(char **argv, int flags, wxProcess *process,
+        const wxExecuteEnv *env)

 {
     // for the sync execution, we return -1 to indicate failure, but for async
     // case we return 0 which is never a valid PID
 {
     // for the sync execution, we return -1 to indicate failure, but for async
     // case we return 0 which is never a valid PID


@@ -531,143 +578,184 @@ long wxExecute(wxChar **argv,
 
     wxCHECK_MSG( *argv, ERROR_RETURN_CODE, 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;
-    char *mb_argv[WXEXECUTE_NARGS];
-
-    while (argv[mb_argc])
+#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(),
+                    wxT("wxExecute() can be called only from the main thread") );
+#endif // wxUSE_THREADS
+
+#if defined(__WXCOCOA__) || ( defined(__WXOSX_MAC__) && wxOSX_USE_COCOA_OR_CARBON )
+    // wxMacLaunch() only executes app bundles and only does it asynchronously.
+    // It returns false if the target is not an app bundle, thus falling
+    // through to the regular code for non app bundles.
+    if ( !(flags & wxEXEC_SYNC) && wxMacLaunch(argv) )

     {
     {

-        wxWX2MBbuf mb_arg = wxConvertWX2MB(argv[mb_argc]);
-        mb_argv[mb_argc] = strdup(mb_arg);
-        mb_argc++;
+        // we don't have any PID to return so just make up something non null
+        return -1;

     }
     }

-    mb_argv[mb_argc] = (char *) NULL;
-
-    // this macro will free memory we used above
-    #define ARGS_CLEANUP                                 \
-        for ( mb_argc = 0; mb_argv[mb_argc]; mb_argc++ ) \
-            free(mb_argv[mb_argc])
-#else // ANSI
-    // no need for cleanup
-    #define ARGS_CLEANUP
-
-    wxChar **mb_argv = argv;
-#endif // Unicode/ANSI
-
-#if wxUSE_GUI
-    // create pipes
-    int end_proc_detect[2];
-    if ( pipe(end_proc_detect) == -1 )
-    {
-        wxLogSysError( _("Pipe creation failed") );
-        wxLogError( _("Failed to execute '%s'\n"), *argv );
+#endif // __DARWIN__

 
 

-        ARGS_CLEANUP;
+    // this struct contains all information which we use for housekeeping
+    wxScopedPtr<wxExecuteData> execDataPtr(new wxExecuteData);
+    wxExecuteData& execData = *execDataPtr;

 
 

-        return ERROR_RETURN_CODE;
-    }
-#endif // wxUSE_GUI
-
-    // pipes for inter process communication
-    int pipeIn[2],      // stdin
-        pipeOut[2],     // stdout
-        pipeErr[2];     // stderr
+    execData.flags = flags;
+    execData.process = process;

 
 

-    pipeIn[0] = pipeIn[1] =
-    pipeOut[0] = pipeOut[1] =
-    pipeErr[0] = pipeErr[1] = -1;
+    // create pipes for inter process communication
+    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 );
 
             wxLogError( _("Failed to execute '%s'\n"), *argv );
 

-            ARGS_CLEANUP;
-

             return ERROR_RETURN_CODE;
         }
     }
 
             return ERROR_RETURN_CODE;
         }
     }
 

+    // priority: we need to map wxWidgets priority which is in the range 0..100
+    // to Unix nice value which is in the range -20..19. As there is an odd
+    // number of elements in our range and an even number in the Unix one, we
+    // have to do it in this rather ugly way to guarantee that:
+    //  1. wxPRIORITY_{MIN,DEFAULT,MAX} map to -20, 0 and 19 respectively.
+    //  2. The mapping is monotonously increasing.
+    //  3. The mapping is onto the target range.
+    int prio = process ? process->GetPriority() : 0;
+    if ( prio <= 50 )
+        prio = (2*prio)/5 - 20;
+    else if ( prio < 55 )
+        prio = 1;
+    else
+        prio = (2*prio)/5 - 21;
+

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

-        ARGS_CLEANUP;
-

         return ERROR_RETURN_CODE;
     }
     else if ( pid == 0 )  // we're in child
     {
         return ERROR_RETURN_CODE;
     }
     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) )
+        // NB: we used to close all the unused descriptors of the child here
+        //     but this broke some programs which relied on e.g. FD 1 being
+        //     always opened so don't do it any more, after all there doesn't
+        //     seem to be any real problem with keeping them opened
+
+#if !defined(__VMS) && !defined(__EMX__)
+        if ( flags & wxEXEC_MAKE_GROUP_LEADER )

         {
         {

-            for ( int fd = 0; fd < FD_SETSIZE; fd++ )
-            {
-                if ( fd == pipeIn[0] || fd == pipeOut[1] || fd == pipeErr[1]
-#if wxUSE_GUI
-                     || fd == end_proc_detect[1]
-#endif // wxUSE_GUI
-                   )
-                {
-                    // don't close this one, we still need it
-                    continue;
-                }
+            // 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

 
 

-                // leave stderr opened too, it won't do any hurm
-                if ( fd != STDERR_FILENO )
-                    close(fd);
-            }
+#if defined(HAVE_SETPRIORITY)
+        if ( prio && setpriority(PRIO_PROCESS, 0, prio) != 0 )
+        {
+            wxLogSysError(_("Failed to set process priority"));

         }
         }

+#endif // HAVE_SETPRIORITY

 
 

-        // 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"));
             }
 
             {
                 wxLogSysError(_("Failed to redirect child process input/output"));
             }
 

-            close(pipeIn[0]);
-            close(pipeOut[1]);
-            close(pipeErr[1]);
+            pipeIn.Close();
+            pipeOut.Close();
+            pipeErr.Close();
+        }
+
+        // Close all (presumably accidentally) inherited file descriptors to
+        // avoid descriptor leaks. This means that we don't allow inheriting
+        // them purposefully but this seems like a lesser evil in wx code.
+        // Ideally we'd provide some flag to indicate that none (or some?) of
+        // the descriptors do not need to be closed but for now this is better
+        // than never closing them at all as wx code never used FD_CLOEXEC.
+
+        // TODO: Iterating up to FD_SETSIZE is both inefficient (because it may
+        //       be quite big) and incorrect (because in principle we could
+        //       have more opened descriptions than this number). Unfortunately
+        //       there is no good portable solution for closing all descriptors
+        //       above a certain threshold but non-portable solutions exist for
+        //       most platforms, see [http://stackoverflow.com/questions/899038/
+        //          getting-the-highest-allocated-file-descriptor]
+        for ( int fd = 0; fd < (int)FD_SETSIZE; ++fd )
+        {
+            if ( fd != STDIN_FILENO  &&
+                 fd != STDOUT_FILENO &&
+                 fd != STDERR_FILENO )
+            {
+                close(fd);
+            }

         }
 
         }
 

-        execvp (*mb_argv, mb_argv);
+
+        // Process additional options if we have any
+        if ( env )
+        {
+            // Change working directory if it is specified
+            if ( !env->cwd.empty() )
+                wxSetWorkingDirectory(env->cwd);
+
+            // Change environment if needed.
+            //
+            // NB: We can't use execve() currently because we allow using
+            //     non full paths to wxExecute(), i.e. we want to search for
+            //     the program in PATH. However it just might be simpler/better
+            //     to do the search manually and use execve() envp parameter to
+            //     set up the environment of the child process explicitly
+            //     instead of doing what we do below.
+            if ( !env->env.empty() )
+            {
+                wxEnvVariableHashMap oldenv;
+                wxGetEnvMap(&oldenv);
+
+                // Remove unwanted variables
+                wxEnvVariableHashMap::const_iterator it;
+                for ( it = oldenv.begin(); it != oldenv.end(); ++it )
+                {
+                    if ( env->env.find(it->first) == env->env.end() )
+                        wxUnsetEnv(it->first);
+                }
+
+                // And add the new ones (possibly replacing the old values)
+                for ( it = env->env.begin(); it != env->env.end(); ++it )
+                    wxSetEnv(it->first, it->second);
+            }
+        }
+
+        execvp(*argv, argv);
+
+        fprintf(stderr, "execvp(");
+        for ( char **a = argv; *a; a++ )
+            fprintf(stderr, "%s%s", a == argv ? "" : ", ", *a);
+        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);


@@ -675,107 +763,102 @@ 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?
         // 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
     {
 #if defined(__VMS) || defined(__INTEL_COMPILER)
         return 0;
 #endif
     }
     else // we're in parent
     {

-        ARGS_CLEANUP;
+        execData.OnStart(pid);

 
 

-        // pipe initialization: construction of the wxStreams
-#if wxUSE_STREAMS
-        wxStreamTempBuffer bufIn, bufErr;
-#endif // wxUSE_STREAMS
+        // prepare for IO redirection
+
+#if HAS_PIPE_STREAMS

 
         if ( process && process->IsRedirected() )
         {
 
         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]);
-
-            process->SetPipeStreams(inStream, outStream, errStream);
-
-            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
-        }
-
-#if wxUSE_GUI && !defined(__WXMICROWIN__)
-        wxEndProcessData *data = new wxEndProcessData;
+            // Avoid deadlocks which could result from trying to write to the
+            // child input pipe end while the child itself is writing to its
+            // output end and waiting for us to read from it.
+            if ( !pipeIn.MakeNonBlocking(wxPipe::Write) )
+            {
+                // This message is not terrible useful for the user but what
+                // else can we do? Also, should we fail here or take the risk
+                // to continue and deadlock? Currently we choose the latter but
+                // it might not be the best idea.
+                wxLogSysError(_("Failed to set up non-blocking pipe, "
+                                "the program might hang."));
+#if wxUSE_LOG
+                wxLog::FlushActive();
+#endif
+            }

 
 

-        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;
+            wxOutputStream *inStream =
+                new wxPipeOutputStream(pipeIn.Detach(wxPipe::Write));

 
 

-            // sync execution: indicate it by negating the pid
-            data->pid = -pid;
-            data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
+            const int fdOut = pipeOut.Detach(wxPipe::Read);
+            wxPipeInputStream *outStream = new wxPipeInputStream(fdOut);

 
 

-            close(end_proc_detect[1]); // close writing side
+            const int fdErr = pipeErr.Detach(wxPipe::Read);
+            wxPipeInputStream *errStream = new wxPipeInputStream(fdErr);

 
 

-            wxBusyCursor bc;
-            wxWindowDisabler wd;
+            process->SetPipeStreams(outStream, inStream, errStream);

 
 

-            // data->pid will be set to 0 from GTK_EndProcessDetector when the
-            // process terminates
-            while ( data->pid != 0 )
+            if ( flags & wxEXEC_SYNC )

             {
             {

-#if wxUSE_STREAMS
-                bufIn.Update();
-                bufErr.Update();
-#endif // wxUSE_STREAMS
+                execData.bufOut.Init(outStream);
+                execData.bufErr.Init(errStream);

 
 

-                // give GTK+ a chance to call GTK_EndProcessDetector here and
-                // also repaint the GUI
-                wxYield();
+                execData.fdOut = fdOut;
+                execData.fdErr = fdErr;

             }
             }

-
-            int exitcode = data->exitcode;
-
-            delete data;
-
-            return exitcode;

         }
         }

-        else // async execution
+#endif // HAS_PIPE_STREAMS
+
+        if ( pipeIn.IsOk() )

         {
         {

-            // 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]);
+            pipeIn.Close();
+            pipeOut.Close();
+            pipeErr.Close();
+        }

 
 

-            close(end_proc_detect[1]); // close writing side
+        // For the asynchronous case we don't have to do anything else, just
+        // let the process run.
+        if ( !(flags & wxEXEC_SYNC) )
+        {
+            // Ensure that the housekeeping data is kept alive, it will be
+            // destroyed only when the child terminates.
+            execDataPtr.release();

 
 

-            return pid;
+            return execData.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 we don't need to dispatch any events, things are relatively
+        // simple and we don't need to delegate to wxAppTraits.
+        if ( flags & wxEXEC_NOEVENTS )

         {
         {

-            wxLogSysError(_("Waiting for subprocess termination failed"));
+            return BlockUntilChildExit(execData);

         }
 
         }
 

-        return exitcode;
-#endif // wxUSE_GUI
+
+        // If we do need to dispatch events, enter a local event loop waiting
+        // until the child exits. As the exact kind of event loop depends on
+        // the sort of application we're in (console or GUI), we delegate this
+        // to wxAppTraits which virtualizes all the differences between the
+        // console and the GUI programs.
+        return wxApp::GetValidTraits().WaitForChild(execData);

     }
     }

+
+#if !defined(__VMS) && !defined(__INTEL_COMPILER)
+    return ERROR_RETURN_CODE;
+#endif

 }
 
 #undef ERROR_RETURN_CODE
 }
 
 #undef ERROR_RETURN_CODE

-#undef ARGS_CLEANUP

 
 // ----------------------------------------------------------------------------
 // file and directory functions
 
 // ----------------------------------------------------------------------------
 // file and directory functions


@@ -783,23 +866,19 @@ long wxExecute(wxChar **argv,
 
 const wxChar* wxGetHomeDir( wxString *home  )
 {
 
 const wxChar* wxGetHomeDir( wxString *home  )
 {

-    *home = wxGetUserHome( wxString() );
-   wxString tmp;
-    if ( home->IsEmpty() )
+    *home = wxGetUserHome();
+    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();
 }
 

-#if wxUSE_UNICODE
-const wxMB2WXbuf wxGetUserHome( const wxString &user )
-#else // just for binary compatibility -- there is no 'const' here
-char *wxGetUserHome( const wxString &user )
-#endif
+wxString wxGetUserHome( const wxString &user )

 {
     struct passwd *who = (struct passwd *) NULL;
 
 {
     struct passwd *who = (struct passwd *) NULL;
 


@@ -811,13 +890,15 @@ char *wxGetUserHome( const wxString &user )
         {
             return ptr;
         }
         {
             return ptr;
         }

-        if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL)
+
+        if ((ptr = wxGetenv(wxT("USER"))) != NULL ||
+             (ptr = wxGetenv(wxT("LOGNAME"))) != NULL)

         {
         {

-            who = getpwnam(wxConvertWX2MB(ptr));
+            who = getpwnam(wxSafeConvertWX2MB(ptr));

         }
 
         }
 

-        // We now make sure the the user exists!
-        if (who == NULL)
+        // make sure the user exists!
+        if ( !who )

         {
             who = getpwuid(getuid());
         }
         {
             who = getpwuid(getuid());
         }


@@ -827,19 +908,53 @@ char *wxGetUserHome( const wxString &user )
       who = getpwnam (user.mb_str());
     }
 
       who = getpwnam (user.mb_str());
     }
 

-    return wxConvertMB2WX(who ? who->pw_dir : 0);
+    return wxSafeConvertMB2WX(who ? who->pw_dir : 0);

 }
 
 // ----------------------------------------------------------------------------
 // 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)
+{
+    // Suppress stderr from the shell to avoid outputting errors if the command
+    // doesn't exist.
+    FILE *f = popen((cmd + " 2>/dev/null").ToAscii(), "r");
+    if ( !f )
+    {
+        // Notice that this doesn't happen simply if the command doesn't exist,
+        // but only in case of some really catastrophic failure inside popen()
+        // so we should really notify the user about this as this is not normal.
+        wxLogSysError(wxT("Executing \"%s\" failed"), cmd);
+        return wxString();
+    }
+
+    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() == wxT('\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');
 


@@ -849,15 +964,19 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz)
     bool ok = uname(&uts) != -1;
     if ( ok )
     {
     bool ok = uname(&uts) != -1;
     if ( ok )
     {

-        wxStrncpy(buf, wxConvertMB2WX(uts.nodename), sz - 1);
-        buf[sz] = wxT('\0');
+        wxStrlcpy(buf, wxSafeConvertMB2WX(uts.nodename), sz);

     }
 #elif defined(HAVE_GETHOSTNAME)
     }
 #elif defined(HAVE_GETHOSTNAME)

-    bool ok = gethostname(buf, sz) != -1;
+    char cbuf[sz];
+    bool ok = gethostname(cbuf, sz) != -1;
+    if ( ok )
+    {
+        wxStrlcpy(buf, wxSafeConvertMB2WX(cbuf), 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 )


@@ -895,17 +1014,17 @@ bool wxGetFullHostName(wxChar *buf, int sz)
     {
         if ( !wxStrchr(buf, wxT('.')) )
         {
     {
         if ( !wxStrchr(buf, wxT('.')) )
         {

-            struct hostent *host = gethostbyname(wxConvertWX2MB(buf));
+            struct hostent *host = gethostbyname(wxSafeConvertWX2MB(buf));

             if ( !host )
             {
                 wxLogSysError(_("Cannot get the official hostname"));
 
             if ( !host )
             {
                 wxLogSysError(_("Cannot get the official hostname"));
 

-                ok = FALSE;
+                ok = false;

             }
             else
             {
                 // the canonical name
             }
             else
             {
                 // the canonical name

-                wxStrncpy(buf, wxConvertMB2WX(host->h_name), sz);
+                wxStrlcpy(buf, wxSafeConvertMB2WX(host->h_name), sz);

             }
         }
         //else: it's already a FQDN (BSD behaves this way)
             }
         }
         //else: it's already a FQDN (BSD behaves this way)


@@ -921,72 +1040,108 @@ bool wxGetUserId(wxChar *buf, int sz)
     *buf = wxT('\0');
     if ((who = getpwuid(getuid ())) != NULL)
     {
     *buf = wxT('\0');
     if ((who = getpwuid(getuid ())) != NULL)
     {

-        wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
-        return TRUE;
+        wxStrlcpy (buf, wxSafeConvertMB2WX(who->pw_name), sz);
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxGetUserName(wxChar *buf, int sz)
 {
 }
 
 bool wxGetUserName(wxChar *buf, int sz)
 {

+#ifdef HAVE_PW_GECOS

     struct passwd *who;
 
     *buf = wxT('\0');
     if ((who = getpwuid (getuid ())) != NULL)
     {
     struct passwd *who;
 
     *buf = wxT('\0');
     if ((who = getpwuid (getuid ())) != NULL)
     {

-        // pw_gecos field in struct passwd is not standard
-#ifdef HAVE_PW_GECOS

        char *comma = strchr(who->pw_gecos, ',');
        if (comma)
            *comma = '\0'; // cut off non-name comment fields
        char *comma = strchr(who->pw_gecos, ',');
        if (comma)
            *comma = '\0'; // cut off non-name comment fields

-       wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1);
+       wxStrlcpy(buf, wxSafeConvertMB2WX(who->pw_gecos), sz);
+       return true;
+    }
+
+    return false;

 #else // !HAVE_PW_GECOS
 #else // !HAVE_PW_GECOS

-       wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
+    return wxGetUserId(buf, sz);

 #endif // HAVE_PW_GECOS/!HAVE_PW_GECOS
 #endif // HAVE_PW_GECOS/!HAVE_PW_GECOS

-       return TRUE;
-    }
+}
+
+bool wxIsPlatform64Bit()
+{
+    const wxString machine = wxGetCommandOutput(wxT("uname -m"));

 
 

-    return FALSE;
+    // the test for "64" is obviously not 100% reliable but seems to work fine
+    // in practice
+    return machine.Contains(wxT("64")) ||
+                machine.Contains(wxT("alpha"));

 }
 
 }
 

-#ifndef __WXMAC__
-wxString wxGetOsDescription()
+#ifdef __LINUX__
+wxLinuxDistributionInfo wxGetLinuxDistributionInfo()

 {
 {

-#ifndef WXWIN_OS_DESCRIPTION
-    #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
-#else
-    return WXWIN_OS_DESCRIPTION;
-#endif
+    const wxString id = wxGetCommandOutput(wxT("lsb_release --id"));
+    const wxString desc = wxGetCommandOutput(wxT("lsb_release --description"));
+    const wxString rel = wxGetCommandOutput(wxT("lsb_release --release"));
+    const wxString codename = wxGetCommandOutput(wxT("lsb_release --codename"));
+
+    wxLinuxDistributionInfo ret;
+
+    id.StartsWith("Distributor ID:\t", &ret.Id);
+    desc.StartsWith("Description:\t", &ret.Description);
+    rel.StartsWith("Release:\t", &ret.Release);
+    codename.StartsWith("Codename:\t", &ret.CodeName);
+
+    return ret;

 }
 #endif
 
 }
 #endif
 

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

 
 

-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.c_str(), wxT("%d.%d"), &major, &minor) != 2 )

     {
     {

-        // unreckognized uname string format
-        major = minor = -1;
+        // failed to get version string or unrecognized 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 wxPlatformInfo::GetOperatingSystemId(kernel);
+}

 
 

-    return wxUNIX;
+wxString wxGetOsDescription()
+{
+    return wxGetCommandOutput(wxT("uname -s -r -m"));

 }
 
 }
 

-#endif // !wxUSE_GUI
+#endif // !__DARWIN__
+
+unsigned long wxGetProcessId()
+{
+    return (unsigned long)getpid();
+}

 
 

-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()

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


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

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


@@ -1015,81 +1197,145 @@ long wxGetFreeMemory()
     return -1;
 }
 
     return -1;
 }
 

-bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)

 {
 #if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
     // the case to "char *" is needed for AIX 4.3
 {
 #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
+    wxDiskspaceSize_t blockSize = fs.f_frsize;
+#else // HAVE_STATFS
+    wxDiskspaceSize_t blockSize = fs.f_bsize;
+#endif // HAVE_STATVFS/HAVE_STATFS

 
     if ( pTotal )
     {
 
     if ( pTotal )
     {

-        *pTotal = wxLongLong(fs.f_blocks) * fs.f_bsize;
+        *pTotal = wxDiskspaceSize_t(fs.f_blocks) * blockSize;

     }
 
     if ( pFree )
     {
     }
 
     if ( pFree )
     {

-        *pFree = wxLongLong(fs.f_bavail) * fs.f_bsize;
+        *pFree = wxDiskspaceSize_t(fs.f_bavail) * blockSize;

     }
 
     }
 

-    return TRUE;
+    return true;
+#else // !HAVE_STATFS && !HAVE_STATVFS
+    return false;

 #endif // HAVE_STATFS
 #endif // HAVE_STATFS

-
-    return FALSE;

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

+#if USE_PUTENV
+
+WX_DECLARE_STRING_HASH_MAP(char *, wxEnvVars);
+
+static wxEnvVars gs_envVars;
+
+class wxSetEnvModule : public wxModule
+{
+public:
+    virtual bool OnInit() { return true; }
+    virtual void OnExit()
+    {
+        for ( wxEnvVars::const_iterator i = gs_envVars.begin();
+              i != gs_envVars.end();
+              ++i )
+        {
+            free(i->second);
+        }
+
+        gs_envVars.clear();
+    }
+
+    DECLARE_DYNAMIC_CLASS(wxSetEnvModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxSetEnvModule, wxModule)
+
+#endif // USE_PUTENV
+

 bool wxGetEnv(const wxString& var, wxString *value)
 {
     // wxGetenv is defined as getenv()
 bool wxGetEnv(const wxString& var, wxString *value)
 {
     // wxGetenv is defined as getenv()

-    wxChar *p = wxGetenv(var);
+    char *p = wxGetenv(var);

     if ( !p )
     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)
+static bool wxDoSetEnv(const wxString& variable, const char *value)

 {
 #if defined(HAVE_SETENV)
 {
 #if defined(HAVE_SETENV)

-    return setenv(variable.mb_str(),
-                  value ? (const char *)wxString(value).mb_str()
-                        : NULL,
-                  1 /* overwrite */) == 0;
+    if ( !value )
+    {
+#ifdef HAVE_UNSETENV
+        // don't test unsetenv() return value: it's void on some systems (at
+        // least Darwin)
+        unsetenv(variable.mb_str());
+        return true;
+#else
+        value = ""; // we can't pass NULL to setenv()
+#endif
+    }
+
+    return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0;

 #elif defined(HAVE_PUTENV)
     wxString s = variable;
     if ( value )
 #elif defined(HAVE_PUTENV)
     wxString s = variable;
     if ( value )

-        s << _T('=') << value;
+        s << wxT('=') << value;

 
     // transform to ANSI
 
     // 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);
     strcpy(buf, p);
 
     char *buf = (char *)malloc(strlen(p) + 1);
     strcpy(buf, p);
 

+    // store the string to free() it later
+    wxEnvVars::iterator i = gs_envVars.find(variable);
+    if ( i != gs_envVars.end() )
+    {
+        free(i->second);
+        i->second = buf;
+    }
+    else // this variable hadn't been set before
+    {
+        gs_envVars[variable] = buf;
+    }
+

     return putenv(buf) == 0;
 #else // no way to set an env var
     return putenv(buf) == 0;
 #else // no way to set an env var

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 

+bool wxSetEnv(const wxString& variable, const wxString& value)
+{
+    return wxDoSetEnv(variable, value.mb_str());
+}
+
+bool wxUnsetEnv(const wxString& variable)
+{
+    return wxDoSetEnv(variable, NULL);
+}
+

 // ----------------------------------------------------------------------------
 // signal handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // signal handling
 // ----------------------------------------------------------------------------


@@ -1112,13 +1358,13 @@ extern "C" 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


@@ -1137,10 +1383,10 @@ bool wxHandleFatalExceptions(bool doit)
         ok &= sigaction(SIGSEGV, &act, &s_handlerSEGV) == 0;
         if ( !ok )
         {
         ok &= sigaction(SIGSEGV, &act, &s_handlerSEGV) == 0;
         if ( !ok )
         {

-            wxLogDebug(_T("Failed to install our signal handler."));
+            wxLogDebug(wxT("Failed to install our signal handler."));

         }
 
         }
 

-        s_savedHandlers = TRUE;
+        s_savedHandlers = true;

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


@@ -1151,10 +1397,10 @@ bool wxHandleFatalExceptions(bool doit)
         ok &= sigaction(SIGSEGV, &s_handlerSEGV, NULL) == 0;
         if ( !ok )
         {
         ok &= sigaction(SIGSEGV, &s_handlerSEGV, NULL) == 0;
         if ( !ok )
         {

-            wxLogDebug(_T("Failed to uninstall our signal handler."));
+            wxLogDebug(wxT("Failed to uninstall our signal handler."));

         }
 
         }
 

-        s_savedHandlers = FALSE;
+        s_savedHandlers = false;

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


@@ -1164,36 +1410,228 @@ bool wxHandleFatalExceptions(bool doit)
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
 // ----------------------------------------------------------------------------

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

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

-#if WXWIN_COMPATIBILITY_2_2
+int wxAppTraits::WaitForChild(wxExecuteData& execData)
+{
+#if wxUSE_CONSOLE_EVENTLOOP
+    wxConsoleEventLoop loop;
+    return RunLoopUntilChildExit(execData, loop);
+#else // !wxUSE_CONSOLE_EVENTLOOP
+    wxFAIL_MSG( wxS("Can't wait for child process without wxConsoleEventLoop") );

 
 

-void wxDebugMsg( const char *format, ... )
+    return -1;
+#endif // wxUSE_CONSOLE_EVENTLOOP/!wxUSE_CONSOLE_EVENTLOOP
+}
+
+// This function is common code for both console and GUI applications and used
+// by wxExecute() to wait for the child exit while dispatching events.
+//
+// Notice that it should not be used for all the other cases, e.g. when we
+// don't need to wait for the child (wxEXEC_ASYNC) or when the events must not
+// dispatched (wxEXEC_NOEVENTS).
+int
+wxAppTraits::RunLoopUntilChildExit(wxExecuteData& execData,
+                                   wxEventLoopBase& loop)

 {
 {

-  va_list ap;
-  va_start( ap, format );
-  vfprintf( stderr, format, ap );
-  fflush( stderr );
-  va_end(ap);
+    // It is possible that wxExecuteData::OnExit() had already been called
+    // and reset the PID to 0, in which case we don't need to do anything
+    // at all.
+    if ( !execData.pid )
+        return execData.exitcode;
+
+#if wxUSE_STREAMS
+    // Monitor the child streams if necessary.
+    wxScopedPtr<wxEventLoopSourceHandler>
+        stdoutHandler,
+        stderrHandler;
+    if ( execData.IsRedirected() )
+    {
+        stdoutHandler.reset(new wxExecuteEventLoopSourceHandler
+                                (
+                                    execData.fdOut, execData.bufOut
+                                ));
+        stderrHandler.reset(new wxExecuteEventLoopSourceHandler
+                                (
+                                    execData.fdErr, execData.bufErr
+                                ));
+    }
+#endif // wxUSE_STREAMS
+
+    // Store the event loop in the data associated with the child
+    // process so that it could exit the loop when the child exits.
+    execData.syncEventLoop = &loop;
+
+    // And run it.
+    loop.Run();
+
+    // The exit code will have been set when the child termination was detected.
+    return execData.exitcode;

 }
 
 }
 

-void wxError( const wxString &msg, const wxString &title )
+// ----------------------------------------------------------------------------
+// wxExecuteData
+// ----------------------------------------------------------------------------
+
+namespace

 {
 {

-  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") );
+
+// Helper function that checks whether the child with the given PID has exited
+// and fills the provided parameter with its return code if it did.
+bool CheckForChildExit(int pid, int* exitcodeOut)
+{
+    wxASSERT_MSG( pid > 0, "invalid PID" );
+
+    int status, rc;
+
+    // loop while we're getting EINTR
+    for ( ;; )
+    {
+        rc = waitpid(pid, &status, WNOHANG);
+
+        if ( rc != -1 || errno != EINTR )
+            break;
+    }
+
+    switch ( rc )
+    {
+        case 0:
+            // No error but the child is still running.
+            return false;
+
+        case -1:
+            // Checking child status failed. Invalid PID?
+            wxLogLastError(wxString::Format("waitpid(%d)", pid));
+            return false;
+
+        default:
+            // Child did terminate.
+            wxASSERT_MSG( rc == pid, "unexpected waitpid() return value" );
+
+            // notice that the caller expects the exit code to be signed, e.g. -1
+            // instead of 255 so don't assign WEXITSTATUS() to an int
+            signed char exitcode;
+            if ( WIFEXITED(status) )
+                exitcode = WEXITSTATUS(status);
+            else if ( WIFSIGNALED(status) )
+                exitcode = -WTERMSIG(status);
+            else
+            {
+                wxLogError("Child process (PID %d) exited for unknown reason, "
+                           "status = %d", pid, status);
+                exitcode = -1;
+            }
+
+            if ( exitcodeOut )
+                *exitcodeOut = exitcode;
+
+            return true;
+    }

 }
 
 }
 

-void wxFatalError( const wxString &msg, const wxString &title )
+} // anonymous namespace
+
+wxExecuteData::ChildProcessesData wxExecuteData::ms_childProcesses;
+
+/* static */
+void wxExecuteData::OnSomeChildExited(int WXUNUSED(sig))

 {
 {

-  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()
+    // We know that some child process has terminated, but we don't know which
+    // one, so check all of them (notice that more than one could have exited).
+    //
+    // An alternative approach would be to call waitpid(-1, &status, WNOHANG)
+    // (in a loop to take care of the multiple children exiting case) and
+    // perhaps this would be more efficient. But for now this seems to work.
+
+
+    // Make a copy of the list before iterating over it to avoid problems due
+    // to deleting entries from it in the process.
+    const ChildProcessesData allChildProcesses = ms_childProcesses;
+    for ( ChildProcessesData::const_iterator it = allChildProcesses.begin();
+          it != allChildProcesses.end();
+          ++it )
+    {
+        const int pid = it->first;
+
+        // Check whether this child exited.
+        int exitcode;
+        if ( !CheckForChildExit(pid, &exitcode) )
+            continue;
+
+        // And handle its termination if it did.
+        //
+        // Notice that this will implicitly remove it from ms_childProcesses.
+        it->second->OnExit(exitcode);
+    }

 }
 
 }
 

-#endif // WXWIN_COMPATIBILITY_2_2
+void wxExecuteData::OnStart(int pid_)
+{
+    wxCHECK_RET( wxTheApp,
+                 wxS("Ensure wxTheApp is set before calling wxExecute()") );

 
 

+    // Setup the signal handler for SIGCHLD to be able to detect the child
+    // termination.
+    //
+    // Notice that SetSignalHandler() is idempotent, so it's fine to call
+    // it more than once with the same handler.
+    wxTheApp->SetSignalHandler(SIGCHLD, OnSomeChildExited);
+
+
+    // Remember the child PID to be able to wait for it later.
+    pid = pid_;
+
+    // Also save it in wxProcess where it will be accessible to the user code.
+    if ( process )
+        process->SetPid(pid);
+
+    // Finally, add this object itself to the list of child processes so that
+    // we can check for its termination the next time we get SIGCHLD.
+    ms_childProcesses[pid] = this;
+}
+
+void wxExecuteData::OnExit(int exitcode_)
+{
+    // Remove this process from the hash list of child processes that are
+    // still open as soon as possible to ensure we don't process it again even
+    // if another SIGCHLD happens.
+    if ( !ms_childProcesses.erase(pid) )
+    {
+        wxFAIL_MSG(wxString::Format(wxS("Data for PID %d not in the list?"), pid));
+    }
+
+
+    exitcode = exitcode_;
+
+#if wxUSE_STREAMS
+    if ( IsRedirected() )
+    {
+        // Read the remaining data in a blocking way: this is fine because the
+        // child has already exited and hence all the data must be already
+        // available in the streams buffers.
+        bufOut.ReadAll();
+        bufErr.ReadAll();
+    }
+#endif // wxUSE_STREAMS
+
+    // Notify user about termination if required
+    if ( !(flags & wxEXEC_SYNC) )
+    {
+        if ( process )
+            process->OnTerminate(pid, exitcode);
+
+        // in case of asynchronous execution we don't need this object any more
+        // after the child terminates
+        delete this;
+    }
+    else // sync execution
+    {
+        // let wxExecute() know that the process has terminated
+        pid = 0;
+
+        // Stop the event loop for synchronous wxExecute() if we're running one.
+        if ( syncEventLoop )
+            syncEventLoop->ScheduleExit();
+    }
+}