Changeset 68562 in vbox

Timestamp:

Aug 31, 2017 12:10:16 PM (8 years ago)

Author:

vboxsync

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

117779

Message:

merging vbglioc r117719: VBoxClient: avoid use RTEXITCODE where possible, use RTMsg* where possible, added options for forground execution (like VBoxService -f), added comprehensible error on syntax errors (wasting my time), wasted time figuring out that the logging to stdout fun done in the -d case is useless now (probably due to moving VbglR3InitUser from top of main() to service code).

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• VBoxClient.h (modified) (1 diff)
• main.cpp (modified) (17 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/VBoxClient.h

@@ -36 +36 @@
 
 /** Call clean-up for the current service and exit. */
-extern void VBClCleanUp();
+extern void VBClCleanUp(bool fExit = true);
 
 /** A simple interface describing a service.  VBoxClient will run exactly one

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
- * VirtualBox Guest Service:
- * Linux guest.
+ * VirtualBox Guest Additions - X11 Client.
  */
 
@@ -66 +64 @@
 unsigned cRespawn = 0;
 
-/** Exit with a fatal error. */
+/**
+ * Exit with a fatal error.
+ *
+ * This is used by the VBClFatalError macro and thus needs to be external.
+ */
 void vbclFatalError(char *pszMessage)
 {
@@ -92 +94 @@
         }
     }
