Changeset 99109 in vbox for trunk/src/VBox/Runtime/r3/posix/process-creation-posix.cpp

Timestamp:

Mar 22, 2023 10:13:00 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156474

Message:

IPRT/process: Added RTPROC_FLAGS_CWD to RTProcCreateEx(), to be able to set the current working directory for created processes. bugref:8053

File:

• trunk/src/VBox/Runtime/r3/posix/process-creation-posix.cpp (modified) (7 diffs)

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

@@ -216 +216 @@
 static int rtProcPosixCreateInner(const char *pszExec, const char * const *papszArgs, RTENV hEnv, RTENV hEnvToUse,
                                   uint32_t fFlags, const char *pszAsUser, uid_t uid, gid_t gid,
-                                  unsigned cRedirFds, int *paRedirFds, PRTPROCESS phProcess);
+                                  unsigned cRedirFds, int *paRedirFds, void *pvExtraData, PRTPROCESS phProcess);
 
 
@@ -1200 +1200 @@
                 RTPROCESS hProcess = NIL_RTPROCESS;
                 rc = rtProcPosixCreateInner(pszExec, apszArgs, hEnvToUse, hEnvToUse, 0 /*fFlags*/,
-                                            pszAsUser, uid, gid, RT_ELEMENTS(aRedirFds), aRedirFds, &hProcess);
+                                            pszAsUser, uid, gid, RT_ELEMENTS(aRedirFds), aRedirFds, NULL /*pvExtraData*/, &hProcess);
                 if (RT_SUCCESS(rc))
                 {
@@ -1713 +1713 @@
         return VERR_PROC_DETACH_NOT_SUPPORTED;
 #endif
-    AssertReturn(pvExtraData == NULL || (fFlags & RTPROC_FLAGS_DESIRED_SESSION_ID), VERR_INVALID_PARAMETER);
+    AssertReturn(pvExtraData == NULL || (fFlags & (RTPROC_FLAGS_DESIRED_SESSION_ID | RTPROC_FLAGS_CWD)),
+                 VERR_INVALID_PARAMETER);
+    AssertReturn((fFlags & (RTPROC_FLAGS_DESIRED_SESSION_ID | RTPROC_FLAGS_CWD)) != (RTPROC_FLAGS_DESIRED_SESSION_ID | RTPROC_FLAGS_CWD),
+                 VERR_INVALID_PARAMETER);
 
     /*
@@ -1895 +1898 @@
                  */
                 rc = rtProcPosixCreateInner(pszNativeExec, papszArgsConverted, hEnv, hEnvToUse, fFlags, pszAsUser, uid, gid,
-                                            RT_ELEMENTS(aStdFds), aStdFds, phProcess);
+                                            RT_ELEMENTS(aStdFds), aStdFds, pvExtraData, phProcess);
 
             }
@@ -1940 +1943 @@
 static int rtProcPosixCreateInner(const char *pszNativeExec, const char * const *papszArgs, RTENV hEnv, RTENV hEnvToUse,
                                   uint32_t fFlags, const char *pszAsUser, uid_t uid, gid_t gid,
-                                  unsigned cRedirFds, int *paRedirFds, PRTPROCESS phProcess)
+                                  unsigned cRedirFds, int *paRedirFds, void *pvExtraData, PRTPROCESS phProcess)
 {
     /*
@@ -2037 +2040 @@
     /** @todo OS/2: implement DETACHED (BACKGROUND stuff), see VbglR3Daemonize.  */
     if (   uid == ~(uid_t)0
-        && gid == ~(gid_t)0)
+        && gid == ~(gid_t)0
+        && !(fFlags & RTPROC_FLAGS_CWD))
     {
         /* Spawn attributes. */
@@ -2187 +2191 @@
             }
 #endif
+            if (fFlags & RTPROC_FLAGS_CWD)
+            {
+                const char *pszCwd = (const char *)pvExtraData;
+                if (pszCwd && *pszCwd)
+                {
+                    rc = RTPathSetCurrent(pszCwd);
+                    if (RT_FAILURE(rc))
+                    {
+                        /** @todo r=bela What is the right exit code here?? */
+                        if (fFlags & RTPROC_FLAGS_DETACHED)
+                            _Exit(126);
+                        else
+                            /*exit*/_Exit(126);
+                    }
+                }
+            }
 
             /*