submenu preparation in two methods encapsulated

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 445f88b9faf3ecb6046cd6eeec90bcb51c061056..fd816cb92010d867587cd19032d66c9dd353c1c3 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -28,26 +28,32 @@
 
 #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 __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
 
-// 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>
 
-    #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"
@@ -197,6 +203,16 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
 {
     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;
@@ -362,10 +378,10 @@ public:
     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;
@@ -638,6 +654,11 @@ long wxExecute(wxChar **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);
 
@@ -800,7 +821,12 @@ char *wxGetUserHome( const wxString &user )
 
         if ((ptr = wxGetenv(wxT("HOME"))) != NULL)
         {
+#if wxUSE_UNICODE
+            wxWCharBuffer buffer( ptr );
+            return buffer;
+#else
             return ptr;
+#endif
         }
         if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL)
         {
@@ -947,7 +973,7 @@ 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
@@ -1015,8 +1041,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
-    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") );