Corrected some wxMac images

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 784cf1031f42856bfe3c49b7e61bd7b582cb2e8c..9a1243beb74981db64b985162731528d8f357da5 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -39,11 +39,19 @@
 #include "wx/process.h"
 #include "wx/thread.h"
 
 #include "wx/process.h"
 #include "wx/thread.h"
 

+#include "wx/cmdline.h"
+

 #include "wx/wfstream.h"
 
 #include "wx/wfstream.h"
 

+#include "wx/private/selectdispatcher.h"
+#include "wx/private/fdiodispatcher.h"

 #include "wx/unix/execute.h"
 #include "wx/unix/private.h"
 
 #include "wx/unix/execute.h"
 #include "wx/unix/private.h"
 

+#ifdef wxHAS_GENERIC_PROCESS_CALLBACK
+#include "wx/private/fdiodispatcher.h"
+#endif
+

 #include <pwd.h>
 #include <sys/wait.h>       // waitpid()
 
 #include <pwd.h>
 #include <sys/wait.h>       // waitpid()
 


@@ -61,8 +69,6 @@
 
 #endif // HAS_PIPE_INPUT_STREAM
 
 
 #endif // HAS_PIPE_INPUT_STREAM
 

-#if wxUSE_BASE
-

 #if defined(__MWERKS__) && defined(__MACH__)
     #ifndef WXWIN_OS_DESCRIPTION
         #define WXWIN_OS_DESCRIPTION "MacOS X"
 #if defined(__MWERKS__) && defined(__MACH__)
     #ifndef WXWIN_OS_DESCRIPTION
         #define WXWIN_OS_DESCRIPTION "MacOS X"


@@ -259,106 +265,80 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc, int flags)
     return err;
 }
 
     return err;
 }
 

-#define WXEXECUTE_NARGS   127
-
-#if defined(__DARWIN__)
-long wxMacExecute(wxChar **argv,
-               int flags,
-               wxProcess *process);
-#endif
-
-long wxExecute( const wxString& command, int flags, wxProcess *process )
+// Shutdown or reboot the PC
+bool wxShutdown(int flags)

 {
 {

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

 
 

-    wxLogTrace(wxT("exec"), wxT("Executing \"%s\""), command.c_str());
+    wxChar level;
+    switch ( flags )
+    {
+        case wxSHUTDOWN_POWEROFF:
+            level = _T('0');
+            break;

 
 

-#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
+        case wxSHUTDOWN_REBOOT:
+            level = _T('6');
+            break;

 
 

-    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;
+        case wxSHUTDOWN_LOGOFF:
+            // TODO: use dcop to log off?
+            return false;

 
 

-    // split the command line in arguments
-    do
-    {
-        argument = wxEmptyString;
-        quotechar = wxT('\0');
+        default:
+            wxFAIL_MSG( _T("unknown wxShutdown() flag") );
+            return false;
+    }

 
 

-        // eat leading whitespace:
-        while ( wxIsspace(*cptr) )
-            cptr++;
+    return system(wxString::Format("init %c", level).mb_str()) == 0;
+}

 
 

-        if ( *cptr == wxT('\'') || *cptr == wxT('"') )
-            quotechar = *cptr++;
+// ----------------------------------------------------------------------------
+// wxStream classes to support IO redirection in wxExecute
+// ----------------------------------------------------------------------------

 
 

-        do
-        {
-            if ( *cptr == wxT('\\') && ! escaped )
-            {
-                escaped = true;
-                cptr++;
-                continue;
-            }
+#if HAS_PIPE_INPUT_STREAM

 
 

-            // all other characters:
-            argument += *cptr++;
-            escaped = false;
+bool wxPipeInputStream::CanRead() const
+{
+    if ( m_lasterror == wxSTREAM_EOF )
+        return false;

 
 

-            // 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") );
+    // check if there is any input available
+    struct timeval tv;
+    tv.tv_sec = 0;
+    tv.tv_usec = 0;

 
 

-                argv[argc] = new wxChar[argument.length() + 1];
-                wxStrcpy(argv[argc], argument.c_str());
-                argc++;
+    const int fd = m_file->fd();

 
 

-                // if not at end of buffer, swallow last character:
-                if(*cptr)
-                    cptr++;
+    fd_set readfds;

 
 

-                break; // done with this one, start over
-            }
-        } while(*cptr);
-    } while(*cptr);
-    argv[argc] = NULL;
+    wxFD_ZERO(&readfds);
+    wxFD_SET(fd, &readfds);

 
 

-    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
+    switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
+    {
+        case -1:
+            wxLogSysError(_("Impossible to get child process input"));
+            // fall through

 
 

-    // do execute the command
-    lRc = wxExecute(argv, flags, process);
+        case 0:
+            return false;

 
 

-    // clean up
-    argc = 0;
-    while( argv[argc] )
-        delete [] argv[argc++];
+        default:
+            wxFAIL_MSG(_T("unexpected select() return value"));
+            // still fall through

 
 

-    return lRc;
+        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();
+    }

 }
 
 }
 

