added error message in case older apple header files are used

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index b2fa90d046c031682dcb3818469cb7ced27dfad0..3bd19ffbf6a38d18bd3c3ed5c44abebd7794f852 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -28,6 +28,10 @@
 
 #include "wx/stream.h"
 
 
 #include "wx/stream.h"
 

+#ifdef HAVE_STATFS
+    #include <sys/vfs.h>
+#endif // HAVE_STATFS
+

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


@@ -135,9 +139,39 @@ void wxUsleep(unsigned long milliseconds)
 // process management
 // ----------------------------------------------------------------------------
 
 // process management
 // ----------------------------------------------------------------------------
 

-int wxKill(long pid, wxSignal sig)
+int wxKill(long pid, wxSignal sig, wxKillError *rc)

 {
 {

-    return kill((pid_t)pid, (int)sig);
+    int err = kill((pid_t)pid, (int)sig);
+    if ( rc )
+    {
+        switch ( err )
+        {
+            case 0:
+                *rc = wxKILL_OK;
+                break;
+
+            case EINVAL:
+                *rc = wxKILL_BAD_SIGNAL;
+                break;
+
+            case EPERM:
+                *rc = wxKILL_ACCESS_DENIED;
+                break;
+
+            case ESRCH:
+                *rc = wxKILL_NO_PROCESS;
+                break;
+
+            default:
+                // this goes against Unix98 docs so log it
+                wxLogDebug(_T("unexpected kill(2) return value %d"), err);
+
+                // something else...
+                *rc = wxKILL_ERROR;
+        }
+    }
+
+    return err;

 }
 
 #define WXEXECUTE_NARGS   127
 }
 
 #define WXEXECUTE_NARGS   127


@@ -303,6 +337,8 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
 // wxStream classes to support IO redirection in wxExecute
 // ----------------------------------------------------------------------------
 
 // wxStream classes to support IO redirection in wxExecute
 // ----------------------------------------------------------------------------
 

+#if wxUSE_STREAMS
+

 class wxProcessFileInputStream : public wxInputStream
 {
 public:
 class wxProcessFileInputStream : public wxInputStream
 {
 public:


@@ -399,15 +435,20 @@ size_t wxProcessFileOutputStream::OnSysWrite(const void *buffer, size_t bufsize)
     return ret;
 }
 
     return ret;
 }
 

+#endif // wxUSE_STREAMS
+

 long wxExecute(wxChar **argv,
                bool sync,
                wxProcess *process)
 {
     // for the sync execution, we return -1 to indicate failure, but for async
 long wxExecute(wxChar **argv,
                bool sync,
                wxProcess *process)
 {
     // for the sync execution, we return -1 to indicate failure, but for async

-    // cse we return 0 which is never a valid PID
-    long errorRetCode = sync ? -1 : 0;
+    // case we return 0 which is never a valid PID
+    //
+    // 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)

 
 

-    wxCHECK_MSG( *argv, errorRetCode, 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;
 
 #if wxUSE_UNICODE
     int mb_argc = 0;


@@ -442,7 +483,7 @@ long wxExecute(wxChar **argv,
 
         ARGS_CLEANUP;
 
 
         ARGS_CLEANUP;
 

-        return errorRetCode;
+        return ERROR_RETURN_CODE;

     }
 #endif // wxUSE_GUI
 
     }
 #endif // wxUSE_GUI
 


@@ -470,7 +511,7 @@ long wxExecute(wxChar **argv,
 
             ARGS_CLEANUP;
 
 
             ARGS_CLEANUP;
 

-            return errorRetCode;
+            return ERROR_RETURN_CODE;

         }
     }
 
         }
     }
 


@@ -498,7 +539,7 @@ long wxExecute(wxChar **argv,
 
         ARGS_CLEANUP;
 
 
         ARGS_CLEANUP;
 

-        return errorRetCode;
+        return ERROR_RETURN_CODE;

     }
     else if ( pid == 0 )  // we're in child
     {
     }
     else if ( pid == 0 )  // we're in child
     {


@@ -557,19 +598,21 @@ long wxExecute(wxChar **argv,
         // pipe initialization: construction of the wxStreams
         if ( process && process->IsRedirected() )
         {
         // pipe initialization: construction of the wxStreams
         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]);
 
             // 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]);
 

+            process->SetPipeStreams(inStream, outStream, errStream);
+#endif // wxUSE_STREAMS
+

             close(pipeIn[0]); // close reading side
             close(pipeOut[1]); // close writing side
             close(pipeErr[1]); // close writing side
             close(pipeIn[0]); // close reading side
             close(pipeOut[1]); // close writing side
             close(pipeErr[1]); // close writing side

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

         }
 
         }
 

-#if wxUSE_GUI
+#if wxUSE_GUI && !defined(__WXMICROWIN__)

         wxEndProcessData *data = new wxEndProcessData;
 
         if ( sync )
         wxEndProcessData *data = new wxEndProcessData;
 
         if ( sync )


@@ -631,6 +674,7 @@ long wxExecute(wxChar **argv,
 #endif
 }
 
 #endif
 }
 

+#undef ERROR_RETURN_CODE

 #undef ARGS_CLEANUP
 
 // ----------------------------------------------------------------------------
 #undef ARGS_CLEANUP
 
 // ----------------------------------------------------------------------------


@@ -640,9 +684,14 @@ long wxExecute(wxChar **argv,
 const wxChar* wxGetHomeDir( wxString *home  )
 {
     *home = wxGetUserHome( wxString() );
 const wxChar* wxGetHomeDir( wxString *home  )
 {
     *home = wxGetUserHome( wxString() );

+   wxString tmp;

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

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

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


@@ -864,6 +913,76 @@ long wxGetFreeMemory()
     return -1;
 }
 
     return -1;
 }
 

+bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+{
+#ifdef HAVE_STATFS
+
+    struct statfs fs;
+    if ( statfs(path, &fs) != 0 )
+    {
+        wxLogSysError("Failed to get file system statistics");
+
+        return FALSE;
+    }
+
+    if ( pTotal )
+    {
+        *pTotal = wxLongLong(fs.f_blocks) * fs.f_bsize;
+    }
+
+    if ( pFree )
+    {
+        *pFree = wxLongLong(fs.f_bavail) * fs.f_bsize;
+    }
+
+    return TRUE;
+#endif // HAVE_STATFS
+
+    return FALSE;
+}
+
+// ----------------------------------------------------------------------------
+// env vars
+// ----------------------------------------------------------------------------
+
+bool wxGetEnv(const wxString& var, wxString *value)
+{
+    // wxGetenv is defined as getenv()
+    wxChar *p = wxGetenv(var);
+    if ( !p )
+        return FALSE;
+
+    if ( value )
+    {
+        *value = p;
+    }
+
+    return TRUE;
+}
+
+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;
+#elif defined(HAVE_PUTENV)
+    wxString s = variable;
+    if ( value )
+        s << _T('=') << value;
+
+    // transform to ANSI
+    const char *p = s.mb_str();
+
+    // the string will be free()d by libc
+    char *buf = (char *)malloc(strlen(p) + 1);
+    strcpy(buf, p);
+
+    return putenv(buf) == 0;
+#else // no way to set an env var
+    return FALSE;
+#endif
+}
+

 // ----------------------------------------------------------------------------
 // signal handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // signal handling
 // ----------------------------------------------------------------------------