added missing check for wxUSE_JOYSTICK

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index b2fa90d046c031682dcb3818469cb7ced27dfad0..deeaa836bab486d1308dd1ef5077855bae05969f 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -404,10 +404,13 @@ long wxExecute(wxChar **argv,
                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

-    // 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 +445,7 @@ long wxExecute(wxChar **argv,
 
         ARGS_CLEANUP;
 
 
         ARGS_CLEANUP;
 

-        return errorRetCode;
+        return ERROR_RETURN_CODE;

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


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

-            return errorRetCode;
+            return ERROR_RETURN_CODE;

         }
     }
 
         }
     }
 


@@ -498,7 +501,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
     {


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

+#undef ERROR_RETURN_CODE

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


@@ -640,9 +644,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 +873,48 @@ long wxGetFreeMemory()
     return -1;
 }
 
     return -1;
 }
 

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