Changeset 10651 in vbox

Timestamp:

Jul 15, 2008 12:31:56 PM (17 years ago)

Author:

vboxsync

Message:

Additions/common: removed default argument to VbglR3Daemonize

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (1 diff)
• src/VBox/Additions/x11/xclient/main.cpp (modified) (8 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -1485 +1485 @@
 VBGLR3DECL(int)     VbglR3WriteLog(const char *pch, size_t cb);
 VBGLR3DECL(int)     VbglR3CtlFilterMask(uint32_t fOr, uint32_t fNot);
-VBGLR3DECL(int)     VbglR3Daemonize(
-#ifdef __cplusplus
-    bool fNoChDir,
-    bool fNoClose,
-    char const *pszPidfile = NULL
-#else
-    bool fNoChDir,
-    bool fNoClose,
-    char const *pszPidfile
-#endif
-    );
+VBGLR3DECL(int)     VbglR3Daemonize(bool fNoChDir, bool fNoClose, char const *pszPidfile);
 VBGLR3DECL(int)     VbglR3SetGuestCaps(uint32_t fOr, uint32_t fNot);
 

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

@@ -25 +25 @@
 #include <iprt/initterm.h>
 #include <iprt/path.h>
+#include <iprt/stream.h>
 
 #include <sys/types.h>
@@ -45 +46 @@
 #endif
 
-#define TRACE printf("%s: %d\n", __PRETTY_FUNCTION__, __LINE__); Log(("%s: %d\n", __PRETTY_FUNCTION__, __LINE__))
+#define TRACE RTPrintf("%s: %d\n", __PRETTY_FUNCTION__, __LINE__); Log(("%s: %d\n", __PRETTY_FUNCTION__, __LINE__))
 
 static int (*gpfnOldIOErrorHandler)(Display *) = NULL;
@@ -139 +140 @@
     /** Disable seamless mode */
     VbglR3SeamlessSetCap(false);
-    printf(("VBoxClient: terminating...\n"));
+    RTPrintf(("VBoxClient: terminating...\n"));
     /* don't call VbglR3Term() here otherwise the /dev/vboxadd filehandle is closed */
     /* Our pause() call will now return and exit. */
@@ -173 +174 @@
 void vboxClientUsage(const char *pcszFileName)
 {
-    printf("Usage: %s [-d|--nodaemon]\n", pcszFileName);
-    printf("Start the VirtualBox X Window System guest services.\n\n");
-    printf("Options:\n");
-    printf("  -d, --nodaemon   do not lower privileges and continue running as a system\n");
-    printf("                   service\n");
+    RTPrintf("Usage: %s [-d|--nodaemon]\n", pcszFileName);
+    RTPrintf("Start the VirtualBox X Window System guest services.\n\n");
+    RTPrintf("Options:\n");
+    RTPrintf("  -d, --nodaemon   do not lower privileges and continue running as a system\n");
+    RTPrintf("                   service\n");
+    RTPrintf("\n");
     exit(0);
 }
@@ -193 +195 @@
         pszFileName = "VBoxClient";
 
+    /* Initialise our runtime before all else. */
+    RTR3Init(false);
+
     /* Parse our option(s) */
     /** @todo Use RTGetOpt() if the arguments become more complex. */
@@ -206 +211 @@
         else
         {
-            printf("%s: unrecognized option `%s'\n", pszFileName, argv[i]);
-            printf("Try `%s --help' for more information\n", pszFileName);
+            RTPrintf("%s: unrecognized option `%s'\n", pszFileName, argv[i]);
+            RTPrintf("Try `%s --help' for more information\n", pszFileName);
             exit(1);
         }
@@ -213 +218 @@
     if (fDaemonise)
     {
-        rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */);
+        rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */,
+                             NULL);
         if (RT_FAILURE(rc))
         {
-            printf("VBoxClient: failed to daemonize. exiting.");
+            RTPrintf("VBoxClient: failed to daemonize. exiting.\n");
+#ifdef DEBUG
+            RTPrintf("Error %Rrc\n", rc);
+#endif
             return 1;
         }
     }
-    /* Initialise our runtime before all else. */
-    RTR3Init(false);
+    /* Initialise the guest library. */
     if (RT_FAILURE(VbglR3Init()))
     {
-        printf("Failed to connect to the VirtualBox kernel service");
+        RTPrintf("Failed to connect to the VirtualBox kernel service\n");
         return 1;
     }
@@ -233 +241 @@
     if (!XInitThreads() || !XtToolkitThreadInitialize())
     {
-        LogRel(("VBoxClient: error initialising threads in X11, exiting."));
+        LogRel(("VBoxClient: error initialising threads in X11, exiting.\n"));
         return 1;
     }