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

Timestamp:

Mar 26, 2010 2:50:55 PM (15 years ago)

Author:

vboxsync

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

59375

Message:

IPRT,*: Renamed RTProcDaemonize to RTProcDaemonizeUsingFork. Added a new RTPRocDaemonize that is portable. RTProcCreate* got a new flag RTPROC_FLAGS_DETACHED, while RTPROC_FLAGS_DAEMONIZE got renamed to RTPROC_FLAGS_DAEMONIZE_DEPRECATED.

File:

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

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

@@ -87 +87 @@
     AssertPtrReturn(pszExec, VERR_INVALID_POINTER);
     AssertReturn(*pszExec, VERR_INVALID_PARAMETER);
-    AssertReturn(!(fFlags & ~RTPROC_FLAGS_DAEMONIZE), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~(RTPROC_FLAGS_DAEMONIZE_DEPRECATED | RTPROC_FLAGS_DETACHED)), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & RTPROC_FLAGS_DETACHED) || !phProcess, VERR_INVALID_PARAMETER);
     AssertReturn(hEnv != NIL_RTENV, VERR_INVALID_PARAMETER);
     const char * const *papszEnv = RTEnvGetExecEnvP(hEnv);
@@ -175 +176 @@
     pid_t pid = -1;
 #ifdef HAVE_POSIX_SPAWN
-    if (   !(fFlags & RTPROC_FLAGS_DAEMONIZE)
+    if (   !(fFlags & (RTPROC_FLAGS_DAEMONIZE_DEPRECATED | RTPROC_FLAGS_DETACHED))
         && uid == ~(uid_t)0
         && gid == ~(gid_t)0
@@ -303 +304 @@
              * Daemonize the process if requested.
              */
-            if (fFlags & RTPROC_FLAGS_DAEMONIZE)
-            {
-                rc = RTProcDaemonize(true /* fNoChDir */, false /* fNoClose */, NULL /* pszPidFile */);
+            if (fFlags & (RTPROC_FLAGS_DAEMONIZE_DEPRECATED | RTPROC_FLAGS_DETACHED))
+            {
+                rc = RTProcDaemonizeUsingFork(true /*fNoChDir*/,
+                                              !(fFlags & RTPROC_FLAGS_DAEMONIZE_DEPRECATED) /*fNoClose*/,
+                                              NULL /* pszPidFile */);
                 if (RT_FAILURE(rc))
                 {
+                    /* parent */
                     AssertReleaseMsgFailed(("RTProcDaemonize returns %Rrc errno=%d\n", rc, errno));
                     exit(127);
                 }
+                /* daemonized child */
             }
 
@@ -424 +429 @@
 
 
-/**
- * Daemonize the current process, making it a background process. The current
- * process will exit if daemonizing is successful.
- *
- * @returns iprt status code.
- * @param   fNoChDir    Pass false to change working directory to "/".
- * @param   fNoClose    Pass false to redirect standard file streams to the null device.
- * @param   pszPidfile  Path to a file to write the process id of the daemon
- *                      process to. Daemonizing will fail if this file already
- *                      exists or cannot be written. May be NULL.
- */
-RTR3DECL(int)   RTProcDaemonize(bool fNoChDir, bool fNoClose, const char *pszPidfile)
+RTR3DECL(int)   RTProcDaemonizeUsingFork(bool fNoChDir, bool fNoClose, const char *pszPidfile)
 {
     /*