vbox的更動 14999 路徑 trunk/src/VBox/Runtime/r3

時間撮記:

2008-12-4 下午05:12:09 (16 年 以前)

作者:

vboxsync

訊息:

IPRT: Extended RTProcCreate with a daemonize flag.

檔案:

• trunk/src/VBox/Runtime/r3/posix/process-posix.cpp (修改) (3 筆差異)

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

@@ -64 +64 @@
 RTR3DECL(int)   RTProcCreate(const char *pszExec, const char * const *papszArgs, RTENV Env, unsigned fFlags, PRTPROCESS pProcess)
 {
+    int rc;
+
     /*
      * Validate input.
@@ -69 +71 @@
     AssertPtrReturn(pszExec, VERR_INVALID_POINTER);
     AssertReturn(*pszExec, VERR_INVALID_PARAMETER);
-    AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
+    AssertReturn(fFlags & ~RTPROC_FLAGS_DAEMONIZE, VERR_INVALID_PARAMETER);
     AssertReturn(Env != NIL_RTENV, VERR_INVALID_PARAMETER);
     const char * const *papszEnv = RTEnvGetExecEnvP(Env);
@@ -110 +112 @@
     pid_t pid;
 #ifdef HAVE_POSIX_SPAWN
-    /** @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,
+    if (!(fFlags & RTPROC_FLAGS_DAEMONIZE))
+    {
+        /** @todo check if it requires any of those two attributes, don't remember atm. */
+        rc = posix_spawn(&pid, pszExec, NULL, NULL, (char * const *)papszArgs,
                          (char * const *)papszEnv);
-    if (!rc)
-    {
-        if (pProcess)
-            *pProcess = pid;
-        return VINF_SUCCESS;
-    }
-
-#else
-
-    pid = fork();
-    if (!pid)
-    {
-        int rc;
-        rc = execve(pszExec, (char * const *)papszArgs, (char * const *)papszEnv);
-        AssertReleaseMsgFailed(("execve returns %d errno=%d\n", rc, errno));
-        exit(127);
-    }
-    if (pid > 0)
-    {
-        if (pProcess)
-            *pProcess = pid;
-        return VINF_SUCCESS;
-    }
-    int rc = errno;
-#endif
+        if (!rc)
+        {
+            if (pProcess)
+                *pProcess = pid;
+            return VINF_SUCCESS;
+        }
+    }
+    else
+#endif
+    {
+        pid = fork();
+        if (!pid)
+        {
+            if (fFlags & RTPROC_FLAGS_DAEMONIZE)
+            {
+                rc = RTProcDaemonize(true /* fNoChDir */, false /* fNoClose */, NULL /* pszPidFile */);
+                AssertReleaseMsgFailed(("RTProcDaemonize returns %Rrc errno=%d\n", rc, errno));
+                exit(127);
+            }
+            rc = execve(pszExec, (char * const *)papszArgs, (char * const *)papszEnv);
+            AssertReleaseMsgFailed(("execve returns %d errno=%d\n", rc, errno));
+            exit(127);
+        }
+        if (pid > 0)
+        {
+            if (pProcess)
+                *pProcess = pid;
+            return VINF_SUCCESS;
+        }
+        int rc = errno;
+    }
 
     /* failure, errno value in rc. */