initial attempts to get raw bitmaps working under Mac

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 9118bcb7b1e218f0956ba2930328d382ff0f69c1..be66b6c9e42ca774760c07c88354f5f7533a40ee 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utilsunx.cpp
+// Name:        unix/utilsunx.cpp

 // Purpose:     generic Unix implementation of many wx functions
 // Author:      Vadim Zeitlin
 // Id:          $Id$
 // Purpose:     generic Unix implementation of many wx functions
 // Author:      Vadim Zeitlin
 // Id:          $Id$


@@ -26,12 +26,40 @@
 #include "wx/process.h"
 #include "wx/thread.h"
 
 #include "wx/process.h"
 #include "wx/thread.h"
 

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

 
 

+#if defined( __MWERKS__ ) && defined(__MACH__)
+#define WXWIN_OS_DESCRIPTION "MacOS X"
+#define HAVE_NANOSLEEP
+#endif
+
+// not only the statfs syscall is called differently depending on platform, but
+// one of its incarnations, statvfs(), takes different arguments under
+// different platforms and even different versions of the same system (Solaris
+// 7 and 8): if you want to test for this, don't forget that the problems only
+// appear if the large files support is enabled

 #ifdef HAVE_STATFS
 #ifdef HAVE_STATFS

-    #include <sys/vfs.h>
+    #ifdef __BSD__
+        #include <sys/param.h>
+        #include <sys/mount.h>
+    #else // !__BSD__
+        #include <sys/vfs.h>
+    #endif // __BSD__/!__BSD__
+
+    #define wxStatfs statfs

 #endif // HAVE_STATFS
 
 #endif // HAVE_STATFS
 

+#ifdef HAVE_STATVFS
+    #include <sys/statvfs.h>
+
+    #define wxStatfs statvfs
+#endif // HAVE_STATVFS
+
+#if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
+    // WX_STATFS_T is detected by configure
+    #define wxStatfs_t WX_STATFS_T
+#endif
+

 #if wxUSE_GUI
     #include "wx/unix/execute.h"
 #endif
 #if wxUSE_GUI
     #include "wx/unix/execute.h"
 #endif


