Changeset 24828 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 20, 2009 2:57:25 PM (15 years ago)

Author:

vboxsync

Message:

xpcom/server.cpp: Some cleanup.

File:

• trunk/src/VBox/Main/xpcom/server.cpp (modified) (45 diffs)

trunk/src/VBox/Main/xpcom/server.cpp

@@ -20 +20 @@
  */
 
-/* Make sure all the stdint.h macros are included - must come first! */
-#ifndef __STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS
-#endif
-#ifndef __STDC_CONSTANT_MACROS
-# define __STDC_CONSTANT_MACROS
-#endif
-
 #include <ipcIService.h>
 #include <ipcCID.h>
@@ -33 +25 @@
 #include <nsIComponentRegistrar.h>
 
-#if defined(XPCOM_GLUE)
-#include <nsXPCOMGlue.h>
+#ifdef XPCOM_GLUE
+# include <nsXPCOMGlue.h>
 #endif
 
@@ -48 +40 @@
 
 #include <iprt/initterm.h>
+#include <iprt/critsect.h>
+#include <iprt/getopt.h>
 #include <iprt/path.h>
-#include <iprt/critsect.h>
 #include <iprt/timer.h>
 
@@ -57 +50 @@
 #include <unistd.h>
 #include <errno.h>
-#include <getopt.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#ifndef RT_OS_OS2
-# include <sys/resource.h>
-#endif
+#include <sys/resource.h>
 
 /////////////////////////////////////////////////////////////////////////////
@@ -212 +202 @@
 static bool gAutoShutdown = false;
 
-static nsIEventQueue* gEventQ = nsnull;
+static nsIEventQueue  *gEventQ      = nsnull;
 static PRBool volatile gKeepRunning = PR_TRUE;
 
@@ -238 +228 @@
      * either case.
      */
-    nsresult postTo (nsIEventQueue *aEventQ)
+    nsresult postTo(nsIEventQueue *aEventQ)
     {
         AssertReturn(mEv.that == NULL, NS_ERROR_FAILURE);
         AssertReturn(aEventQ, NS_ERROR_FAILURE);
-        nsresult rv = aEventQ->InitEvent (&mEv.e, NULL,
-                                          eventHandler, eventDestructor);
+        nsresult rv = aEventQ->InitEvent(&mEv.e, NULL,
+                                         eventHandler, eventDestructor);
         if (NS_SUCCEEDED(rv))
         {
             mEv.that = this;
-            rv = aEventQ->PostEvent (&mEv.e);
+            rv = aEventQ->PostEvent(&mEv.e);
             if (NS_SUCCEEDED(rv))
                 return rv;
@@ -265 +255 @@
     } mEv;
 
-    static void *PR_CALLBACK eventHandler (PLEvent *self)
-    {
-        return reinterpret_cast <Ev *> (self)->that->handler();
-    }
-
-    static void PR_CALLBACK eventDestructor (PLEvent *self)
-    {
-        delete reinterpret_cast <Ev *> (self)->that;
+    static void *PR_CALLBACK eventHandler(PLEvent *self)
+    {
+        return reinterpret_cast<Ev *>(self)->that->handler();
+    }
+
+    static void PR_CALLBACK eventDestructor(PLEvent *self)
+    {
+        delete reinterpret_cast<Ev *>(self)->that;
     }
 };
@@ -289 +279 @@
     virtual ~VirtualBoxClassFactory()
     {
-        LogFlowFunc (("Deleting VirtualBox...\n"));
+        LogFlowFunc(("Deleting VirtualBox...\n"));
 
         FinalRelease();
         sInstance = NULL;
 
-        LogFlowFunc (("VirtualBox object deleted.\n"));
-        printf ("Informational: VirtualBox object deleted.\n");
+        LogFlowFunc(("VirtualBox object deleted.\n"));
+        printf("Informational: VirtualBox object deleted.\n");
     }
 
@@ -312 +302 @@
             PRBool onMainThread = PR_TRUE;
             if (gEventQ)
-                gEventQ->IsOnCurrentThread (&onMainThread);
+                gEventQ->IsOnCurrentThread(&onMainThread);
 
             PRBool timerStarted = PR_FALSE;
@@ -319 +309 @@
             if (sTimer != NULL)
             {
-                LogFlowFunc (("Last VirtualBox instance was released.\n"));
-                LogFlowFunc (("Scheduling server shutdown in %d ms...\n",
-                              VBoxSVC_ShutdownDelay));
+                LogFlowFunc(("Last VirtualBox instance was released.\n"));
+                LogFlowFunc(("Scheduling server shutdown in %d ms...\n",
+                             VBoxSVC_ShutdownDelay));
 
                 /* make sure the previous timer (if any) is stopped;
                  * otherwise RTTimerStart() will definitely fail. */
-                RTTimerLRStop (sTimer);
-
-                int vrc = RTTimerLRStart (sTimer, uint64_t (VBoxSVC_ShutdownDelay) * 1000000);
-                AssertRC (vrc);
+                RTTimerLRStop(sTimer);
+
+                int vrc = RTTimerLRStart(sTimer, uint64_t(VBoxSVC_ShutdownDelay) * 1000000);
+                AssertRC(vrc);
                 timerStarted = SUCCEEDED(vrc);
             }
             else
             {
-                LogFlowFunc (("Last VirtualBox instance was released "
-                              "on XPCOM shutdown.\n"));
-                Assert (onMainThread);
+                LogFlowFunc(("Last VirtualBox instance was released "
+                             "on XPCOM shutdown.\n"));
+                Assert(onMainThread);
             }
 
@@ -344 +334 @@
                     /* Failed to start the timer, post the shutdown event
                      * manually if not on the main thread alreay. */
-                    ShutdownTimer (NULL, NULL, 0);
+                    ShutdownTimer(NULL, NULL, 0);
                 }
                 else
