blind fix for wxGIFDecoder::ReadGIF

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index b246d08f7ae257eedbf53ad3c1ec9b535623812a..ffbde3589f2f1224a7cbf9b62d25ed26e7ea1479 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -29,9 +29,20 @@
 #include "wx/stream.h"
 
 #ifdef HAVE_STATFS
 #include "wx/stream.h"
 
 #ifdef HAVE_STATFS

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

 #endif // HAVE_STATFS
 
 #endif // HAVE_STATFS
 

+#ifdef HAVE_STATVFS
+    #include <sys/statvfs.h>
+
+    #define statfs statvfs
+#endif // HAVE_STATVFS
+

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


@@ -283,67 +294,21 @@ bool wxShell(const wxString& command, wxArrayString& output)
 
 void wxHandleProcessTermination(wxEndProcessData *proc_data)
 {
 
 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)
-    {
-        // JACS: this could happen if the process was terminated and waitpid called,
-        // so commenting out for now.
-        //wxLogSysError(_("Waiting for subprocess termination failed (return code = -1)"));
-    }
-    else if (! (WIFEXITED(status)))
+    // clean up
+    if ( proc_data->pid > 0 )

     {
     {

-        wxLogSysError(_("Waiting for subprocess termination failed (WIFEXITED returned zero)"));
-       
-       /* 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)
-       */
+       delete proc_data;

     }
     }

-    else if (WIFSIGNALED(status))
+    else

     {
     {

-        wxLogSysError(_("Waiting for subprocess termination failed (signal not caught)"));
-       
-       /* 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)
-       */
-    }
-    // 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;

     }
 }
 
     }
 }
 


@@ -1048,8 +1013,7 @@ long wxGetFreeMemory()
 
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
 
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {

-#ifdef HAVE_STATFS
-
+#if defined(HAVE_STATFS) || defined(HAVE_STATVFS)

     struct statfs fs;
     if ( statfs(path, &fs) != 0 )
     {
     struct statfs fs;
     if ( statfs(path, &fs) != 0 )
     {


@@ -1058,6 +1022,9 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
         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)
+

     if ( pTotal )
     {
         *pTotal = wxLongLong(fs.f_blocks) * fs.f_bsize;
     if ( pTotal )
     {
         *pTotal = wxLongLong(fs.f_blocks) * fs.f_bsize;