@@ -144,7 +172,7 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc)
     int err = kill((pid_t)pid, (int)sig);
     if ( rc )
     {
     int err = kill((pid_t)pid, (int)sig);
     if ( rc )
     {

-        switch ( err )
+        switch ( errno )

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


@@ -176,10 +204,20 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc)
 
 #define WXEXECUTE_NARGS   127
 
 
 #define WXEXECUTE_NARGS   127
 

-long wxExecute( const wxString& command, bool sync, wxProcess *process )
+long wxExecute( const wxString& command, int flags, wxProcess *process )

 {
     wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") );
 
 {
     wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") );
 

+#if wxUSE_THREADS
+    // fork() doesn't mix well with POSIX threads: on many systems the program
+    // deadlocks or crashes for some reason. Probably our code is buggy and
+    // doesn't do something which must be done to allow this to work, but I
+    // don't know what yet, so for now just warn the user (this is the least we
+    // can do) about it
+    wxASSERT_MSG( wxThread::IsMain(),
+                    _T("wxExecute() can be called only from the main thread") );
+#endif // wxUSE_THREADS
+

     int argc = 0;
     wxChar *argv[WXEXECUTE_NARGS];
     wxString argument;
     int argc = 0;
     wxChar *argv[WXEXECUTE_NARGS];
     wxString argument;


@@ -236,7 +274,7 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process )
     argv[argc] = NULL;
 
     // do execute the command
     argv[argc] = NULL;
 
     // do execute the command

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

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


@@ -269,7 +307,7 @@ static wxString wxMakeShellCommand(const wxString& command)
 
 bool wxShell(const wxString& command)
 {
 
 bool wxShell(const wxString& command)
 {

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

 }
 
 bool wxShell(const wxString& command, wxArrayString& output)
 }
 
 bool wxShell(const wxString& command, wxArrayString& output)


@@ -279,60 +317,48 @@ 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)
+{
+    wxChar level;
+    switch ( wFlags )
+    {
+        case wxSHUTDOWN_POWEROFF:
+            level = _T('0');
+            break;
+
+        case wxSHUTDOWN_REBOOT:
+            level = _T('6');
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unknown wxShutdown() flag") );
+            return FALSE;
+    }
+
+    return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;
+}
+
+

 #if wxUSE_GUI
 
 void wxHandleProcessTermination(wxEndProcessData *proc_data)
 {
 #if wxUSE_GUI
 
 void wxHandleProcessTermination(wxEndProcessData *proc_data)
 {

-    int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
-
-    // waitpid is POSIX so should be available everywhere, however on older
-    // systems wait() might be used instead in a loop (until the right pid
-    // terminates)
-    int status = 0;
-    int rc;
-
-    // wait for child termination and if waitpid() was interrupted, try again
-    do
+    // notify user about termination if required
+    if ( proc_data->process )

     {
     {

-       rc = waitpid(pid, &status, 0);
+        proc_data->process->OnTerminate(proc_data->pid, proc_data->exitcode);

     }
     }

-    while ( rc == -1 && errno == EINTR );
-

 
 

-    if( rc == -1 || ! (WIFEXITED(status) || WIFSIGNALED(status)) )
+    // clean up
+    if ( proc_data->pid > 0 )

     {
     {

-       // wxLogSysError(_("Waiting for subprocess termination failed"));
-       /* AFAIK, this can only happen if something went wrong within
-          wxGTK, i.e. due to a race condition or some serious bug.
-          After having fixed the order of statements in
-          GTK_EndProcessDetector(). (KB)
-
-          JACS adds -- I have other code that kills a process recursively
-          and calls waitpid; so this function then generates an error.
-          I've commented out the wxLogSysError and the 'else' so that
-          termination is always done properly.
-       */
+       delete proc_data;

     }
     }

-    // else
+    else

     {
     {

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

     }
 }
 
     }
 }
 


@@ -344,106 +370,151 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-class wxProcessFileInputStream : public wxInputStream
-{
-public:
-    wxProcessFileInputStream(int fd) { m_fd = fd; }
-    ~wxProcessFileInputStream() { close(m_fd); }
-
-    virtual bool Eof() const;
-
-protected:
-    size_t OnSysRead(void *buffer, size_t bufsize);
-
-protected:
-    int m_fd;
-};
+// ----------------------------------------------------------------------------
+// wxPipeInputStream: stream for reading from a pipe
+// ----------------------------------------------------------------------------

 
 

-class wxProcessFileOutputStream : public wxOutputStream
+class wxPipeInputStream : public wxFileInputStream

 {
 public:
 {
 public:

-    wxProcessFileOutputStream(int fd) { m_fd = fd; }
-    ~wxProcessFileOutputStream() { close(m_fd); }
+    wxPipeInputStream(int fd) : wxFileInputStream(fd) { }

 
 

-protected:
-    size_t OnSysWrite(const void *buffer, size_t bufsize);
+    // return TRUE if the pipe is still opened
+    bool IsOpened() const { return !Eof(); }

 
 

-protected:
-    int m_fd;
+    // return TRUE if we have anything to read, don't block
+    virtual bool CanRead() const;

 };
 
 };
 

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

 {
     if ( m_lasterror == wxSTREAM_EOF )
 {
     if ( m_lasterror == wxSTREAM_EOF )

-        return TRUE;
+        return FALSE;

 
     // check if there is any input available
     struct timeval tv;
     tv.tv_sec = 0;
     tv.tv_usec = 0;
 
 
     // check if there is any input available
     struct timeval tv;
     tv.tv_sec = 0;
     tv.tv_usec = 0;
 

+    const int fd = m_file->fd();
+

     fd_set readfds;
     FD_ZERO(&readfds);
     fd_set readfds;
     FD_ZERO(&readfds);

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

     {
         case -1:
             wxLogSysError(_("Impossible to get child process input"));
             // fall through
 
         case 0:
     {
         case -1:
             wxLogSysError(_("Impossible to get child process input"));
             // fall through
 
         case 0:

-            return TRUE;
+            return FALSE;

 
         default:
             wxFAIL_MSG(_T("unexpected select() return value"));
             // still fall through
 
         case 1:
 
         default:
             wxFAIL_MSG(_T("unexpected select() return value"));
             // still fall through
 
         case 1:

-            // input available: check if there is any
-            return wxInputStream::Eof();
+            // input available -- or maybe not, as select() returns 1 when a
+            // read() will complete without delay, but it could still not read
+            // anything
+            return !Eof();

     }
 }
 
     }
 }
 

-size_t wxProcessFileInputStream::OnSysRead(void *buffer, size_t bufsize)
+// define this to let wxexec.cpp know that we know what we're doing
+#define _WX_USED_BY_WXEXECUTE_
+#include "../common/execcmn.cpp"
+
+#endif // wxUSE_STREAMS
+
+// ----------------------------------------------------------------------------
+// wxPipe: this encapsulates pipe() system call
+// ----------------------------------------------------------------------------
+
+class wxPipe

 {
 {

-    int ret = read(m_fd, buffer, bufsize);
-    if ( ret == 0 )
+public:
+    // the symbolic names for the pipe ends
+    enum Direction

     {
     {

-        m_lasterror = wxSTREAM_EOF;
-    }
-    else if ( ret == -1 )
+        Read,
+        Write
+    };
+
+    enum

     {
     {

-        m_lasterror = wxSTREAM_READ_ERROR;
-        ret = 0;
-    }
-    else
+        INVALID_FD = -1
+    };
+
+    // default ctor doesn't do anything
+    wxPipe() { m_fds[Read] = m_fds[Write] = INVALID_FD; }
+
+    // create the pipe, return TRUE if ok, FALSE on error
+    bool Create()

     {
     {

-        m_lasterror = wxSTREAM_NOERROR;
+        if ( pipe(m_fds) == -1 )
+        {
+            wxLogSysError(_("Pipe creation failed"));
+
+            return FALSE;
+        }
+
+        return TRUE;

     }
 
     }
 

-    return ret;
-}
+    // return TRUE if we were created successfully
+    bool IsOk() const { return m_fds[Read] != INVALID_FD; }

 
 

-size_t wxProcessFileOutputStream::OnSysWrite(const void *buffer, size_t bufsize)
-{
-    int ret = write(m_fd, buffer, bufsize);
-    if ( ret == -1 )
+    // return the descriptor for one of the pipe ends
+    int operator[](Direction which) const

     {
     {

-        m_lasterror = wxSTREAM_WRITE_ERROR;
-        ret = 0;
+        wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds),
+                      _T("invalid pipe index") );
+
+        return m_fds[which];

     }
     }

-    else
+
+    // detach a descriptor, meaning that the pipe dtor won't close it, and
+    // return it
+    int Detach(Direction which)

     {
     {

-        m_lasterror = wxSTREAM_NOERROR;
+        wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds),
+                      _T("invalid pipe index") );
+
+        int fd = m_fds[which];
+        m_fds[which] = INVALID_FD;
+
+        return fd;

     }
 
     }
 

