Changeset 103858 in vbox for trunk/src/VBox/Frontends/VBoxAutostart

Timestamp:

Mar 14, 2024 5:01:42 PM (14 months ago)

Author:

vboxsync

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

162229

Message:

FE/VBoxAutostart: Made it easier to use on Windows by printing out the syntax help if an invalid (or no) command is being specified. Fixed missing newlines for error output.

Location:

trunk/src/VBox/Frontends/VBoxAutostart

Files:

• VBoxAutostart-win.cpp (modified) (8 diffs)
• VBoxAutostartUtils.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp

@@ -112 +112 @@
 *********************************************************************************************************************************/
 static SC_HANDLE autostartSvcWinOpenSCManager(const char *pszAction, DWORD dwAccess);
+static RTEXITCODE autostartSvcWinShowHelp(void);
+
 
 static int autostartGetProcessDomainUser(com::Utf8Str &aUser)
@@ -1100 +1102 @@
             }
             else
-                autostartSvcLogError("RTSemEventMultiCreate failed, rc=%Rrc", rc);
+                autostartSvcLogError("RTSemEventMultiCreate failed, rc=%Rrc\n", rc);
         }
         else
@@ -1220 +1222 @@
                 catch (...)
                 {
-                    autostartSvcLogError("runit failed, service name is not valid UTF-8 string or out of memory");
+                    autostartSvcLogError("runit failed, service name is not valid UTF-8 string or out of memory\n");
                     return RTEXITCODE_FAILURE;
                 }
@@ -1232 +1234 @@
     if (!pszServiceName)
     {
-        autostartSvcLogError("runit failed, service name is missing");
+        autostartSvcLogError("runit failed, service name is missing\n");
         return RTEXITCODE_SYNTAX;
     }
@@ -1372 +1374 @@
     if (RT_FAILURE(rc))
     {
-        autostartSvcLogError("RTR3InitExe failed with rc=%Rrc", rc);
+        autostartSvcLogError("RTR3InitExe failed with rc=%Rrc\n", rc);
         return RTEXITCODE_FAILURE;
     }
@@ -1381 +1383 @@
     enum
     {
-        kAutoSvcAction_RunIt,
+        kAutoSvcAction_RunIt, /* Default action, also called by SCM. */
 
         kAutoSvcAction_Create,
@@ -1460 +1462 @@
     {
         case kAutoSvcAction_RunIt:
-            return autostartSvcWinRunIt(argc - iArg, argv + iArg);
+        {
+            RTEXITCODE const rcExit = autostartSvcWinRunIt(argc - iArg, argv + iArg);
+            if (rcExit == RTEXITCODE_SYNTAX) /* When called by a user (e.g. w/o specifying any command, print our syntax help. */
+                autostartSvcWinShowHelp();
+            return rcExit;
+        }
 
         case kAutoSvcAction_Create:
@@ -1489 +1496 @@
         default:
             AssertMsgFailed(("enmAction=%d\n", enmAction));
-            return RTEXITCODE_FAILURE;
-    }
-}
+    }
+
+    return RTEXITCODE_FAILURE;
+}

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartUtils.cpp

@@ -234 +234 @@
 {
     RT_NOREF(pValue);
-    autostartSvcLogError("%s - RTGetOpt failure, %Rrc (%d): %s", pszAction, rc, rc, iArg < argc ? argv[iArg] : "<null>");
+    autostartSvcLogError("%s - RTGetOpt failure, %Rrc (%d): %s\n", pszAction, rc, rc, iArg < argc ? argv[iArg] : "<null>");
     return RTEXITCODE_SYNTAX;
 }
@@ -241 +241 @@
 {
     AssertReturn(iArg < argc, RTEXITCODE_FAILURE);
-    autostartSvcLogError("%s - Too many arguments: %s", pszAction, argv[iArg]);
+    autostartSvcLogError("%s - Too many arguments: %s\n", pszAction, argv[iArg]);
     for ( ; iArg < argc; iArg++)
         LogRel(("arg#%i: %s\n", iArg, argv[iArg]));
@@ -251 +251 @@
     RTStrmPrintf(g_pStdErr, "Error: ");
     RTStrmPrintfV(g_pStdErr, pszFormat, va);
-    Log(("autostartSvcDisplayErrorV: %s", pszFormat)); /** @todo format it! */
+    Log(("autostartSvcDisplayErrorV: %s\n", pszFormat)); /** @todo format it! */
     return RTEXITCODE_FAILURE;
 }
@@ -268 +268 @@
     char szMsg[4096];
     RTGetOptFormatError(szMsg, sizeof(szMsg), rc, pValue);
-    autostartSvcDisplayError("%s - %s", pszAction, szMsg);
+    autostartSvcDisplayError("%s - %s\n", pszAction, szMsg);
     return RTEXITCODE_SYNTAX;
 }