When saving the editable state, use the real state (m_editable)

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 6ff5e309846c2ad6bd7faac8c834a84c379f8fe9..d0cb4c4ae24cbfed53892e3defbe74fc4f9fa889 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -28,26 +28,32 @@
 
 #include "wx/wfstream.h"
 
 
 #include "wx/wfstream.h"
 

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

 #endif // HAVE_STATFS
 
 #endif // HAVE_STATFS
 

-// not only the statfs syscall is called differently depending on platform, but
-// we also can't use "struct statvfs" under Solaris because it breaks down if
-// HAVE_LARGEFILE_SUPPORT == 1 and we must use statvfs_t instead

 #ifdef HAVE_STATVFS
     #include <sys/statvfs.h>
 
 #ifdef HAVE_STATVFS
     #include <sys/statvfs.h>
 

-    #define statfs statvfs
-    #define wxStatFs statvfs_t
-#elif HAVE_STATFS
-    #define wxStatFs struct statfs
-#endif // HAVE_STAT[V]FS
+    #define wxStatfs statvfs
+#endif // HAVE_STATVFS
+
+#if 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"
 
 #if wxUSE_GUI
     #include "wx/unix/execute.h"


@@ -197,6 +203,16 @@ 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;


@@ -253,11 +269,7 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
     argv[argc] = NULL;
 
     // do execute the command
     argv[argc] = NULL;
 
     // do execute the command

-#if wxUSE_UNICODE
-    long lRc = -1;
-#else

     long lRc = wxExecute(argv, flags, process);
     long lRc = wxExecute(argv, flags, process);

-#endif

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


@@ -366,10 +378,10 @@ public:
     bool IsOpened() const { return !Eof(); }
 
     // return TRUE if we have anything to read, don't block
     bool IsOpened() const { return !Eof(); }
 
     // return TRUE if we have anything to read, don't block

-    bool IsAvailable() const;
+    virtual bool CanRead() const;

 };
 
 };
 

-bool wxPipeInputStream::IsAvailable() const
+bool wxPipeInputStream::CanRead() const

 {
     if ( m_lasterror == wxSTREAM_EOF )
         return FALSE;
 {
     if ( m_lasterror == wxSTREAM_EOF )
         return FALSE;


@@ -532,7 +544,7 @@ 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
     wxPipe pipeEndProcDetect;
     if ( !pipeEndProcDetect.Create() )
     // create pipes
     wxPipe pipeEndProcDetect;
     if ( !pipeEndProcDetect.Create() )


@@ -543,7 +555,7 @@ long wxExecute(wxChar **argv,
 
         return ERROR_RETURN_CODE;
     }
 
         return ERROR_RETURN_CODE;
     }

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

 
     // pipes for inter process communication
     wxPipe pipeIn,      // stdin
 
     // pipes for inter process communication
     wxPipe pipeIn,      // stdin


@@ -563,13 +575,17 @@ 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?

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


@@ -590,9 +606,9 @@ long wxExecute(wxChar **argv,
                 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]

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

                         || fd == pipeEndProcDetect[wxPipe::Write]
                         || fd == pipeEndProcDetect[wxPipe::Write]

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

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


@@ -614,12 +630,12 @@ long wxExecute(wxChar **argv,
         }
 #endif // !__VMS
 
         }
 #endif // !__VMS
 

-#if wxUSE_GUI
+#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();
         // reading side can be safely closed but we should keep the write one
         // opened
         pipeEndProcDetect.Detach(wxPipe::Write);
         pipeEndProcDetect.Close();

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

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


@@ -638,6 +654,11 @@ long wxExecute(wxChar **argv,
 
         execvp (*mb_argv, mb_argv);
 
 
         execvp (*mb_argv, mb_argv);
 

+        fprintf(stderr, "execvp(");
+        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);
 


@@ -693,6 +714,31 @@ long wxExecute(wxChar **argv,
 #if wxUSE_GUI && !defined(__WXMICROWIN__)
         wxEndProcessData *data = new wxEndProcessData;
 
 #if wxUSE_GUI && !defined(__WXMICROWIN__)
         wxEndProcessData *data = new wxEndProcessData;
 

+        // wxAddProcessCallback is now (with DARWIN) allowed to call the
+        // callback function directly if the process terminates before
+        // the callback can be added to the run loop. Set up the 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
+            data->process = NULL;
+
+            // sync execution: indicate it by negating the pid
+            data->pid = -pid;
+        }
+        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;
+        }
+
+
+#if defined(__DARWIN__) && defined(__WXMAC__)
+        data->tag = wxAddProcessCallbackForPid(data,pid);
+#else

         data->tag = wxAddProcessCallback
                     (
                         data,
         data->tag = wxAddProcessCallback
                     (
                         data,


@@ -700,16 +746,10 @@ long wxExecute(wxChar **argv,
                     );
 
         pipeEndProcDetect.Close();
                     );
 
         pipeEndProcDetect.Close();

+#endif // defined(__DARWIN__) && defined(__WXMAC__)

 
         if ( flags & wxEXEC_SYNC )
         {
 
         if ( flags & wxEXEC_SYNC )
         {

-            // we may have process for capturing the program output, but it's
-            // not used in wxEndProcessData in the case of sync execution
-            data->process = NULL;
-
-            // sync execution: indicate it by negating the pid
-            data->pid = -pid;
-

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


@@ -735,12 +775,6 @@ 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;
-

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


@@ -800,7 +834,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)
         {


@@ -947,7 +986,7 @@ wxString wxGetOsDescription()
 #ifndef WXWIN_OS_DESCRIPTION
     #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
 #else
 #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
 }
 #endif


@@ -1015,8 +1054,8 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *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

-    wxStatFs fs;
-    if ( statfs((char *)(const char*)path.fn_str(), &fs) != 0 )
+    wxStatfs_t fs;
+    if ( wxStatfs((char *)(const char*)path.fn_str(), &fs) != 0 )

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