-    return ret;
-}
+    // close the pipe descriptors
+    void Close()
+    {
+        for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ )
+        {
+            if ( m_fds[n] != INVALID_FD )
+                close(m_fds[n]);
+        }
+    }

 
 

-#endif // wxUSE_STREAMS
+    // dtor closes the pipe descriptors
+    ~wxPipe() { Close(); }
+
+private:
+    int m_fds[2];
+};
+
+// ----------------------------------------------------------------------------
+// wxExecute: the real worker function
+// ----------------------------------------------------------------------------
+
+#ifdef __VMS
+    #pragma message disable codeunreachable
+#endif

 
 long wxExecute(wxChar **argv,
 
 long wxExecute(wxChar **argv,

-               bool sync,
+               int flags,

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


@@ -451,7 +522,7 @@ long wxExecute(wxChar **argv,
     //
     // we define this as a macro, not a variable, to avoid compiler warnings
     // about "ERROR_RETURN_CODE value may be clobbered by fork()"
     //
     // we define this as a macro, not a variable, to avoid compiler warnings
     // about "ERROR_RETURN_CODE value may be clobbered by fork()"

-    #define ERROR_RETURN_CODE ((sync) ? -1 : 0)
+    #define ERROR_RETURN_CODE ((flags & wxEXEC_SYNC) ? -1 : 0)

 
     wxCHECK_MSG( *argv, ERROR_RETURN_CODE, wxT("can't exec empty command") );
 
 
     wxCHECK_MSG( *argv, ERROR_RETURN_CODE, wxT("can't exec empty command") );
 


@@ -478,40 +549,28 @@ long wxExecute(wxChar **argv,
     wxChar **mb_argv = argv;
 #endif // Unicode/ANSI
 
     wxChar **mb_argv = argv;
 #endif // Unicode/ANSI
 

-#if wxUSE_GUI
+#if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))

     // create pipes
     // create pipes

-    int end_proc_detect[2];
-    if ( pipe(end_proc_detect) == -1 )
+    wxPipe pipeEndProcDetect;
+    if ( !pipeEndProcDetect.Create() )

     {
     {

-        wxLogSysError( _("Pipe creation failed") );

         wxLogError( _("Failed to execute '%s'\n"), *argv );
 
         ARGS_CLEANUP;
 
         return ERROR_RETURN_CODE;
     }
         wxLogError( _("Failed to execute '%s'\n"), *argv );
 
         ARGS_CLEANUP;
 
         return ERROR_RETURN_CODE;
     }

-#endif // wxUSE_GUI
+#endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))

 
     // pipes for inter process communication
 
     // pipes for inter process communication

-    int pipeIn[2],      // stdin
-        pipeOut[2],     // stdout
-        pipeErr[2];     // stderr
-
-    pipeIn[0] = pipeIn[1] =
-    pipeOut[0] = pipeOut[1] =
-    pipeErr[0] = pipeErr[1] = -1;
+    wxPipe pipeIn,      // stdin
+           pipeOut,     // stdout
+           pipeErr;     // stderr

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

-        if ( pipe(pipeIn) == -1 || pipe(pipeOut) == -1 || pipe(pipeErr) == -1 )
+        if ( !pipeIn.Create() || !pipeOut.Create() || !pipeErr.Create() )

         {
         {

-#if wxUSE_GUI
-            // free previously allocated resources
-            close(end_proc_detect[0]);
-            close(end_proc_detect[1]);
-#endif // wxUSE_GUI
-
-            wxLogSysError( _("Pipe creation failed") );

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


@@ -521,25 +580,18 @@ long wxExecute(wxChar **argv,
     }
 
     // fork the process
     }
 
     // fork the process

-#ifdef HAVE_VFORK
-    pid_t pid = vfork();
+    //
+    // NB: do *not* use vfork() here, it completely breaks this code for some
+    //     reason under Solaris (and maybe others, although not under Linux)
+    //     But on OpenVMS we do not have fork so we have to use vfork and
+    //     cross our fingers that it works.
+#ifdef __VMS
+   pid_t pid = vfork();

 #else
 #else

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

 #endif
 #endif

-
-    if ( pid == -1 )     // error?
+   if ( pid == -1 )     // error?

     {
     {

-#if wxUSE_GUI
-        close(end_proc_detect[0]);
-        close(end_proc_detect[1]);
-        close(pipeIn[0]);
-        close(pipeIn[1]);
-        close(pipeOut[0]);
-        close(pipeOut[1]);
-        close(pipeErr[0]);
-        close(pipeErr[1]);
-#endif // wxUSE_GUI
-

         wxLogSysError( _("Fork failed") );
 
         ARGS_CLEANUP;
         wxLogSysError( _("Fork failed") );
 
         ARGS_CLEANUP;


@@ -548,79 +600,130 @@ long wxExecute(wxChar **argv,
     }
     else if ( pid == 0 )  // we're in child
     {
     }
     else if ( pid == 0 )  // we're in child
     {

-#if wxUSE_GUI
-        close(end_proc_detect[0]); // close reading side
-#endif // wxUSE_GUI
-

         // These lines close the open file descriptors to to avoid any
         // input/output which might block the process or irritate the user. If
         // one wants proper IO for the subprocess, the right thing to do is to
         // start an xterm executing it.
         // These lines close the open file descriptors to to avoid any
         // input/output which might block the process or irritate the user. If
         // one wants proper IO for the subprocess, the right thing to do is to
         // start an xterm executing it.

-        if ( !sync )
+        if ( !(flags & wxEXEC_SYNC) )

         {
             for ( int fd = 0; fd < FD_SETSIZE; fd++ )
             {
         {
             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
+                if ( fd == pipeIn[wxPipe::Read]
+                        || fd == pipeOut[wxPipe::Write]
+                        || fd == pipeErr[wxPipe::Write]
+#if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
+                        || fd == pipeEndProcDetect[wxPipe::Write]
+#endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))

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

-                // leave stderr opened too, it won't do any hurm
+                // leave stderr opened too, it won't do any harm

                 if ( fd != STDERR_FILENO )
                     close(fd);
             }
         }
 
                 if ( fd != STDERR_FILENO )
                     close(fd);
             }
         }
 

-        // redirect stdio, stdout and stderr
-        if ( pipeIn[0] != -1 )
+#if !defined(__VMS) && !defined(__EMX__)
+        if ( flags & wxEXEC_MAKE_GROUP_LEADER )
+        {
+            // Set process group to child process' pid.  Then killing -pid
+            // of the parent will kill the process and all of its children.
+            setsid();
+        }
+#endif // !__VMS
+
+#if wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
+        // reading side can be safely closed but we should keep the write one
+        // opened
+        pipeEndProcDetect.Detach(wxPipe::Write);
+        pipeEndProcDetect.Close();
+#endif // wxUSE_GUI && !(defined(__DARWIN__) && defined(__WXMAC__))
+
+        // redirect stdin, stdout and stderr
+        if ( pipeIn.IsOk() )

         {
         {

-            if ( dup2(pipeIn[0], STDIN_FILENO) == -1 ||
-                 dup2(pipeOut[1], STDOUT_FILENO) == -1 ||
-                 dup2(pipeErr[1], STDERR_FILENO) == -1 )
+            if ( dup2(pipeIn[wxPipe::Read], STDIN_FILENO) == -1 ||
+                 dup2(pipeOut[wxPipe::Write], STDOUT_FILENO) == -1 ||
+                 dup2(pipeErr[wxPipe::Write], STDERR_FILENO) == -1 )

             {
                 wxLogSysError(_("Failed to redirect child process input/output"));
             }
 
             {
                 wxLogSysError(_("Failed to redirect child process input/output"));
             }
 

-            close(pipeIn[0]);
-            close(pipeOut[1]);
-            close(pipeErr[1]);
+            pipeIn.Close();
+            pipeOut.Close();
+            pipeErr.Close();

         }
 
         execvp (*mb_argv, mb_argv);
 
         }
 
         execvp (*mb_argv, mb_argv);
 

+        fprintf(stderr, "execvp(");
+        // CS changed ppc to ppc_ as ppc is not available under mac os CW Mach-O
+        for ( char **ppc_ = mb_argv; *ppc_; ppc_++ )
+            fprintf(stderr, "%s%s", ppc_ == mb_argv ? "" : ", ", *ppc_);
+        fprintf(stderr, ") failed with error %d!\n", errno);
+

         // there is no return after successful exec()
         _exit(-1);
         // there is no return after successful exec()
         _exit(-1);

+
+        // some compilers complain about missing return - of course, they
+        // should know that exit() doesn't return but what else can we do if
+        // they don't?
+        //
+        // and, sure enough, other compilers complain about unreachable code
+        // after exit() call, so we can just always have return here...
+#if defined(__VMS) || defined(__INTEL_COMPILER)
+        return 0;
+#endif

     }
     else // we're in parent
     {
         ARGS_CLEANUP;
 
     }
     else // we're in parent
     {
         ARGS_CLEANUP;
 

-        // pipe initialization: construction of the wxStreams
+        // prepare for IO redirection
+
+#if wxUSE_STREAMS
+        // the input buffer bufOut is connected to stdout, this is why it is
+        // called bufOut and not bufIn
+        wxStreamTempInputBuffer bufOut,
+                                bufErr;
+#endif // wxUSE_STREAMS
+

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

-            // These two streams are relative to this process.
-            wxOutputStream *outStream = new wxProcessFileOutputStream(pipeIn[1]);
-            wxInputStream *inStream = new wxProcessFileInputStream(pipeOut[0]);
-            wxInputStream *errStream = new wxProcessFileInputStream(pipeErr[0]);
+            wxOutputStream *inStream =
+                new wxFileOutputStream(pipeIn.Detach(wxPipe::Write));

 
 

-            process->SetPipeStreams(inStream, outStream, errStream);
+            wxPipeInputStream *outStream =
+                new wxPipeInputStream(pipeOut.Detach(wxPipe::Read));
+
+            wxPipeInputStream *errStream =
+                new wxPipeInputStream(pipeErr.Detach(wxPipe::Read));
+
+            process->SetPipeStreams(outStream, inStream, errStream);
+
+            bufOut.Init(outStream);
+            bufErr.Init(errStream);

 #endif // wxUSE_STREAMS
 #endif // wxUSE_STREAMS

+        }

 
 

-            close(pipeIn[0]); // close reading side
-            close(pipeOut[1]); // close writing side
-            close(pipeErr[1]); // close writing side
+        if ( pipeIn.IsOk() )
+        {
+            pipeIn.Close();
+            pipeOut.Close();
+            pipeErr.Close();

         }
 
 #if wxUSE_GUI && !defined(__WXMICROWIN__)
         wxEndProcessData *data = new wxEndProcessData;
 
         }
 
 #if wxUSE_GUI && !defined(__WXMICROWIN__)
         wxEndProcessData *data = new wxEndProcessData;
 

-        if ( sync )
+        // 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 data.
+        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
         {
             // we may have process for capturing the program output, but it's
             // not used in wxEndProcessData in the case of sync execution


@@ -628,16 +731,47 @@ long wxExecute(wxChar **argv,
 
             // sync execution: indicate it by negating the pid
             data->pid = -pid;
 
             // sync execution: indicate it by negating the pid
             data->pid = -pid;

-            data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
+        }
+        else
+        {
+            // 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;
+        }
+

 
 

-            close(end_proc_detect[1]); // close writing side
+#if defined(__DARWIN__) && defined(__WXMAC__)
+        data->tag = wxAddProcessCallbackForPid(data,pid);
+#else
+        data->tag = wxAddProcessCallback
+                    (
+                        data,
+                        pipeEndProcDetect.Detach(wxPipe::Read)
+                    );
+
+        pipeEndProcDetect.Close();
+#endif // defined(__DARWIN__) && defined(__WXMAC__)

 
 

+        if ( flags & wxEXEC_SYNC )
+        {

             wxBusyCursor bc;
             wxWindowDisabler wd;
 
             wxBusyCursor bc;
             wxWindowDisabler wd;
 

-            // it will be set to 0 from GTK_EndProcessDetector
-            while (data->pid != 0)
+            // data->pid will be set to 0 from GTK_EndProcessDetector when the
+            // process terminates
+            while ( data->pid != 0 )
+            {
+#if wxUSE_STREAMS
+                bufOut.Update();
+                bufErr.Update();
+#endif // wxUSE_STREAMS
+
+                // give GTK+ a chance to call GTK_EndProcessDetector here and
+                // also repaint the GUI

                 wxYield();
                 wxYield();

+            }

 
             int exitcode = data->exitcode;
 
 
             int exitcode = data->exitcode;
 


@@ -647,19 +781,12 @@ long wxExecute(wxChar **argv,
         }
         else // async execution
         {
         }
         else // async execution
         {

-            // async execution, nothing special to do - caller will be
-            // notified about the process termination if process != NULL, data
-            // will be deleted in GTK_EndProcessDetector
-            data->process  = process;
-            data->pid      = pid;
-            data->tag      = wxAddProcessCallback(data, end_proc_detect[0]);
-
-            close(end_proc_detect[1]); // close writing side
-

             return pid;
         }
 #else // !wxUSE_GUI
             return pid;
         }
 #else // !wxUSE_GUI

-        wxASSERT_MSG( sync, wxT("async execution not supported yet") );
+
+        wxASSERT_MSG( flags & wxEXEC_SYNC,
+                      wxT("async execution not supported yet") );

 
         int exitcode = 0;
         if ( waitpid(pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
 
         int exitcode = 0;
         if ( waitpid(pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )


@@ -670,14 +797,13 @@ long wxExecute(wxChar **argv,
         return exitcode;
 #endif // wxUSE_GUI
     }
         return exitcode;
 #endif // wxUSE_GUI
     }

+
+    return ERROR_RETURN_CODE;
+}
+

 #ifdef __VMS
 #ifdef __VMS

-   // VMS does not recognise exit as a return and complains about
-   // a missing return
-   // I think VMS is wrong in this
-   //     JJ
-   return 0;
+    #pragma message enable codeunreachable

 #endif
 #endif

-}

 
 #undef ERROR_RETURN_CODE
 #undef ARGS_CLEANUP
 
 #undef ERROR_RETURN_CODE
 #undef ARGS_CLEANUP


@@ -689,13 +815,13 @@ long wxExecute(wxChar **argv,
 const wxChar* wxGetHomeDir( wxString *home  )
 {
     *home = wxGetUserHome( wxString() );
 const wxChar* wxGetHomeDir( wxString *home  )
 {
     *home = wxGetUserHome( wxString() );

-   wxString tmp;
+    wxString tmp;

     if ( home->IsEmpty() )
         *home = wxT("/");
 #ifdef __VMS
     if ( home->IsEmpty() )
         *home = wxT("/");
 #ifdef __VMS

-   tmp = *home;
-   if ( tmp.Last() != wxT(']'))
-     if ( tmp.Last() != wxT('/')) *home << wxT('/');
+    tmp = *home;
+    if ( tmp.Last() != wxT(']'))
+        if ( tmp.Last() != wxT('/')) *home << wxT('/');

 #endif
     return home->c_str();
 }
 #endif
     return home->c_str();
 }


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

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

             return ptr;
             return ptr;

+#endif

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


@@ -855,14 +986,16 @@ bool wxGetUserName(wxChar *buf, int sz)
     return FALSE;
 }
 
     return FALSE;
 }
 

+#ifndef __WXMAC__

 wxString wxGetOsDescription()
 {
 #ifndef WXWIN_OS_DESCRIPTION
     #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
 #else
 wxString wxGetOsDescription()
 {
 #ifndef WXWIN_OS_DESCRIPTION
     #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
 #else

-    return WXWIN_OS_DESCRIPTION;
+    return wxString::FromAscii( WXWIN_OS_DESCRIPTION );

 #endif
 }
 #endif
 }

+#endif

 
 // this function returns the GUI toolkit version in GUI programs, but OS
 // version in non-GUI ones
 
 // this function returns the GUI toolkit version in GUI programs, but OS
 // version in non-GUI ones


@@ -889,6 +1022,11 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
 
 #endif // !wxUSE_GUI
 
 
 #endif // !wxUSE_GUI
 

+unsigned long wxGetProcessId()
+{
+    return (unsigned long)getpid();
+}
+

 long wxGetFreeMemory()
 {
 #if defined(__LINUX__)
 long wxGetFreeMemory()
 {
 #if defined(__LINUX__)


@@ -920,30 +1058,38 @@ long wxGetFreeMemory()
 
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
 
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {

-#ifdef HAVE_STATFS
-
-    struct statfs fs;
-    if ( statfs(path, &fs) != 0 )
+#if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
+    // the case to "char *" is needed for AIX 4.3
+    wxStatfs_t fs;
+    if ( wxStatfs((char *)(const char*)path.fn_str(), &fs) != 0 )

     {
     {

-        wxLogSysError("Failed to get file system statistics");
+        wxLogSysError( wxT("Failed to get file system statistics") );

 
         return FALSE;
     }
 
 
         return FALSE;
     }
 

+    // under Solaris we also have to use f_frsize field instead of f_bsize
+    // which is in general a multiple of f_frsize
+#ifdef HAVE_STATVFS
+    wxLongLong blockSize = fs.f_frsize;
+#else // HAVE_STATFS
+    wxLongLong blockSize = fs.f_bsize;
+#endif // HAVE_STATVFS/HAVE_STATFS
+

     if ( pTotal )
     {
     if ( pTotal )
     {

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

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

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

     }
 
     return TRUE;
     }
 
     return TRUE;

-#endif // HAVE_STATFS
-
+#else // !HAVE_STATFS && !HAVE_STATVFS

     return FALSE;
     return FALSE;

+#endif // HAVE_STATFS

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -968,8 +1114,10 @@ bool wxGetEnv(const wxString& var, wxString *value)
 bool wxSetEnv(const wxString& variable, const wxChar *value)
 {
 #if defined(HAVE_SETENV)
 bool wxSetEnv(const wxString& variable, const wxChar *value)
 {
 #if defined(HAVE_SETENV)

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

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


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

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

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


@@ -1065,6 +1213,8 @@ bool wxHandleFatalExceptions(bool doit)
 // error and debug output routines (deprecated, use wxLog)
 // ----------------------------------------------------------------------------
 
 // error and debug output routines (deprecated, use wxLog)
 // ----------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY_2_2
+

 void wxDebugMsg( const char *format, ... )
 {
   va_list ap;
 void wxDebugMsg( const char *format, ... )
 {
   va_list ap;


@@ -1091,3 +1241,5 @@ void wxFatalError( const wxString &msg, const wxString &title )
   exit(3); // the same exit code as for abort()
 }
 
   exit(3); // the same exit code as for abort()
 }
 

+#endif // WXWIN_COMPATIBILITY_2_2
+