+#endif // HAS_PIPE_INPUT_STREAM
+

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


@@ -392,79 +372,97 @@ bool wxShell(const wxString& command, wxArrayString& output)
     return wxExecute(wxMakeShellCommand(command), output);
 }
 
     return wxExecute(wxMakeShellCommand(command), output);
 }
 

-// Shutdown or reboot the PC
-bool wxShutdown(wxShutdownFlags wFlags)
+namespace

 {
 {

-    wxChar level;
-    switch ( wFlags )
+
+// helper class for storing arguments as char** array suitable for passing to
+// execvp(), whatever form they were passed to us
+class ArgsArray
+{
+public:
+    ArgsArray(const wxArrayString& args)

     {
     {

-        case wxSHUTDOWN_POWEROFF:
-            level = _T('0');
-            break;
+        Init(args.size());

 
 

-        case wxSHUTDOWN_REBOOT:
-            level = _T('6');
-            break;
+        for ( int i = 0; i < m_argc; i++ )
+        {
+            m_argv[i] = wxStrdup(args[i]);
+        }
+    }

 
 

-        default:
-            wxFAIL_MSG( _T("unknown wxShutdown() flag") );
-            return false;
+#if wxUSE_UNICODE
+    ArgsArray(wchar_t **wargv)
+    {
+        int argc = 0;
+        while ( *wargv++ )
+            argc++;
+
+        Init(argc);
+
+        for ( int i = 0; i < m_argc; i++ )
+        {
+            m_argv[i] = wxSafeConvertWX2MB(wargv[i]).release();
+        }

     }
     }

+#endif // wxUSE_UNICODE

 
 

-    return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;
-}
+    ~ArgsArray()
+    {
+        for ( int i = 0; i < m_argc; i++ )
+        {
+            free(m_argv[i]);
+        }

 
 

-// ----------------------------------------------------------------------------
-// wxStream classes to support IO redirection in wxExecute
-// ----------------------------------------------------------------------------
+        delete [] m_argv;
+    }

 
 

-#if HAS_PIPE_INPUT_STREAM
+    operator char**() const { return m_argv; }

 
 

-bool wxPipeInputStream::CanRead() const
-{
-    if ( m_lasterror == wxSTREAM_EOF )
-        return false;
+private:
+    void Init(int argc)
+    {
+        m_argc = argc;
+        m_argv = new char *[m_argc + 1];
+        m_argv[m_argc] = NULL;
+    }

 
 

-    // check if there is any input available
-    struct timeval tv;
-    tv.tv_sec = 0;
-    tv.tv_usec = 0;
+    int m_argc;
+    char **m_argv;

 
 

-    const int fd = m_file->fd();
+    DECLARE_NO_COPY_CLASS(ArgsArray)
+};

 
 

-    fd_set readfds;
+} // anonymous namespace

 
 

-    wxFD_ZERO(&readfds);
-    wxFD_SET(fd, &readfds);
+// ----------------------------------------------------------------------------
+// wxExecute implementations
+// ----------------------------------------------------------------------------

 
 

-    switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
-    {
-        case -1:
-            wxLogSysError(_("Impossible to get child process input"));
-            // fall through
+#if defined(__DARWIN__)
+bool wxMacLaunch(char **argv);
+#endif

 
 

-        case 0:
-            return false;
+long wxExecute(const wxString& command, int flags, wxProcess *process)
+{
+    ArgsArray argv(wxCmdLineParser::ConvertStringToArgs(command,
+                                                        wxCMD_LINE_SPLIT_UNIX));

 
 

-        default:
-            wxFAIL_MSG(_T("unexpected select() return value"));
-            // still fall through
+    return wxExecute(argv, flags, process);
+}

 
 

-        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();
-    }
+#if wxUSE_UNICODE
+
+long wxExecute(wchar_t **wargv, int flags, wxProcess *process)
+{
+    ArgsArray argv(wargv);
+
+    return wxExecute(argv, flags, process);

 }
 
 }
 