@@ -366 +356 @@
                      */
 
-                    Assert (gEventQ == NULL);
+                    Assert(gEventQ == NULL);
                 }
             }
@@ -379 +369 @@
         void *handler()
         {
-            LogFlowFunc (("\n"));
-
-            Assert (RTCritSectIsInitialized (&sLock));
+            LogFlowFunc(("\n"));
+
+            Assert(RTCritSectIsInitialized(&sLock));
 
             /* stop accepting GetInstance() requests on other threads during
              * possible destruction */
-            RTCritSectEnter (&sLock);
+            RTCritSectEnter(&sLock);
 
             nsrefcnt count = 0;
@@ -401 +391 @@
                 if (gAutoShutdown)
                 {
-                    Assert (sInstance == NULL);
-                    LogFlowFunc (("Terminating the server process...\n"));
+                    Assert(sInstance == NULL);
+                    LogFlowFunc(("Terminating the server process...\n"));
                     /* make it leave the event loop */
                     gKeepRunning = PR_FALSE;
@@ -412 +402 @@
                  * connect after this event has been posted to the main queue
                  * but before it started to process it. */
-                LogFlowFunc (("Destruction is canceled (refcnt=%d).\n", count));
-            }
-
-            RTCritSectLeave (&sLock);
+                LogFlowFunc(("Destruction is canceled (refcnt=%d).\n", count));
+            }
+
+            RTCritSectLeave(&sLock);
 
             return NULL;
@@ -421 +411 @@
     };
 
