Changeset 38636 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Sep 5, 2011 1:49:45 PM (14 years ago)

Author:

vboxsync

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

73843

Message:

*,IPRT: Redid the ring-3 init to always convert the arguments to UTF-8.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• main.cpp (modified) (7 diffs)
• testcase/tstSeamlessX11-auto.cpp (modified) (1 diff)
• testcase/tstSeamlessX11.cpp (modified) (1 diff)

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

@@ -30 +30 @@
 #include <iprt/env.h>
 #include <iprt/initterm.h>
+#include <iprt/message.h>
 #include <iprt/path.h>
 #include <iprt/param.h>
@@ -159 +160 @@
 int main(int argc, char *argv[])
 {
-    int rcClipboard, rc;
+    /* Initialise our runtime before all else. */
+    int rc = RTR3InitExe(argc, &argv, 0);
+    if (RT_FAILURE(rc))
+        return RTMsgInitFailure(rc);
+
+    int rcClipboard;
     const char *pszFileName = RTPathFilename(argv[0]);
     bool fDaemonise = true;
@@ -170 +176 @@
         pszFileName = "VBoxClient";
 
-    /* Initialise our runtime before all else. */
-    rc = RTR3Init();
-    if (RT_FAILURE(rc))
-    {
-        /* Of course, this should never happen. */
-        RTPrintf("%s: Failed to initialise the run-time library, rc=%Rrc\n", pszFileName, rc);
-        exit(1);
-    }
-
     /* Initialise our global clean-up critical section */
     rc = RTCritSectInit(&g_critSect);
@@ -185 +182 @@
         /* Of course, this should never happen. */
         RTPrintf("%s: Failed to initialise the global critical section, rc=%Rrc\n", pszFileName, rc);
-        exit(1);
+        return 1;
     }
 
@@ -225 +222 @@
         {
             vboxClientUsage(pszFileName);
-            exit(0);
+            return 0;
         }
         else
@@ -231 +228 @@
             RTPrintf("%s: unrecognized option `%s'\n", pszFileName, argv[i]);
             RTPrintf("Try `%s --help' for more information\n", pszFileName);
-            exit(1);
+            return 1;
         }
     }
@@ -237 +234 @@
     {
         vboxClientUsage(pszFileName);
-        exit(1);
+        return 1;
     }
     /* Get the path for the pidfiles */

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp

@@ -685 +685 @@
 int main( int argc, char **argv)
 {
-    RTR3Init();
+    RTR3InitExe(argc, &argv, 0);
     unsigned cErrs = 0;
     g_pszTestName = RTPathFilename(argv[0]);

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp

@@ -107 +107 @@
     char ach[2];
 
-    RTR3Init();
+    RTR3InitExe(argc, &argv, 0);
     RTPrintf("VirtualBox guest additions X11 seamless mode testcase\n");
     if (0 == XInitThreads())