-#endif // HAS_PIPE_INPUT_STREAM
+#endif // wxUSE_UNICODE

 
 

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

 // wxExecute: the real worker function
 // wxExecute: the real worker function

-// ----------------------------------------------------------------------------
-
-long wxExecute(wxChar **argv, int flags, wxProcess *process)
+long wxExecute(char **argv, int flags, wxProcess *process)

 {
     // 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


@@ -475,49 +473,38 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
 
     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];
+#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

 
 

-    while (argv[mb_argc])
+#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 = wxSafeConvertWX2MB(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
-
-    // 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
+#endif // __DARWIN__
+
+
+    // this struct contains all information which we use for housekeeping

     wxExecuteData execData;
     execData.flags = flags;
     execData.process = process;
 
     // create pipes
     wxExecuteData execData;
     execData.flags = flags;
     execData.process = process;
 
     // create pipes

-    if ( !traits->CreateEndProcessPipe(execData) )
+    if ( !execData.pipeEndProcDetect.Create() )

     {
         wxLogError( _("Failed to execute '%s'\n"), *argv );
 
     {
         wxLogError( _("Failed to execute '%s'\n"), *argv );
 

-        ARGS_CLEANUP;
-

         return ERROR_RETURN_CODE;
     }
 
         return ERROR_RETURN_CODE;
     }
 


@@ -532,8 +519,6 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
         {
             wxLogError( _("Failed to execute '%s'\n"), *argv );
 
         {
             wxLogError( _("Failed to execute '%s'\n"), *argv );
 

-            ARGS_CLEANUP;
-

             return ERROR_RETURN_CODE;
         }
     }
             return ERROR_RETURN_CODE;
         }
     }


@@ -553,8 +538,6 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
     {
         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


@@ -572,7 +555,7 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
                 if ( fd == pipeIn[wxPipe::Read]
                         || fd == pipeOut[wxPipe::Write]
                         || fd == pipeErr[wxPipe::Write]
                 if ( fd == pipeIn[wxPipe::Read]
                         || fd == pipeOut[wxPipe::Write]
                         || fd == pipeErr[wxPipe::Write]

-                        || traits->IsWriteFDOfEndProcessPipe(execData, fd) )
+                        || fd == (execData.pipeEndProcDetect)[wxPipe::Write] )

                 {
                     // don't close this one, we still need it
                     continue;
                 {
                     // don't close this one, we still need it
                     continue;


@@ -594,8 +577,10 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
 #endif // !__VMS
 
         // reading side can be safely closed but we should keep the write one
 #endif // !__VMS
 
         // reading side can be safely closed but we should keep the write one

-        // opened
-        traits->DetachWriteFDOfEndProcessPipe(execData);
+        // opened, it will be only closed when the process terminates resulting
+        // in a read notification to the parent
+        execData.pipeEndProcDetect.Detach(wxPipe::Write);
+        execData.pipeEndProcDetect.Close();

 
         // redirect stdin, stdout and stderr
         if ( pipeIn.IsOk() )
 
         // redirect stdin, stdout and stderr
         if ( pipeIn.IsOk() )


@@ -612,12 +597,11 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
             pipeErr.Close();
         }
 
             pipeErr.Close();
         }
 

-        execvp (*mb_argv, mb_argv);
+        execvp(*argv, argv);

 
         fprintf(stderr, "execvp(");
 
         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_);
+        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()
         fprintf(stderr, ") failed with error %d!\n", errno);
 
         // there is no return after successful exec()


