Changeset 37356 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 7, 2011 5:04:39 PM (14 years ago)

Author:

vboxsync

Message:

Main/src-server/xpcom/server.cpp: fix handling of parameter passing when daemonizing VBoxSVC, only relevant when starting VBoxSVC explicitly and relying on PID files etc etc

File:

• trunk/src/VBox/Main/src-server/xpcom/server.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/xpcom/server.cpp

@@ -713 +713 @@
 }
 
-static nsresult vboxsvcSpawnDaemonByReExec(const char *pszPath)
+static nsresult vboxsvcSpawnDaemonByReExec(const char *pszPath, bool fAutoShutdown, const char *pszPidFile)
 {
     PRFileDesc *readable = nsnull, *writable = nsnull;
@@ -719 +719 @@
     nsresult rv = NS_ERROR_FAILURE;
     PRFileDesc *devNull;
+    unsigned args_index = 0;
     // The ugly casts are necessary because the PR_CreateProcessDetached has
     // a const array of writable strings as a parameter. It won't write. */
-    char * const args[] = { (char *)pszPath, (char *)"--auto-shutdown", 0 };
+    char * args[1 + 1 + 2 + 1];
+    args[args_index++] = (char *)pszPath;
+    if (fAutoShutdown)
+        args[args_index++] = (char *)"--auto-shutdown";
+    if (pszPidFile)
+    {
+        args[args_index++] = (char *)"--pidfile";
+        args[args_index++] = (char *)pszPidFile;
+    }
+    args[args_index++] = 0;
 
     // Use a pipe to determine when the daemon process is in the position
@@ -744 +754 @@
     PR_ProcessAttrSetStdioRedirect(attr, PR_StandardError, devNull);
 
-    if (PR_CreateProcessDetached(pszPath, args, nsnull, attr) != PR_SUCCESS)
+    if (PR_CreateProcessDetached(pszPath, (char * const *)args, nsnull, attr) != PR_SUCCESS)
         goto end;
 
@@ -848 +858 @@
     if (fDaemonize)
     {
-        vboxsvcSpawnDaemonByReExec(argv[0]);
+        vboxsvcSpawnDaemonByReExec(argv[0], gAutoShutdown, g_pszPidFile);
         exit(126);
     }