Changeset 33272 in vbox

Timestamp:

Oct 20, 2010 5:33:26 PM (14 years ago)

Author:

vboxsync

Message:

VBoxService/Toolbox: Added special execution command ("VBoxService" or argv[0]) for independent VBoxService location / toolbox usage.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (2 diffs)
• VBoxServiceControlExec.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -527 +527 @@
 #endif
 
+    g_pszProgName = RTPathFilename(argv[0]);
+
 #ifdef VBOXSERVICE_TOOLBOX
     /*
@@ -540 +542 @@
      * Do pre-init of services.
      */
-    g_pszProgName = RTPathFilename(argv[0]);
     for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
     {

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

@@ -1073 +1073 @@
     }
     else
+#endif /* RT_OS_WINDOWS */
+#ifdef VBOXSERVICE_TOOLBOX
+    /*
+     * Use the built-in toolbox of VBoxService?
+     */
+    if (   (g_pszProgName && stricmp(pszExec, g_pszProgName) == 0)
+        || stricmp(pszExec, "VBoxService"))
+    {
+        /* Search the path of our executable. */
+        char szVBoxService[RTPATH_MAX];
+        if (RTProcGetExecutableName(szVBoxService, sizeof(szVBoxService)))
+        {
+            rc = RTProcCreateEx(szVBoxService, papszArgs, hEnv, fFlags,
+                                phStdIn, phStdOut, phStdErr, pszAsUser,
+                                pszPassword, phProcess);
+        }
+        else
+            rc = VERR_NOT_FOUND;
+    }
+    else
     {
 #endif
@@ -1079 +1099 @@
                             phStdIn, phStdOut, phStdErr, pszAsUser,
                             pszPassword, phProcess);
-#ifdef RT_OS_WINDOWS
-    }
-#endif
+#ifdef VBOXSERVICE_TOOLBOX
+    }
+#endif /* VBOXSERVICE_TOOLBOX */
     return rc;
 }