@@ -635,8 +619,6 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
     }
     else // we're in parent
     {
     }
     else // we're in parent
     {

-        ARGS_CLEANUP;
-

         // save it for WaitForChild() use
         execData.pid = pid;
 
         // save it for WaitForChild() use
         execData.pid = pid;
 


@@ -647,19 +629,17 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
         // called bufOut and not bufIn
         wxStreamTempInputBuffer bufOut,
                                 bufErr;
         // called bufOut and not bufIn
         wxStreamTempInputBuffer bufOut,
                                 bufErr;

-#endif // HAS_PIPE_INPUT_STREAM

 
         if ( process && process->IsRedirected() )
         {
 
         if ( process && process->IsRedirected() )
         {

-#if HAS_PIPE_INPUT_STREAM

             wxOutputStream *inStream =
                 new wxFileOutputStream(pipeIn.Detach(wxPipe::Write));
 
             wxOutputStream *inStream =
                 new wxFileOutputStream(pipeIn.Detach(wxPipe::Write));
 

-            wxPipeInputStream *outStream =
-                new wxPipeInputStream(pipeOut.Detach(wxPipe::Read));
+            const int fdOut = pipeOut.Detach(wxPipe::Read);
+            wxPipeInputStream *outStream = new wxPipeInputStream(fdOut);

 
 

-            wxPipeInputStream *errStream =
-                new wxPipeInputStream(pipeErr.Detach(wxPipe::Read));
+            const int fdErr = pipeErr.Detach(wxPipe::Read);
+            wxPipeInputStream *errStream = new wxPipeInputStream(fdErr);

 
             process->SetPipeStreams(outStream, inStream, errStream);
 
 
             process->SetPipeStreams(outStream, inStream, errStream);
 


@@ -668,8 +648,11 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
 
             execData.bufOut = &bufOut;
             execData.bufErr = &bufErr;
 
             execData.bufOut = &bufOut;
             execData.bufErr = &bufErr;

-#endif // HAS_PIPE_INPUT_STREAM
+
+            execData.fdOut = fdOut;
+            execData.fdErr = fdErr;

         }
         }

+#endif // HAS_PIPE_INPUT_STREAM

 
         if ( pipeIn.IsOk() )
         {
 
         if ( pipeIn.IsOk() )
         {


@@ -678,6 +661,13 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
             pipeErr.Close();
         }
 
             pipeErr.Close();
         }
 

+        // 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;
+

         return traits->WaitForChild(execData);
     }
 
         return traits->WaitForChild(execData);
     }
 


@@ -687,7 +677,6 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
 }
 
 #undef ERROR_RETURN_CODE
 }
 
 #undef ERROR_RETURN_CODE

-#undef ARGS_CLEANUP

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