-    _exit(1);
-}
-
-/** Clean up if we get a signal or something.  This is extern so that we
- * can call it from other compilation units. */
-void VBClCleanUp()
+    _exit(RTEXITCODE_FAILURE);
+}
+
+/**
+ * Clean up if we get a signal or something.
+ *
+ * This is extern so that we can call it from other compilation units.
+ */
+void VBClCleanUp(bool fExit /*=true*/)
 {
     /* We never release this, as we end up with a call to exit(3) which is not
@@ -109 +114 @@
     if (g_szPidFile[0] && g_hPidFile)
         VbglR3ClosePidFile(g_szPidFile, g_hPidFile);
-    exit(0);
+    if (fExit)
+        exit(RTEXITCODE_SUCCESS);
 }
 
@@ -173 +179 @@
  * Print out a usage message and exit with success.
  */
-void vboxClientUsage(const char *pcszFileName)
+static void vboxClientUsage(const char *pcszFileName)
 {
     RTPrintf("Usage: %s --clipboard|"
@@ -198 +204 @@
     RTPrintf("  --seamless         starts the seamless windows service\n");
     RTPrintf("  --vmsvga           starts VMSVGA dynamic resizing for DRM or for X11\n");
+    RTPrintf("  -f, --foreground   run in the foreground (no daemonizing)\n");
     RTPrintf("  -d, --nodaemon     continues running as a system service\n");
     RTPrintf("  -h, --help         shows this help text\n");
     RTPrintf("  -V, --version      shows version information\n");
     RTPrintf("\n");
-    exit(0);
+}
+
+/**
+ * Complains about seeing more than one service specification.
+ *
+ * @returns RTEXITCODE_SYNTAX.
+ */
+static int vbclSyntaxOnlyOneService(void)
+{
+    RTMsgError("More than one service specified! Only one, please.");
+    return RTEXITCODE_SYNTAX;
 }
 
@@ -211 +228 @@
 int main(int argc, char *argv[])
 {
-    bool fDaemonise = true, fRespawn = true;
-    int rc;
-    const char *pcszFileName;
-
     /* Initialise our runtime before all else. */
-    rc = RTR3InitExe(argc, &argv, 0);
+    int rc = RTR3InitExe(argc, &argv, 0);
     if (RT_FAILURE(rc))
         return RTMsgInitFailure(rc);
+
     /* This should never be called twice in one process - in fact one Display
      * object should probably never be used from multiple threads anyway. */
     if (!XInitThreads())
         VBClFatalError(("Failed to initialize X11 threads\n"));
-    /* Get our file name for error output. */
-    pcszFileName = RTPathFilename(argv[0]);
+
+    /* Get our file name for usage info and hints. */
+    const char *pcszFileName = RTPathFilename(argv[0]);
     if (!pcszFileName)
         pcszFileName = "VBoxClient";
@@ -230 +245 @@
     /* Parse our option(s) */
     /** @todo Use RTGetOpt() if the arguments become more complex. */
+    bool fDaemonise = true;
+    bool fRespawn = true;
     for (int i = 1; i < argc; ++i)
     {
-        rc = VERR_INVALID_PARAMETER;
-        if (!strcmp(argv[i], "-d") || !strcmp(argv[i], "--nodaemon"))
+        if (   !strcmp(argv[i], "-f")
+            || !strcmp(argv[i], "--foreground")
+            || !strcmp(argv[i], "-d")
+            || !strcmp(argv[i], "--nodaemon"))
         {
             /* If the user is running in "no daemon" mode anyway, send critical
              * logging to stdout as well. */
+            /** @todo r=bird: Since the release logger isn't created until the service
+             *        calls VbglR3InitUser or VbglR3Init or RTLogCreate, this whole
+             *        exercise is pointless.  Added --init-vbgl-user and --init-vbgl-full
+             *        for getting some work done. */
             PRTLOGGER pReleaseLog = RTLogRelGetDefaultInstance();
             if (pReleaseLog)
                 rc = RTLogDestinations(pReleaseLog, "stdout");
             if (pReleaseLog && RT_FAILURE(rc))
-                RTPrintf("%s: failed to redivert error output, rc=%Rrc\n",
-                         pcszFileName, rc);
+                return RTMsgErrorExitFailure("failed to redivert error output, rc=%Rrc", rc);
+
             fDaemonise = false;
+            if (   !strcmp(argv[i], "-f")
+                || !strcmp(argv[i], "--foreground"))
+                fRespawn = false;
         }
         else if (!strcmp(argv[i], "--no-respawn"))
@@ -252 +278 @@
         {
             if (g_pService)
-                break;
+                return vbclSyntaxOnlyOneService();
             g_pService = VBClGetClipboardService();
         }
@@ -258 +284 @@
         {
             if (g_pService)
-                break;
+                return vbclSyntaxOnlyOneService();
             g_pService = VBClGetDisplayService();
         }
@@ -264 +290 @@
         {
             if (g_pService)
-                break;
+                return vbclSyntaxOnlyOneService();
             g_pService = VBClGetSeamlessService();
         }
@@ -270 +296 @@
         {
             if (g_pService)
-                break;
+                return vbclSyntaxOnlyOneService();
             g_pService = VBClGetHostVersionService();
         }
@@ -277 +303 @@
         {
             if (g_pService)
-                break;
+                return vbclSyntaxOnlyOneService();
             g_pService = VBClGetDragAndDropService();
         }
@@ -284 +310 @@
         {
             if (g_pService)
-                break;
+                return vbclSyntaxOnlyOneService();
             g_pService = VBClCheck3DService();
         }
@@ -290 +316 @@
         {
             if (g_pService)
-                break;
+                return vbclSyntaxOnlyOneService();
             g_pService = VBClDisplaySVGAService();
+        }
+        /* bird: this is just a quick hack to get something out of the LogRel statements in the code. */
+        else if (!strcmp(argv[i], "--init-vbgl-user"))
+        {
+            rc = VbglR3InitUser();
+            if (RT_FAILURE(rc))
+                return RTMsgErrorExitFailure("VbglR3InitUser failed: %Rrc", rc);
+        }
+        else if (!strcmp(argv[i], "--init-vbgl-full"))
+        {
+            rc = VbglR3Init();
+            if (RT_FAILURE(rc))
+                return RTMsgErrorExitFailure("VbglR3Init failed: %Rrc", rc);
         }
         else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))
@@ -305 +344 @@
         else
         {
-            RTPrintf("%s: unrecognized option `%s'\n", pcszFileName, argv[i]);
-            RTPrintf("Try `%s --help' for more information\n", pcszFileName);
+            RTMsgError("unrecognized option `%s'", argv[i]);
+            RTMsgInfo("Try `%s --help' for more information", pcszFileName);
             return RTEXITCODE_SYNTAX;
         }
-        rc = VINF_SUCCESS;
-    }
-    if (RT_FAILURE(rc) || !g_pService)
-    {
-        vboxClientUsage(pcszFileName);
+    }
+    if (!g_pService)
+    {
+        RTMsgError("No service specified. Quitting because nothing to do!");
         return RTEXITCODE_SYNTAX;
     }
@@ -363 +401 @@
         LogRel2(("Initializing service failed: %Rrc\n", rc));
     }
-    VBClCleanUp();
+    VBClCleanUp(false /*fExit*/);
     return RTEXITCODE_SUCCESS;
 }