Changeset 92664 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Dec 1, 2021 3:04:59 AM (3 years ago)

Author:

vboxsync

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

148560

Message:

VBoxService: Must claim all argv[0] strings starting with 'vbox_' just like vgsvcGstCtrlProcessResolveExecutable does.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp (modified) (3 diffs)

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

@@ -1714 +1714 @@
         if (argc < 2 || strcmp(argv[1], "--use-toolbox"))
         {
-            /** @todo must check for 'vbox_' and fail with a complaint that the tool does
-             *        not exist, because vgsvcGstCtrlProcessResolveExecutable will send
-             *        us anything with 'vbox_' as a prefix and no absolute path.  So,
-             *        handing non-existing vbox_xxx tools to the regular VBoxService main
-             *        routine is inconsistent and bound to cause trouble. */
-            return false;
+            /* We must match vgsvcGstCtrlProcessResolveExecutable here and claim
+               everything starting with "vbox_". */
+            if (!RTStrStartsWith(pszTool, "vbox_"))
+                return false;
+            RTMsgError("Unknown tool: %s\n", pszTool);
+            *prcExit = RTEXITCODE_SYNTAX;
+            return true;
         }
 
@@ -1725 +1726 @@
         if (argc < 3)
         {
-            vgsvcToolboxShowUsage();
+            RTMsgError("No tool following --use-toolbox\n");
             *prcExit = RTEXITCODE_SYNTAX;
             return true;
@@ -1736 +1737 @@
         if (!pTool)
         {
-           *prcExit = RTEXITCODE_SUCCESS;
-           if (!strcmp(pszTool, "-V"))
-           {
-               vgsvcToolboxShowVersion();
-               return true;
-           }
-           if (   strcmp(pszTool, "help")
-               && strcmp(pszTool, "--help")
-               && strcmp(pszTool, "-h"))
-               *prcExit = RTEXITCODE_SYNTAX;
-           vgsvcToolboxShowUsage();
-           return true;
+            *prcExit = RTEXITCODE_SUCCESS;
+            if (   !strcmp(pszTool, "-V")
+                || !strcmp(pszTool, "version"))
+                vgsvcToolboxShowVersion();
+            else if (   !strcmp(pszTool, "help")
+                     || !strcmp(pszTool, "--help")
+                     || !strcmp(pszTool, "-h"))
+                vgsvcToolboxShowUsage();
+            else
+            {
+                RTMsgError("Unknown tool: %s\n", pszTool);
+                *prcExit = RTEXITCODE_SYNTAX;
+            }
+            return true;
         }
     }