@@ -695,7 +684,7 @@ long wxExecute(wxChar **argv, int flags, wxProcess *process)
 
 const wxChar* wxGetHomeDir( wxString *home  )
 {
 
 const wxChar* wxGetHomeDir( wxString *home  )
 {

-    *home = wxGetUserHome( wxEmptyString );
+    *home = wxGetUserHome();

     wxString tmp;
     if ( home->empty() )
         *home = wxT("/");
     wxString tmp;
     if ( home->empty() )
         *home = wxT("/");


@@ -707,11 +696,7 @@ const wxChar* wxGetHomeDir( wxString *home  )
     return home->c_str();
 }
 
     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;
 


@@ -721,20 +706,17 @@ 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)

         {
             who = getpwnam(wxSafeConvertWX2MB(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());
         }


@@ -1098,6 +1080,18 @@ bool wxGetEnv(const wxString& var, wxString *value)
 static bool wxDoSetEnv(const wxString& variable, const char *value)
 {
 #if defined(HAVE_SETENV)
 static bool wxDoSetEnv(const wxString& variable, const char *value)
 {
 #if defined(HAVE_SETENV)

+    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;
     return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0;
 #elif defined(HAVE_PUTENV)
     wxString s = variable;


@@ -1211,204 +1205,263 @@ bool wxHandleFatalExceptions(bool doit)
 
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
 
 #endif // wxUSE_ON_FATAL_EXCEPTION
 

-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-

 // ----------------------------------------------------------------------------
 // wxExecute support
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxExecute support
 // ----------------------------------------------------------------------------
 

-// Darwin doesn't use the same process end detection mechanisms so we don't
-// need wxExecute-related helpers for it
-#if !(defined(__DARWIN__) && defined(__WXMAC__))
-
-bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& execData)
+int wxAppTraits::AddProcessCallback(wxEndProcessData *data, int fd)

 {
 {

-    return execData.pipeEndProcDetect.Create();
-}
+    // define a custom handler processing only the closure of the descriptor
+    struct wxEndProcessFDIOHandler : public wxFDIOHandler
+    {
+        wxEndProcessFDIOHandler(wxEndProcessData *data, int fd)
+            : m_data(data), m_fd(fd)
+        {
+        }

 
 

-bool wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd)
-{
-    return fd == (execData.pipeEndProcDetect)[wxPipe::Write];
-}
+        virtual void OnReadWaiting()
+        {
+            wxFDIODispatcher::Get()->UnregisterFD(m_fd);
+            close(m_fd);

 
 

-void wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& execData)
-{
-    execData.pipeEndProcDetect.Detach(wxPipe::Write);
-    execData.pipeEndProcDetect.Close();
-}
+            wxHandleProcessTermination(m_data);

 
 

-#else // !Darwin
+            delete this;
+        }

 
 

-bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& WXUNUSED(execData))
-{
-    return true;
+        virtual void OnWriteWaiting() { wxFAIL_MSG("unreachable"); }
+        virtual void OnExceptionWaiting() { wxFAIL_MSG("unreachable"); }
+
+        wxEndProcessData * const m_data;
+        const int m_fd;
+    };
+
+    wxFDIODispatcher::Get()->RegisterFD
+                             (
+                                 fd,
+                                 new wxEndProcessFDIOHandler(data, fd),
+                                 wxFDIO_INPUT
+                             );
+    return fd; // unused, but return something unique for the tag

 }
 
 }
 

-bool
-wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(execData),
-                                          int WXUNUSED(fd))
+bool wxAppTraits::CheckForRedirectedIO(wxExecuteData& execData)

 {
 {

+#if HAS_PIPE_INPUT_STREAM
+    bool hasIO = false;
+
+    if ( execData.bufOut && execData.bufOut->Update() )
+        hasIO = true;
+
+    if ( execData.bufErr && execData.bufErr->Update() )
+        hasIO = true;
+
+    return hasIO;
+#else // !HAS_PIPE_INPUT_STREAM

     return false;
     return false;

+#endif // HAS_PIPE_INPUT_STREAM/!HAS_PIPE_INPUT_STREAM

 }
 
 }
 

-void
-wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& WXUNUSED(execData))
+// helper classes/functions used by WaitForChild()
+namespace

 {
 {

-    // nothing to do here, we don't use the pipe
-}
-
-#endif // !Darwin/Darwin

 
 

-int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
+// convenient base class for IO handlers which are registered for read
+// notifications only and which also stores the FD we're reading from
+//
+// the derived classes still have to implement OnReadWaiting()
+class wxReadFDIOHandler : public wxFDIOHandler

 {
 {

-    wxEndProcessData *endProcData = new wxEndProcessData;
+public:
+    wxReadFDIOHandler(wxFDIODispatcher& disp, int fd) : m_fd(fd)
+    {
+        if ( fd )
+            disp.RegisterFD(fd, this, wxFDIO_INPUT);
+    }

 
 

-    const int flags = execData.flags;
+    virtual void OnWriteWaiting() { wxFAIL_MSG("unreachable"); }
+    virtual void OnExceptionWaiting() { wxFAIL_MSG("unreachable"); }

 
 

-    // 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;
+protected:
+    const int m_fd;

 
 

-        // sync execution: indicate it by negating the pid
-        endProcData->pid = -execData.pid;
-    }
-    else
+    DECLARE_NO_COPY_CLASS(wxReadFDIOHandler)
+};
+
+// class for monitoring our end of the process detection pipe, simply sets a
+// flag when input on the pipe (which must be due to EOF) is detected
+class wxEndHandler : public wxReadFDIOHandler
+{
+public:
+    wxEndHandler(wxFDIODispatcher& disp, int fd)
+        : wxReadFDIOHandler(disp, fd)

     {
     {

-        // 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;
+        m_terminated = false;

     }
 
     }
 

+    bool Terminated() const { return m_terminated; }

 
 

-    if ( !(flags & wxEXEC_NOEVENTS) )
-    {
-#if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))
-        endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid);
-#else
-        endProcData->tag = wxAddProcessCallback
-                           (
-                             endProcData,
-                             execData.pipeEndProcDetect.Detach(wxPipe::Read)
-                           );
+    virtual void OnReadWaiting() { m_terminated = true; }

 
 

-        execData.pipeEndProcDetect.Close();
-#endif // defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))
-    }
+private:
+    bool m_terminated;
+
+    DECLARE_NO_COPY_CLASS(wxEndHandler)
+};
+
+#if HAS_PIPE_INPUT_STREAM

 
 

