Changeset 4475 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Sep 1, 2007 1:21:19 AM (17 years ago)

Author:

vboxsync

Message:

Some adjustments to RTEnv and RTProcCreate. Should work on darwin now.

Location:

trunk/src/VBox/Runtime/r3

Files:

• posix/env-posix.cpp (modified) (2 diffs)
• posix/process-posix.cpp (modified) (3 diffs)
• win32/process-win32.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/posix/env-posix.cpp

@@ -23 +23 @@
 #include <iprt/string.h>
 #include <iprt/alloca.h>
+#include <iprt/assert.h>
 
 #include <stdlib.h>
@@ -76 +77 @@
 }
 
+
+RTDECL(int) RTEnvUnset(const char *pszVar)
+{
+    AssertReturn(!strchr(pszVar, '='), VERR_INVALID_PARAMETER);
+
+    /* Check that it exists first.  */
+    if (!RTEnvExist(pszVar))
+        return VINF_ENV_VAR_NOT_FOUND;
+
+    /* Ok, try remove it. */
+    if (!putenv((char *)pszVar))
+        return VINF_SUCCESS;
+    return RTErrConvertFromErrno(errno);
+}
+

trunk/src/VBox/Runtime/r3/posix/process-posix.cpp

@@ -42 +42 @@
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/env.h>
 #include "internal/process.h"
 
 
 
-RTR3DECL(int)   RTProcCreate(const char *pszExec, const char * const *papszArgs, const char * const *papszEnv, unsigned fFlags, PRTPROCESS pProcess)
+RTR3DECL(int)   RTProcCreate(const char *pszExec, const char * const *papszArgs, RTENV Env, unsigned fFlags, PRTPROCESS pProcess)
 {
     /*
      * Validate input.
      */
-    if (!pszExec || !*pszExec)
-    {
-        AssertMsgFailed(("no exec\n"));
-        return VERR_INVALID_PARAMETER;
-    }
-    if (fFlags)
-    {
-        AssertMsgFailed(("invalid flags!\n"));
-        return VERR_INVALID_PARAMETER;
-    }
+    AssertPtrReturn(pszExec, VERR_INVALID_POINTER);
+    AssertReturn(*pszExec, VERR_INVALID_PARAMETER);
+    AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
+    AssertReturn(Env != NIL_RTENV, VERR_INVALID_PARAMETER);
+    const char * const *papszEnv = RTEnvGetExecEnvP(Env);
+    AssertPtrReturn(papszEnv, VERR_INVALID_HANDLE);
     /* later: path searching. */
 
@@ -100 +97 @@
     /** @todo check if it requires any of those two attributes, don't remember atm. */
     int rc = posix_spawn(&pid, pszExec, NULL, NULL, (char * const *)papszArgs,
-                         papszEnv ? (char * const *)papszEnv : environ);
+                         (char * const *)papszEnv);
     if (!rc)
     {
@@ -114 +111 @@
     {
         int rc;
-        if (papszEnv)
-            rc = execve(pszExec, (char * const *)papszArgs, (char * const *)papszEnv);
-        else
-            rc = execv(pszExec, (char * const *)papszArgs);
+        rc = execve(pszExec, (char * const *)papszArgs, (char * const *)papszEnv);
         AssertReleaseMsgFailed(("execve returns %d errno=%d\n", rc, errno));
         exit(127);

trunk/src/VBox/Runtime/r3/win32/process-win32.cpp

@@ -29 +29 @@
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/env.h>
 
 
@@ -69 +70 @@
 /** @todo r=michael This function currently does not work correctly if the arguments
                     contain spaces. */
-RTR3DECL(int)   RTProcCreate(const char *pszExec, const char * const *papszArgs, const char * const *papszEnv, unsigned fFlags, PRTPROCESS pProcess)
+RTR3DECL(int)   RTProcCreate(const char *pszExec, const char * const *papszArgs, RTENV Env, unsigned fFlags, PRTPROCESS pProcess)
 {
     /*
      * Validate input.
      */
-    if (!pszExec || !*pszExec)
-    {
-        AssertMsgFailed(("no exec\n"));
-        return VERR_INVALID_PARAMETER;
-    }
-    if (fFlags)
-    {
-        AssertMsgFailed(("invalid flags!\n"));
-        return VERR_INVALID_PARAMETER;
-    }
+    AssertPtrReturn(pszExec, VERR_INVALID_POINTER);
+    AssertReturn(*pszExec, VERR_INVALID_PARAMETER);
+    AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
+    AssertReturn(Env != NIL_RTENV, VERR_INVALID_PARAMETER);
+    const char * const *papszEnv = RTEnvGetExecEnvP(Env);
+    AssertPtrReturn(papszEnv, VERR_INVALID_HANDLE);
     /* later: path searching. */
-
+    
     /*
      * Spawn the child.