-    static void ShutdownTimer (RTTIMERLR hTimerLR, void *pvUser, uint64_t /*iTick*/)
-    {
-        NOREF (hTimerLR);
-        NOREF (pvUser);
+    static void ShutdownTimer(RTTIMERLR hTimerLR, void *pvUser, uint64_t /*iTick*/)
+    {
+        NOREF(hTimerLR);
+        NOREF(pvUser);
 
         /* A "too late" event is theoretically possible if somebody
@@ -430 +420 @@
          * and this method was so lucky that it got a chance to run before
          * the timer was killed. */
-        AssertReturnVoid (gEventQ);
+        AssertReturnVoid(gEventQ);
 
         /* post a quit event to the main queue */
         MaybeQuitEvent *ev = new MaybeQuitEvent();
-        nsresult rv = ev->postTo (gEventQ);
-        NOREF (rv);
+        nsresult rv = ev->postTo(gEventQ);
+        NOREF(rv);
 
         /* A failure above means we've been already stopped (for example
@@ -444 +434 @@
     static NS_IMETHODIMP FactoryConstructor()
     {
-        LogFlowFunc (("\n"));
+        LogFlowFunc(("\n"));
 
         /* create a critsect to protect object construction */
-        if (RT_FAILURE(RTCritSectInit (&sLock)))
+        if (RT_FAILURE(RTCritSectInit(&sLock)))
             return NS_ERROR_OUT_OF_MEMORY;
 
-        int vrc = RTTimerLRCreateEx (&sTimer, 0, 0, ShutdownTimer, NULL);
+        int vrc = RTTimerLRCreateEx(&sTimer, 0, 0, ShutdownTimer, NULL);
         if (RT_FAILURE(vrc))
         {
-            LogFlowFunc (("Failed to create a timer! (vrc=%Rrc)\n", vrc));
+            LogFlowFunc(("Failed to create a timer! (vrc=%Rrc)\n", vrc));
             return NS_ERROR_FAILURE;
         }
@@ -462 +452 @@
     static NS_IMETHODIMP FactoryDestructor()
     {
-        LogFlowFunc (("\n"));
-
-        RTTimerLRDestroy (sTimer);
+        LogFlowFunc(("\n"));
+
+        RTTimerLRDestroy(sTimer);
         sTimer = NULL;
 
-        RTCritSectDelete (&sLock);
+        RTCritSectDelete(&sLock);
 
         if (sInstance != NULL)
@@ -482 +472 @@
     }
 
-    static nsresult GetInstance (VirtualBox **inst)
-    {
-        LogFlowFunc (("Getting VirtualBox object...\n"));
-
-        RTCritSectEnter (&sLock);
+    static nsresult GetInstance(VirtualBox **inst)
+    {
+        LogFlowFunc(("Getting VirtualBox object...\n"));
+
+        RTCritSectEnter(&sLock);
 
         if (!gKeepRunning)
         {
-            LogFlowFunc (("Process termination requested first. Refusing.\n"));
-
-            RTCritSectLeave (&sLock);
+            LogFlowFunc(("Process termination requested first. Refusing.\n"));
+
+            RTCritSectLeave(&sLock);
 
             /* this rv is what CreateInstance() on the client side returns
@@ -515 +505 @@
                 sInstance->AddRef(); /* protect FinalConstruct() */
                 rv = sInstance->FinalConstruct();
-                printf ("Informational: VirtualBox object created (rc=%08X).\n", rv);
-                if (NS_FAILED (rv))
+                printf("Informational: VirtualBox object created (rc=%08X).\n", rv);
+                if (NS_FAILED(rv))
                 {
                     /* On failure diring VirtualBox initialization, delete it
@@ -529 +519 @@
                     sInstance->Release();
                     sInstance->Release();
-                    Assert (sInstance == NULL);
+                    Assert(sInstance == NULL);
                 }
                 else
@@ -535 +525 @@
                     /* On success, make sure the previous timer is stopped to
                      * cancel a scheduled server termination (if any). */
-                    RTTimerLRStop (sTimer);
+                    RTTimerLRStop(sTimer);
                 }
             }
@@ -545 +535 @@
         else
         {
-            LogFlowFunc (("Using existing VirtualBox object...\n"));
+            LogFlowFunc(("Using existing VirtualBox object...\n"));
             nsrefcnt count = sInstance->AddRef();
-            Assert (count > 1);
+            Assert(count > 1);
 
             if (count == 2)
             {
-                LogFlowFunc (("Another client has requested a reference to VirtualBox, "
-                              "canceling detruction...\n"));
+                LogFlowFunc(("Another client has requested a reference to VirtualBox, canceling detruction...\n"));
 
                 /* make sure the previous timer is stopped */
-                RTTimerLRStop (sTimer);
+                RTTimerLRStop(sTimer);
             }
         }
@@ -561 +550 @@
         *inst = sInstance;
 
-        RTCritSectLeave (&sLock);
+        RTCritSectLeave(&sLock);
 
         return rv;
@@ -581 +570 @@
 
 VirtualBoxClassFactory *VirtualBoxClassFactory::sInstance = NULL;
-RTCRITSECT VirtualBoxClassFactory::sLock = {0};
+RTCRITSECT VirtualBoxClassFactory::sLock;
 
 RTTIMERLR VirtualBoxClassFactory::sTimer = NIL_RTTIMERLR;
 
-NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR_WITH_RC
-    (VirtualBox, VirtualBoxClassFactory::GetInstance)
+NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR_WITH_RC(VirtualBox, VirtualBoxClassFactory::GetInstance)
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -601 +589 @@
 struct nsModuleComponentInfoEx : nsModuleComponentInfo
 {
-    nsModuleComponentInfoEx () {}
-    nsModuleComponentInfoEx (int) {}
-
-    nsModuleComponentInfoEx (
+    nsModuleComponentInfoEx() {}
+    nsModuleComponentInfoEx(int) {}
+
+    nsModuleComponentInfoEx(
         const char*                                 aDescription,
         const nsCID&                                aCID,
@@ -640 +628 @@
 static const nsModuleComponentInfoEx components[] =
 {
-    nsModuleComponentInfoEx (
+    nsModuleComponentInfoEx(
         "VirtualBox component",
         (nsCID) NS_VIRTUALBOX_CID,
@@ -664 +652 @@
  */
 nsresult
-NS_NewGenericFactoryEx (nsIGenericFactory **result,
-                        const nsModuleComponentInfoEx *info)
+NS_NewGenericFactoryEx(nsIGenericFactory **result,
+                       const nsModuleComponentInfoEx *info)
 {
     AssertReturn(result, NS_ERROR_INVALID_POINTER);
 
-    nsresult rv = NS_NewGenericFactory (result, info);
+    nsresult rv = NS_NewGenericFactory(result, info);
     if (NS_SUCCEEDED(rv) && info && info->mFactoryConstructor)
     {
         rv = info->mFactoryConstructor();
-        if (NS_FAILED (rv))
-            NS_RELEASE (*result);
+        if (NS_FAILED(rv))
+            NS_RELEASE(*result);
     }
 
@@ -687 +675 @@
  */
 static nsresult
-RegisterSelfComponents (nsIComponentRegistrar *registrar,
-                        const nsModuleComponentInfoEx *components,
-                        PRUint32 count)
+RegisterSelfComponents(nsIComponentRegistrar *registrar,
+                       const nsModuleComponentInfoEx *components,
+                       PRUint32 count)
 {
     nsresult rc = NS_OK;
@@ -696 +684 @@
     {
         /* skip components w/o a constructor */
-        if (!info->mConstructor) continue;
+        if (!info->mConstructor)
+            continue;
         /* create a new generic factory for a component and register it */
         nsIGenericFactory *factory;
-        rc = NS_NewGenericFactoryEx (&factory, info);
+        rc = NS_NewGenericFactoryEx(&factory, info);
         if (NS_SUCCEEDED(rc))
         {
-            rc = registrar->RegisterFactory (info->mCID,
-                                             info->mDescription,
-                                             info->mContractID,
-                                             factory);
+            rc = registrar->RegisterFactory(info->mCID,
+                                            info->mDescription,
+                                            info->mContractID,
+                                            factory);
             factory->Release();
         }
@@ -715 +704 @@
 
 static ipcIService *gIpcServ = nsnull;
-static char *pszPidFile = NULL;
+static const char *g_pszPidFile = NULL;
 
 class ForceQuitEvent : public MyEvent
@@ -721 +710 @@
     void *handler()
     {
-        LogFlowFunc (("\n"));
+        LogFlowFunc(("\n"));
 
         gKeepRunning = PR_FALSE;
 
-        if (pszPidFile)
-            RTFileDelete(pszPidFile);
+        if (g_pszPidFile)
+            RTFileDelete(g_pszPidFile);
 
         return NULL;
@@ -732 +721 @@
 };
 
-static void signal_handler (int /* sig */)
+static void signal_handler(int /* sig */)
 {
     if (gEventQ && gKeepRunning)
@@ -738 +727 @@
         /* post a quit event to the queue */
         ForceQuitEvent *ev = new ForceQuitEvent();
-        ev->postTo (gEventQ);
+        ev->postTo(gEventQ);
     }
 }
 
-int main (int argc, char **argv)
+int main(int argc, char **argv)
 {
-    const struct option options[] =
-    {
-        { "automate",       no_argument,        NULL, 'a' },
-        { "auto-shutdown",  no_argument,        NULL, 'A' },
-        { "daemonize",      no_argument,        NULL, 'd' },
-        { "pidfile",        required_argument,  NULL, 'p' },
-        { "pipe",           required_argument,  NULL, 'P' },
-        { NULL,             0,                  NULL,  0  }
+    /*
+     * Initialize the VBox runtime without loading
+     * the support driver
+     */
+    RTR3Init();
+
+    static const RTGETOPTDEF s_aOptions[] =
+    {
+        { "--automate",       'a', RTGETOPT_REQ_NOTHING },
+        { "--auto-shutdown",  'A', RTGETOPT_REQ_NOTHING },
+        { "--daemonize",      'd', RTGETOPT_REQ_NOTHING },
+        { "--pidfile",        'p', RTGETOPT_REQ_STRING  },
+        { "--pipe",           'P', RTGETOPT_REQ_UINT32  },
     };
-    int  c;
-    bool fDaemonize = false;
-    int  daemon_pipe_wr = -1;
-
-    for (;;)
-    {
-        c = getopt_long(argc, argv, "", options, NULL);
-        if (c == -1)
-            break;
-        switch (c)
+
+    bool            fDaemonize = false;
+    int             daemon_pipe_wr = -1;
+
+    RTGETOPTSTATE   GetOptState;
+    int vrc = RTGetOptInit(&GetOptState, argc, argv, &s_aOptions[0], RT_ELEMENTS(s_aOptions), 1, 0 /*fFlags*/);
+    AssertRC(vrc);
+
+    RTGETOPTUNION   ValueUnion;
+    while ((vrc = RTGetOpt(&GetOptState, &ValueUnion)))
+    {
+        switch (vrc)
         {
             case 'a':
@@ -789 +785 @@
             case 'p':
             {
-                pszPidFile = optarg;
+                g_pszPidFile = ValueUnion.psz;
                 break;
             }
 
-            /* we need to exec on darwin, this is just an internal
-             * hack for passing the pipe fd along to the final child. */
+            /* This is just an internal hack for passing the pipe write fd
+               along to the final child.  Internal use only. */
             case 'P':
             {
-                daemon_pipe_wr = atoi(optarg);
+                daemon_pipe_wr = ValueUnion.u32;
                 break;
             }
 
             default:
-            {
-                /* exit on invalid options */
-                return 1;
-            }
-        }
-    }
-
-    static RTFILE pidFile = NIL_RTFILE;
-
-#ifdef RT_OS_OS2
+                return RTGetOptPrintError(vrc, &ValueUnion);
+        }
+    }
+
+#ifdef RT_OS_OS2 /** @todo There is almost no need to make a special case of OS/2 here. Just the execv call needs to be told to create a background process... */
 
     /* nothing to do here, the process is supposed to be already
@@ -854 +845 @@
                     fSuccess = true;
                 else
-                    printf ("ERROR: Unknown message from child process (%s)\n", msg);
+                    printf("ERROR: Unknown message from child process (%s)\n", msg);
             }
             else
-                printf ("ERROR: 0 bytes read from child process\n");
+                printf("ERROR: 0 bytes read from child process\n");
 
             /* close the reading end of the pipe as well and exit */
@@ -931 +922 @@
         apszArgs[i++] = "--pipe";
         char szPipeArg[32];
-        RTStrPrintf (szPipeArg, sizeof (szPipeArg), "%d", daemon_pipe_wr);
+        RTStrPrintf(szPipeArg, sizeof(szPipeArg), "%d", daemon_pipe_wr);
         apszArgs[i++] = szPipeArg;
-        if (pszPidFile)
+        if (g_pszPidFile)
         {
             apszArgs[i++] = "--pidfile";
-            apszArgs[i++] = pszPidFile;
+            apszArgs[i++] = g_pszPidFile;
         }
         if (gAutoShutdown)
             apszArgs[i++] = "--auto-shutdown";
-        apszArgs[i++] = NULL; Assert(i <= RT_ELEMENTS(apszArgs));
-        execv (apszArgs[0], (char * const *)apszArgs);
-        exit (126);
+        apszArgs[i++] = NULL;   Assert(i <= RT_ELEMENTS(apszArgs));
+        execv(apszArgs[0], (char * const *)apszArgs);
+        exit(126);
     }
 
 #endif // !RT_OS_OS2
 
-    /*
-     * Initialize the VBox runtime without loading
-     * the support driver
-     */
-    RTR3Init();
-
-    nsresult rc;
+    nsresult    rc;
 
     do
     {
         rc = com::Initialize();
-        if (NS_FAILED (rc))
-        {
-            printf ("ERROR: Failed to initialize XPCOM! (rc=%08X)\n", rc);
+        if (NS_FAILED(rc))
+        {
+            printf("ERROR: Failed to initialize XPCOM! (rc=%08X)\n", rc);
             break;
         }
 
         nsCOMPtr <nsIComponentRegistrar> registrar;
-        rc = NS_GetComponentRegistrar (getter_AddRefs (registrar));
-        if (NS_FAILED (rc))
-        {
-            printf ("ERROR: Failed to get component registrar! (rc=%08X)\n", rc);
+        rc = NS_GetComponentRegistrar(getter_AddRefs(registrar));
+        if (NS_FAILED(rc))
+        {
+            printf("ERROR: Failed to get component registrar! (rc=%08X)\n", rc);
             break;
         }
 
-        registrar->AutoRegister (nsnull);
-        rc = RegisterSelfComponents (registrar, components,
-                                     NS_ARRAY_LENGTH (components));
-        if (NS_FAILED (rc))
-        {
-            printf ("ERROR: Failed to register server components! (rc=%08X)\n", rc);
+        registrar->AutoRegister(nsnull);
+        rc = RegisterSelfComponents(registrar, components,
+                                    NS_ARRAY_LENGTH (components));
+        if (NS_FAILED(rc))
+        {
+            printf("ERROR: Failed to register server components! (rc=%08X)\n", rc);
             break;
         }
@@ -984 +969 @@
          * gets created upon XPCOM startup, so it will use the main (this)
          * thread's event queue to receive IPC events) */
-        rc = NS_GetMainEventQ (&gEventQ);
-        if (NS_FAILED (rc))
-        {
-            printf ("ERROR: Failed to get the main event queue! (rc=%08X)\n", rc);
+        rc = NS_GetMainEventQ(&gEventQ);
+        if (NS_FAILED(rc))
+        {
+            printf("ERROR: Failed to get the main event queue! (rc=%08X)\n", rc);
             break;
         }
@@ -994 +979 @@
         if (NS_FAILED (rc))
         {
-            printf ("ERROR: Failed to get IPC service! (rc=%08X)\n", rc);
+            printf("ERROR: Failed to get IPC service! (rc=%08X)\n", rc);
             break;
         }
 
-        NS_ADDREF (gIpcServ = ipcServ);
-
-        LogFlowFunc (("Will use \"%s\" as server name.\n", VBOXSVC_IPC_NAME));
-
-        rc = gIpcServ->AddName (VBOXSVC_IPC_NAME);
-        if (NS_FAILED (rc))
-        {
-            LogFlowFunc (("Failed to register the server name (rc=%08X)!\n"
-                          "Is another server already running?\n", rc));
-
-            printf ("ERROR: Failed to register the server name \"%s\" (rc=%08X)!\n"
-                    "Is another server already running?\n",
-                    VBOXSVC_IPC_NAME, rc);
-            NS_RELEASE (gIpcServ);
+        NS_ADDREF(gIpcServ = ipcServ);
+
+        LogFlowFunc(("Will use \"%s\" as server name.\n", VBOXSVC_IPC_NAME));
+
+        rc = gIpcServ->AddName(VBOXSVC_IPC_NAME);
+        if (NS_FAILED(rc))
+        {
+            LogFlowFunc(("Failed to register the server name (rc=%Rhrc (%08X))!\n"
+                         "Is another server already running?\n", rc, rc));
+
+            printf("ERROR: Failed to register the server name \"%s\" (rc=%08X)!\n"
+                   "Is another server already running?\n",
+                   VBOXSVC_IPC_NAME, rc);
+            NS_RELEASE(gIpcServ);
             break;
         }
@@ -1019 +1004 @@
             struct sigaction sa;
             sa.sa_handler = signal_handler;
-            sigemptyset (&sa.sa_mask);
+            sigemptyset(&sa.sa_mask);
             sa.sa_flags = 0;
-            sigaction (SIGINT, &sa, NULL);
-            sigaction (SIGQUIT, &sa, NULL);
-            sigaction (SIGTERM, &sa, NULL);
-            sigaction (SIGTRAP, &sa, NULL);
+            sigaction(SIGINT, &sa, NULL);
+            sigaction(SIGQUIT, &sa, NULL);
+            sigaction(SIGTERM, &sa, NULL);
+            sigaction(SIGTRAP, &sa, NULL);
         }
 
@@ -1031 +1016 @@
             int  iSize;
 
-            iSize = snprintf (szBuf, sizeof(szBuf),
-                              "Sun VirtualBox XPCOM Server Version "
-                              VBOX_VERSION_STRING);
-            for (int i=iSize; i>0; i--)
+            iSize = RTStrPrintf(szBuf, sizeof(szBuf),
+                                "Sun VirtualBox XPCOM Server Version "
+                                VBOX_VERSION_STRING);
+            for (int i = iSize; i > 0; i--)
                 putchar('*');
-            printf ("\n%s\n", szBuf);
-            printf ("(C) 2008-2009 Sun Microsystems, Inc.\n"
-                    "All rights reserved.\n");
+            printf("\n%s\n", szBuf);
+            printf("(C) 2008-2009 Sun Microsystems, Inc.\n"
+                   "All rights reserved.\n");
 #ifdef DEBUG
-            printf ("Debug version.\n");
+            printf("Debug version.\n");
 #endif
-#if 0
-            /* in my opinion two lines enclosing the text look better */
-            for (int i=iSize; i>0; i--)
-                putchar('*');
-            putchar('\n');
-#endif
         }
 
         if (daemon_pipe_wr >= 0)
         {
-            printf ("\nStarting event loop....\n[send TERM signal to quit]\n");
+            printf("\nStarting event loop....\n[send TERM signal to quit]\n");
             /* now we're ready, signal the parent process */
             write(daemon_pipe_wr, "READY", strlen("READY"));
         }
         else
-        {
-            printf ("\nStarting event loop....\n[press Ctrl-C to quit]\n");
-        }
-
-        if (pszPidFile)
-        {
-            char szBuf[32];
-            const char *lf = "\n";
-            RTFileOpen(&pidFile, pszPidFile, RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_NONE);
-            RTStrFormatNumber(szBuf, getpid(), 10, 0, 0, 0);
-            RTFileWrite(pidFile, szBuf, strlen(szBuf), NULL);
-            RTFileWrite(pidFile, lf, strlen(lf), NULL);
-            RTFileClose(pidFile);
-        }
-
-#ifndef RT_OS_OS2
+            printf("\nStarting event loop....\n[press Ctrl-C to quit]\n");
+
+        if (g_pszPidFile)
+        {
+            RTFILE pidFile = NIL_RTFILE;
+            vrc = RTFileOpen(&pidFile, g_pszPidFile, RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_NONE);
+            if (RT_SUCCESS(vrc))
+            {
+                char szBuf[32];
+                const char *lf = "\n";
+                RTStrFormatNumber(szBuf, getpid(), 10, 0, 0, 0);
+                RTFileWrite(pidFile, szBuf, strlen(szBuf), NULL);
+                RTFileWrite(pidFile, lf, strlen(lf), NULL);
+                RTFileClose(pidFile);
+            }
+        }
+
         // Increase the file table size to 10240 or as high as possible.
         struct rlimit lim;
@@ -1087 +1067 @@
         else
             printf("WARNING: failed to obtain per-process file-descriptor limit (%d).\n", errno);
-#endif
 
         PLEvent *ev;
         while (gKeepRunning)
         {
-            gEventQ->WaitForEvent (&ev);
-            gEventQ->HandleEvent (ev);
+            gEventQ->WaitForEvent(&ev);
+            gEventQ->HandleEvent(ev);
         }
 
@@ -1104 +1083 @@
         /* unregister ourselves. After this point, clients will start a new
          * process because they won't be able to resolve the server name.*/
-        gIpcServ->RemoveName (VBOXSVC_IPC_NAME);
+        gIpcServ->RemoveName(VBOXSVC_IPC_NAME);
 
         /* process any remaining events. These events may include
@@ -1112 +1091 @@
         gEventQ->ProcessPendingEvents();
 
-        printf ("Terminated event loop.\n");
+        printf("Terminated event loop.\n");
     }
     while (0); // this scopes the nsCOMPtrs
 
-    NS_IF_RELEASE (gIpcServ);
-    NS_IF_RELEASE (gEventQ);
+    NS_IF_RELEASE(gIpcServ);
+    NS_IF_RELEASE(gEventQ);
 
     /* no nsCOMPtrs are allowed to be alive when you call com::Shutdown(). */
 
-    LogFlowFunc (("Calling com::Shutdown()...\n"));
+    LogFlowFunc(("Calling com::Shutdown()...\n"));
     rc = com::Shutdown();
-    LogFlowFunc (("Finished com::Shutdown() (rc=%08X)\n", rc));
+    LogFlowFunc(("Finished com::Shutdown() (rc=%Rhrc)\n", rc));
 
     if (NS_FAILED (rc))
-        printf ("ERROR: Failed to shutdown XPCOM! (rc=%08X)\n", rc);
-
-    printf ("XPCOM server has shutdown.\n");
-
-    if (pszPidFile)
-    {
-        RTFileDelete(pszPidFile);
-    }
-
+        printf("ERROR: Failed to shutdown XPCOM! (rc=%08X)\n", rc);
+
+    printf("XPCOM server has shutdown.\n");
+
+    if (g_pszPidFile)
+        RTFileDelete(g_pszPidFile);
+
+    /* close writing end of the pipe as well */
     if (daemon_pipe_wr >= 0)
-    {
-        /* close writing end of the pipe as well */
         close(daemon_pipe_wr);
-    }
 
     return 0;