-    if ( flags & wxEXEC_SYNC )
+// class for monitoring our ends of child stdout/err, should be constructed
+// with the FD and stream from wxExecuteData and will do nothing if they're
+// invalid
+//
+// unlike wxEndHandler this class registers itself with the provided dispatcher
+class wxRedirectedIOHandler : public wxReadFDIOHandler
+{
+public:
+    wxRedirectedIOHandler(wxFDIODispatcher& disp,
+                          int fd,
+                          wxStreamTempInputBuffer *buf)
+        : wxReadFDIOHandler(disp, fd),
+          m_buf(buf)

     {
     {

-        wxBusyCursor bc;
-        int exitcode = 0;
+    }

 
 

-        wxWindowDisabler *wd = flags & (wxEXEC_NODISABLE | wxEXEC_NOEVENTS)
-                                    ? NULL
-                                    : new wxWindowDisabler;
+    virtual void OnReadWaiting()
+    {
+        m_buf->Update();
+    }

 
 

-        if ( flags & wxEXEC_NOEVENTS )
-        {
-            // just block waiting for the child to exit
-            int status = 0;
+private:
+    wxStreamTempInputBuffer * const m_buf;

 
 

-            int result = waitpid(execData.pid, &status, 0);
+    DECLARE_NO_COPY_CLASS(wxRedirectedIOHandler)
+};

 
 

-            if ( result == -1 )
-            {
-                wxLogLastError(_T("waitpid"));
-                exitcode = -1;
-            }
-            else
-            {
-                wxASSERT_MSG( result == execData.pid,
-                              _T("unexpected waitpid() return value") );
+#endif // HAS_PIPE_INPUT_STREAM

 
 

-                if ( WIFEXITED(status) )
-                {
-                    exitcode = WEXITSTATUS(status);
-                }
-                else // abnormal termination?
-                {
-                    wxASSERT_MSG( WIFSIGNALED(status),
-                                  _T("unexpected child wait status") );
-                    exitcode = -1;
-                }
-            }
-        }
-        else // !wxEXEC_NOEVENTS
-        {
-            // endProcData->pid will be set to 0 from GTK_EndProcessDetector when the
-            // process terminates
-            while ( endProcData->pid != 0 )
-            {
-                bool idle = true;
+// helper function which calls waitpid() and analyzes the result
+int DoWaitForChild(int pid, int flags = 0)
+{
+    wxASSERT_MSG( pid > 0, "invalid PID" );

 
 

-#if HAS_PIPE_INPUT_STREAM
-                if ( execData.bufOut )
-                {
-                    execData.bufOut->Update();
-                    idle = false;
-                }
+    int status, rc;

 
 

-                if ( execData.bufErr )
-                {
-                    execData.bufErr->Update();
-                    idle = false;
-                }
-#endif // HAS_PIPE_INPUT_STREAM
+    // loop while we're getting EINTR
+    for ( ;; )
+    {
+        rc = waitpid(pid, &status, flags);

 
 

-                // don't consume 100% of the CPU while we're sitting in this
-                // loop
-                if ( idle )
-                    wxMilliSleep(1);
+        if ( rc != -1 || errno != EINTR )
+            break;
+    }

 
 

-                // give GTK+ a chance to call GTK_EndProcessDetector here and
-                // also repaint the GUI
-                wxYield();
-            }
+    if ( rc == 0 )
+    {
+        // This can only happen if the child application closes our dummy pipe
+        // that is used to monitor its lifetime; in that case, our best bet is
+        // to pretend the process did terminate, because otherwise wxExecute()
+        // would hang indefinitely (OnReadWaiting() won't be called again, the
+        // descriptor is closed now).
+        wxLogDebug("Child process (PID %d) still alive but pipe closed so "
+                   "generating a close notification", pid);
+    }
+    else if ( rc == -1 )
+    {
+        wxLogLastError(wxString::Format("waitpid(%d)", pid));
+    }
+    else // child did terminate
+    {
+        wxASSERT_MSG( rc == pid, "unexpected waitpid() return value" );

 
 

-            exitcode = endProcData->exitcode;
+        if ( WIFEXITED(status) )
+            return WEXITSTATUS(status);
+        else if ( WIFSIGNALED(status) )
+            return -WTERMSIG(status);
+        else
+        {
+            wxLogError("Child process (PID %d) exited for unknown reason, "
+                       "status = %d", pid, status);

         }
         }

+    }

 
 

-        delete wd;
-        delete endProcData;
+    return -1;
+}

 
 

-        return exitcode;
-    }
-    else // async execution
+} // anonymous namespace
+
+int wxAppTraits::WaitForChild(wxExecuteData& execData)
+{
+    if ( !(execData.flags & wxEXEC_SYNC) )

     {
     {

+        // asynchronous execution: just launch the process and return,
+        // endProcData will be destroyed when it terminates (currently we leak
+        // it if the process doesn't terminate before we do and this should be
+        // fixed but it's not a real leak so it's not really very high
+        // priority)
+        wxEndProcessData *endProcData = new wxEndProcessData;
+        endProcData->process = execData.process;
+        endProcData->pid = execData.pid;
+        endProcData->tag = AddProcessCallback
+                           (
+                             endProcData,
+                             execData.GetEndProcReadFD()
+                           );
+        endProcData->async = true;
+

         return execData.pid;
     }
         return execData.pid;
     }

-}
+    //else: synchronous execution case
+
+#if HAS_PIPE_INPUT_STREAM
+    wxProcess * const process = execData.process;
+    if ( process && process->IsRedirected() )
+    {
+        // 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 multiplex here waiting for any input from the child or closure of
+        // the pipe used to indicate its termination
+        wxSelectDispatcher disp;
+
+        wxEndHandler endHandler(disp, execData.GetEndProcReadFD());

 
 

-#endif // wxUSE_GUI
-#if wxUSE_BASE
+        wxRedirectedIOHandler outHandler(disp, execData.fdOut, execData.bufOut),
+                              errHandler(disp, execData.fdErr, execData.bufErr);

 
 

-void wxHandleProcessTermination(wxEndProcessData *proc_data)
+        while ( !endHandler.Terminated() )
+        {
+            disp.Dispatch();
+        }
+    }
+    //else: no IO redirection, just block waiting for the child to exit
+#endif // HAS_PIPE_INPUT_STREAM
+
+    return DoWaitForChild(execData.pid);
+}
+
+void wxHandleProcessTermination(wxEndProcessData *data)

 {
 {

+    data->exitcode = DoWaitForChild(data->pid, WNOHANG);
+

     // notify user about termination if required
     // notify user about termination if required

-    if ( proc_data->process )
+    if ( data->process )

     {
     {

-        proc_data->process->OnTerminate(proc_data->pid, proc_data->exitcode);
+        data->process->OnTerminate(data->pid, data->exitcode);

     }
 
     }
 

-    // clean up
-    if ( proc_data->pid > 0 )
+    if ( data->async )

     {
     {

-       delete proc_data;
+        // in case of asynchronous execution we don't need this data any more
+        // after the child terminates
+        delete data;

     }
     }

-    else
+    else // sync execution

     {
     {

-       // let wxExecute() know that the process has terminated
-       proc_data->pid = 0;
+        // let wxExecute() know that the process has terminated
+        data->pid = 0;

     }
 }
 
     }
 }
 

-#endif // wxUSE_BASE