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

Timestamp:

Jan 20, 2010 5:26:22 PM (15 years ago)

Author:

vboxsync

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

56784

Message:

*: RTEnv usage cleanup - avoid RTEnvGet() as it doesn't necessarily return UTF-8 encoded strings.

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (2 diffs)
• freebsd/HostHardwareFreeBSD.cpp (modified) (3 diffs)
• glue/com.cpp (modified) (5 diffs)
• glue/initterm.cpp (modified) (29 diffs)
• linux/HostHardwareLinux.cpp (modified) (2 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -430 +430 @@
         // So use a fallback approach similar to Linux.
         {
-            if (RTEnvGet("VBOX_CDROM"))
+            if (RTEnvExistEx(RTENV_DEFAULT, "VBOX_CDROM"))
             {
-                char *cdromEnv = strdup(RTEnvGet("VBOX_CDROM"));
+                char *cdromEnv = RTEnvDupEx(RTENV_DEFAULT, "VBOX_CDROM");
                 char *saveStr = NULL;
                 char *cdromDrive = NULL;
@@ -448 +448 @@
                     cdromDrive = strtok_r(NULL, ":", &saveStr);
                 }
-                free(cdromEnv);
+                RTStrFree(cdromEnv);
             }
             else

trunk/src/VBox/Main/freebsd/HostHardwareFreeBSD.cpp

@@ -341 +341 @@
     int rc = VINF_SUCCESS;
     bool success = false;
+    char *pszFreeMe = RTEnvDupEx(RTENV_DEFAULT, pcszVar);
 
     try
     {
-        const char *pcszCurrent = RTEnvGet (pcszVar);
+        const char *pcszCurrent = pszFreeMe;
         while (pcszCurrent && *pcszCurrent != '\0')
         {
@@ -357 +358 @@
             if (RT_SUCCESS(RTPathReal(szPath, szReal, sizeof(szReal))))
             {
+                szUdi[0] = '\0'; /** @todo r=bird: missing a call to devValidateDevice() here and szUdi wasn't
+                                  *        initialized because of that.  Need proper fixing. */
                 pList->push_back(DriveInfo(szReal, szUdi, szDesc));
                 success = true;
@@ -369 +372 @@
         rc = VERR_NO_MEMORY;
     }
-    LogFlowFunc (("rc=%Rrc, success=%d\n", rc, success));
+    RTStrFree(pszFreeMe);
+    LogFlowFunc(("rc=%Rrc, success=%d\n", rc, success));
     return rc;
 }

trunk/src/VBox/Main/glue/com.cpp

@@ -138 +138 @@
 }
 
-int GetVBoxUserHomeDirectory (char *aDir, size_t aDirLen)
+int GetVBoxUserHomeDirectory(char *aDir, size_t aDirLen)
 {
     AssertReturn(aDir, VERR_INVALID_POINTER);
@@ -146 +146 @@
     *aDir = 0;
 
-    const char *VBoxUserHome = RTEnvGet ("VBOX_USER_HOME");
+    const char *VBoxUserHome = RTEnvGet("VBOX_USER_HOME");
 
     char path [RTPATH_MAX];
@@ -155 +155 @@
         /* get the full path name */
         char *VBoxUserHomeUtf8 = NULL;
-        vrc = RTStrCurrentCPToUtf8 (&VBoxUserHomeUtf8, VBoxUserHome);
+        vrc = RTStrCurrentCPToUtf8(&VBoxUserHomeUtf8, VBoxUserHome);
         if (RT_SUCCESS(vrc))
         {
-            vrc = RTPathAbs (VBoxUserHomeUtf8, path, sizeof (path));
+            vrc = RTPathAbs(VBoxUserHomeUtf8, path, sizeof (path));
             if (RT_SUCCESS(vrc))
             {
-                if (aDirLen < strlen (path) + 1)
+                if (aDirLen < strlen(path) + 1)
                     vrc = VERR_BUFFER_OVERFLOW;
                 else
-                    strcpy (aDir, path);
+                    strcpy(aDir, path);
             }
-            RTStrFree (VBoxUserHomeUtf8);
+            RTStrFree(VBoxUserHomeUtf8);
         }
     }
@@ -172 +172 @@
     {
         /* compose the config directory (full path) */
-        vrc = RTPathUserHome (path, sizeof (path));
+        vrc = RTPathUserHome(path, sizeof(path));
         if (RT_SUCCESS(vrc))
         {
-            size_t len =
-                RTStrPrintf (aDir, aDirLen, "%s%c%s",
-                             path, RTPATH_DELIMITER, VBOX_USER_HOME_SUFFIX);
-            if (len != strlen (path) + 1 + strlen (VBOX_USER_HOME_SUFFIX))
+            size_t len = RTStrPrintf(aDir, aDirLen, "%s%c%s",
+                                     path, RTPATH_DELIMITER, VBOX_USER_HOME_SUFFIX);
+            if (len != strlen(path) + 1 + strlen (VBOX_USER_HOME_SUFFIX))
                 vrc = VERR_BUFFER_OVERFLOW;
         }
@@ -185 +184 @@
     /* ensure the home directory exists */
     if (RT_SUCCESS(vrc))
-        if (!RTDirExists (aDir))
-            vrc = RTDirCreateFullPath (aDir, 0777);
+        if (!RTDirExists(aDir))
+            vrc = RTDirCreateFullPath(aDir, 0777);
 
     return vrc;

trunk/src/VBox/Main/glue/initterm.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
  */
 
-#if !defined (VBOX_WITH_XPCOM)
-
-#include <objbase.h>
+#if !defined(VBOX_WITH_XPCOM)
+
+# include <objbase.h>
 
 #else /* !defined (VBOX_WITH_XPCOM) */
 
-#include <stdlib.h>
-
-/* XPCOM_GLUE is defined when the client uses the standalone glue
- * (i.e. dynamically picks up the existing XPCOM shared library installation).
- * This is not the case for VirtualBox XPCOM clients (they are always
- * distrubuted with the self-built XPCOM library, and therefore have a binary
- * dependency on it) but left here for clarity.
- */
-#if defined (XPCOM_GLUE)
-#include <nsXPCOMGlue.h>
-#endif
-
-#include <nsIComponentRegistrar.h>
-#include <nsIServiceManager.h>
-#include <nsCOMPtr.h>
-#include <nsEventQueueUtils.h>
-#include <nsEmbedString.h>
-
-#include <nsILocalFile.h>
-#include <nsIDirectoryService.h>
-#include <nsDirectoryServiceDefs.h>
-
-#endif /* !defined (VBOX_WITH_XPCOM) */
+# include <stdlib.h>
+
+  /* XPCOM_GLUE is defined when the client uses the standalone glue
+   * (i.e. dynamically picks up the existing XPCOM shared library installation).
+   * This is not the case for VirtualBox XPCOM clients (they are always
+   * distrubuted with the self-built XPCOM library, and therefore have a binary
+   * dependency on it) but left here for clarity.
+   */
+# if defined(XPCOM_GLUE)
+#  include <nsXPCOMGlue.h>
+# endif
+
+# include <nsIComponentRegistrar.h>
+# include <nsIServiceManager.h>
+# include <nsCOMPtr.h>
+# include <nsEventQueueUtils.h>
+# include <nsEmbedString.h>
+
+# include <nsILocalFile.h>
+# include <nsIDirectoryService.h>
+# include <nsDirectoryServiceDefs.h>
+
+#endif /* !defined(VBOX_WITH_XPCOM) */
 
 #include "VBox/com/com.h"
@@ -70 +70 @@
 {
 
-#if defined (VBOX_WITH_XPCOM)
+#if defined(VBOX_WITH_XPCOM)
 
 class DirectoryServiceProvider : public nsIDirectoryServiceProvider
@@ -79 +79 @@
 
     DirectoryServiceProvider()
-        : mCompRegLocation (NULL), mXPTIDatLocation (NULL)
-        , mComponentDirLocation (NULL), mCurrProcDirLocation (NULL)
+        : mCompRegLocation(NULL), mXPTIDatLocation(NULL)
+        , mComponentDirLocation(NULL), mCurrProcDirLocation(NULL)
         {}
 
     virtual ~DirectoryServiceProvider();
 
-    HRESULT init (const char *aCompRegLocation,
-                  const char *aXPTIDatLocation,
-                  const char *aComponentDirLocation,
-                  const char *aCurrProcDirLocation);
+    HRESULT init(const char *aCompRegLocation,
+                 const char *aXPTIDatLocation,
+                 const char *aComponentDirLocation,
+                 const char *aCurrProcDirLocation);
 
     NS_DECL_NSIDIRECTORYSERVICEPROVIDER
 
 private:
-
+    /** @remarks This is not a UTF-8 string. */
     char *mCompRegLocation;
+    /** @remarks This is not a UTF-8 string. */
     char *mXPTIDatLocation;
+    /** @remarks This is not a UTF-8 string. */
     char *mComponentDirLocation;
+    /** @remarks This is not a UTF-8 string. */
     char *mCurrProcDirLocation;
 };
 
-NS_IMPL_ISUPPORTS1 (DirectoryServiceProvider, nsIDirectoryServiceProvider)
+NS_IMPL_ISUPPORTS1(DirectoryServiceProvider, nsIDirectoryServiceProvider)
 
 DirectoryServiceProvider::~DirectoryServiceProvider()
@@ -106 +109 @@
     if (mCompRegLocation)
     {
-        RTStrFree (mCompRegLocation);
+        RTStrFree(mCompRegLocation);
         mCompRegLocation = NULL;
     }
     if (mXPTIDatLocation)
     {
-        RTStrFree (mXPTIDatLocation);
+        RTStrFree(mXPTIDatLocation);
         mXPTIDatLocation = NULL;
     }
     if (mComponentDirLocation)
     {
-        RTStrFree (mComponentDirLocation);
+        RTStrFree(mComponentDirLocation);
         mComponentDirLocation = NULL;
     }
     if (mCurrProcDirLocation)
     {
-        RTStrFree (mCurrProcDirLocation);
+        RTStrFree(mCurrProcDirLocation);
         mCurrProcDirLocation = NULL;
     }
@@ -131 +134 @@
  */
 HRESULT
-DirectoryServiceProvider::init (const char *aCompRegLocation,
-                                const char *aXPTIDatLocation,
-                                const char *aComponentDirLocation,
-                                const char *aCurrProcDirLocation)
+DirectoryServiceProvider::init(const char *aCompRegLocation,
+                               const char *aXPTIDatLocation,
+                               const char *aComponentDirLocation,
+                               const char *aCurrProcDirLocation)
 {
     AssertReturn(aCompRegLocation, NS_ERROR_INVALID_ARG);
     AssertReturn(aXPTIDatLocation, NS_ERROR_INVALID_ARG);
 
-    int vrc = RTStrUtf8ToCurrentCP (&mCompRegLocation, aCompRegLocation);
+/** @todo r=bird: Gotta check how this encoding stuff plays out on darwin!
+ *  We get down to [VBoxNsxp]NS_NewNativeLocalFile and that file isn't
+ *  nsLocalFileUnix.cpp on 32-bit darwin.  On 64-bit darwin it's a question
+ *  of what we're doing in IPRT and such...  We should probably add a
+ *  RTPathConvertToNative for use here. */
+    int vrc = RTStrUtf8ToCurrentCP(&mCompRegLocation, aCompRegLocation);
     if (RT_SUCCESS(vrc))
-        vrc = RTStrUtf8ToCurrentCP (&mXPTIDatLocation, aXPTIDatLocation);
+        vrc = RTStrUtf8ToCurrentCP(&mXPTIDatLocation, aXPTIDatLocation);
     if (RT_SUCCESS(vrc) && aComponentDirLocation)
-        vrc = RTStrUtf8ToCurrentCP (&mComponentDirLocation, aComponentDirLocation);
+        vrc = RTStrUtf8ToCurrentCP(&mComponentDirLocation, aComponentDirLocation);
     if (RT_SUCCESS(vrc) && aCurrProcDirLocation)
-        vrc = RTStrUtf8ToCurrentCP (&mCurrProcDirLocation, aCurrProcDirLocation);
+        vrc = RTStrUtf8ToCurrentCP(&mCurrProcDirLocation, aCurrProcDirLocation);
 
     return RT_SUCCESS(vrc) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
@@ -151 +159 @@
 
 NS_IMETHODIMP
-DirectoryServiceProvider::GetFile (const char *aProp,
-                                   PRBool *aPersistent,
-                                   nsIFile **aRetval)
+DirectoryServiceProvider::GetFile(const char *aProp,
+                                  PRBool *aPersistent,
+                                  nsIFile **aRetval)
 {
     nsCOMPtr <nsILocalFile> localFile;
@@ -163 +171 @@
     const char *fileLocation = NULL;
 
-    if (strcmp (aProp, NS_XPCOM_COMPONENT_REGISTRY_FILE) == 0)
+    if (strcmp(aProp, NS_XPCOM_COMPONENT_REGISTRY_FILE) == 0)
         fileLocation = mCompRegLocation;
-    else if (strcmp (aProp, NS_XPCOM_XPTI_REGISTRY_FILE) == 0)
+    else if (strcmp(aProp, NS_XPCOM_XPTI_REGISTRY_FILE) == 0)
         fileLocation = mXPTIDatLocation;
-    else if (mComponentDirLocation && strcmp (aProp, NS_XPCOM_COMPONENT_DIR) == 0)
+    else if (mComponentDirLocation && strcmp(aProp, NS_XPCOM_COMPONENT_DIR) == 0)
         fileLocation = mComponentDirLocation;
-    else if (mCurrProcDirLocation && strcmp (aProp, NS_XPCOM_CURRENT_PROCESS_DIR) == 0)
+    else if (mCurrProcDirLocation && strcmp(aProp, NS_XPCOM_CURRENT_PROCESS_DIR) == 0)
         fileLocation = mCurrProcDirLocation;
     else
         return NS_ERROR_FAILURE;
 
-    rv = NS_NewNativeLocalFile (nsEmbedCString (fileLocation),
-                                PR_TRUE, getter_AddRefs (localFile));
+    rv = NS_NewNativeLocalFile(nsEmbedCString(fileLocation),
+                               PR_TRUE, getter_AddRefs(localFile));
     if (NS_FAILED(rv))
         return rv;
 
-    return localFile->QueryInterface (NS_GET_IID (nsIFile),
-                                      (void **) aRetval);
+    return localFile->QueryInterface(NS_GET_IID (nsIFile), (void **)aRetval);
 }
 
@@ -248 +255 @@
     HRESULT rc = E_FAIL;
 
-#if !defined (VBOX_WITH_XPCOM)
-
-    DWORD flags = COINIT_MULTITHREADED |
-                  COINIT_DISABLE_OLE1DDE |
-                  COINIT_SPEED_OVER_MEMORY;
-
-    rc = CoInitializeEx (NULL, flags);
+#if !defined(VBOX_WITH_XPCOM)
+
+    DWORD flags = COINIT_MULTITHREADED
+                | COINIT_DISABLE_OLE1DDE
+                | COINIT_SPEED_OVER_MEMORY;
+
+    rc = CoInitializeEx(NULL, flags);
 
     /// @todo the below rough method of changing the aparment type doesn't
@@ -279 +286 @@
          * worry at all. */
 
-        rc = CoInitializeEx (NULL, COINIT_APARTMENTTHREADED);
+        rc = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
         if (rc == RPC_E_CHANGED_MODE)
         {
@@ -285 +292 @@
             rc = S_OK;
 
-            LogFlowFunc (("COM is already initialized in neutral threaded "
-                          "apartment mode,\nwill accept it.\n"));
+            LogFlowFunc(("COM is already initialized in neutral threaded "
+                         "apartment mode,\nwill accept it.\n"));
         }
         else if (rc == S_FALSE)
@@ -294 +301 @@
             rc = RPC_E_CHANGED_MODE;
 
-            LogFlowFunc (("COM is already initialized in single threaded "
-                          "apartment mode,\nwill reinitialize as "
-                          "multi threaded.\n"));
+            LogFlowFunc(("COM is already initialized in single threaded "
+                         "apartment mode,\nwill reinitialize as "
+                         "multi threaded.\n"));
 
             enum { MaxTries = 10000 };
@@ -303 +310 @@
             {
                 CoUninitialize();
-                rc = CoInitializeEx (NULL, flags);
+                rc = CoInitializeEx(NULL, flags);
                 if (rc == S_OK)
                 {
@@ -309 +316 @@
                      * initialization reference counter */
 
-                    LogFlowFunc (("Will call CoInitializeEx() %d times.\n",
-                                  MaxTries - tries));
+                    LogFlowFunc(("Will call CoInitializeEx() %d times.\n",
+                                 MaxTries - tries));
 
                     while (tries ++ < MaxTries)
                     {
-                        rc = CoInitializeEx (NULL, flags);
-                        Assert (rc == S_FALSE);
+                        rc = CoInitializeEx(NULL, flags);
+                        Assert(rc == S_FALSE);
                     }
                 }
@@ -321 +328 @@
         }
         else
-            AssertMsgFailed (("rc=%08X\n", rc));
+            AssertMsgFailed(("rc=%08X\n", rc));
     }
 # endif
@@ -327 +334 @@
     /* the overall result must be either S_OK or S_FALSE (S_FALSE means
      * "already initialized using the same apartment model") */
-    AssertMsg (rc == S_OK || rc == S_FALSE, ("rc=%08X\n", rc));
+    AssertMsg(rc == S_OK || rc == S_FALSE, ("rc=%08X\n", rc));
 
     /* To be flow compatible with the XPCOM case, we return here if this isn't
@@ -334 +341 @@
      *       counting, so this exercise is entirely for the EventQueue init. */
     bool fRc;
-    RTTHREAD hSelf = RTThreadSelf ();
+    RTTHREAD hSelf = RTThreadSelf();
     if (hSelf != NIL_RTTHREAD)
-        ASMAtomicCmpXchgHandle (&gCOMMainThread, hSelf, NIL_RTTHREAD, fRc);
+        ASMAtomicCmpXchgHandle(&gCOMMainThread, hSelf, NIL_RTTHREAD, fRc);
     else
         fRc = false;
@@ -342 +349 @@
     {
         if (   gCOMMainThread == hSelf
-            && SUCCEEDED (rc))
+            && SUCCEEDED(rc))
             gCOMMainInitCount++;
 
-        AssertComRC (rc);
+        AssertComRC(rc);
         return rc;
     }
-    Assert (RTThreadIsMain (hSelf));
+    Assert(RTThreadIsMain(hSelf));
 
     /* this is the first main thread initialization */
-    Assert (gCOMMainInitCount == 0);
-    if (SUCCEEDED (rc))
+    Assert(gCOMMainInitCount == 0);
+    if (SUCCEEDED(rc))
         gCOMMainInitCount = 1;
 
 #else /* !defined (VBOX_WITH_XPCOM) */
 
-    if (ASMAtomicXchgBool (&gIsXPCOMInitialized, true) == true)
+    if (ASMAtomicXchgBool(&gIsXPCOMInitialized, true) == true)
     {
         /* XPCOM is already initialized on the main thread, no special
@@ -365 +372 @@
          * Win32). */
 
-        nsCOMPtr <nsIEventQueue> eventQ;
-        rc = NS_GetMainEventQ (getter_AddRefs (eventQ));
+        nsCOMPtr<nsIEventQueue> eventQ;
+        rc = NS_GetMainEventQ(getter_AddRefs(eventQ));
 
         if (NS_SUCCEEDED(rc))
         {
             PRBool isOnMainThread = PR_FALSE;
-            rc = eventQ->IsOnCurrentThread (&isOnMainThread);
+            rc = eventQ->IsOnCurrentThread(&isOnMainThread);
             if (NS_SUCCEEDED(rc) && isOnMainThread)
-                ++ gXPCOMInitCount;
-        }
-
-        AssertComRC (rc);
+                ++gXPCOMInitCount;
+        }
+
+        AssertComRC(rc);
         return rc;
     }
-    Assert (RTThreadIsMain (RTThreadSelf()));
+    Assert(RTThreadIsMain(RTThreadSelf()));
 
     /* this is the first initialization */
@@ -386 +393 @@
 
     /* prepare paths for registry files */
-    char userHomeDir [RTPATH_MAX];
-    int vrc = GetVBoxUserHomeDirectory (userHomeDir, sizeof (userHomeDir));
-    AssertRCReturn (vrc, NS_ERROR_FAILURE);
-
-    char compReg [RTPATH_MAX];
-    char xptiDat [RTPATH_MAX];
-
-    /** @todo use RTPathAppend */
-    RTStrPrintf (compReg, sizeof (compReg), "%s%c%s",
-                 userHomeDir, RTPATH_DELIMITER, "compreg.dat");
-    RTStrPrintf (xptiDat, sizeof (xptiDat), "%s%c%s",
-                 userHomeDir, RTPATH_DELIMITER, "xpti.dat");
-
-    LogFlowFunc (("component registry  : \"%s\"\n", compReg));
-    LogFlowFunc (("XPTI data file      : \"%s\"\n", xptiDat));
+    char szCompReg[RTPATH_MAX];
+    char szXptiDat[RTPATH_MAX];
+
+    int vrc = GetVBoxUserHomeDirectory(szCompReg, sizeof(szCompReg));
+    AssertRCReturn(vrc, NS_ERROR_FAILURE);
+    strcpy(szXptiDat, szCompReg);
+
+    vrc = RTPathAppend(szCompReg, sizeof(szCompReg), "compreg.dat");
+    AssertRCReturn(vrc, NS_ERROR_FAILURE);
+    vrc = RTPathAppend(szXptiDat, sizeof(szXptiDat), "xpti.dat");
+    AssertRCReturn(vrc, NS_ERROR_FAILURE);
+
+    LogFlowFunc(("component registry  : \"%s\"\n", szCompReg));
+    LogFlowFunc(("XPTI data file      : \"%s\"\n", szXptiDat));
 
 #if defined (XPCOM_GLUE)
-    XPCOMGlueStartup (nsnull);
+    XPCOMGlueStartup(nsnull);
 #endif
 
@@ -422 +428 @@
 
     /* Find out the directory where VirtualBox binaries are located */
-    for (size_t i = 0; i < RT_ELEMENTS (kAppPathsToProbe); ++ i)
-    {
-        char appHomeDir [RTPATH_MAX];
-        appHomeDir [RTPATH_MAX - 1] = '\0';
+    for (size_t i = 0; i < RT_ELEMENTS(kAppPathsToProbe); ++ i)
+    {
+        char szAppHomeDir[RTPATH_MAX];
 
         if (i == 0)
         {
             /* Use VBOX_APP_HOME if present */
-            if (!RTEnvExist ("VBOX_APP_HOME"))
+            vrc = RTEnvGetEx(RTENV_DEFAULT, "VBOX_APP_HOME", szAppHomeDir, sizeof(szAppHomeDir), NULL);
+            if (vrc == VERR_ENV_VAR_NOT_FOUND)
                 continue;
-
-            strncpy (appHomeDir, RTEnvGet ("VBOX_APP_HOME"), RTPATH_MAX - 1); /** @todo r=bird: Use RTEnvGetEx. */
+            AssertRC(vrc);
         }
         else if (i == 1)
         {
             /* Use RTPathAppPrivateArch() first */
-            vrc = RTPathAppPrivateArch (appHomeDir, sizeof (appHomeDir));
+            vrc = RTPathAppPrivateArch(szAppHomeDir, sizeof(szAppHomeDir));
             AssertRC (vrc);
-            if (RT_FAILURE(vrc))
-            {
-                rc = NS_ERROR_FAILURE;
-                continue;
-            }
         }
         else
         {
             /* Iterate over all other paths */
-            strncpy (appHomeDir, kAppPathsToProbe [i], RTPATH_MAX - 1);
-        }
-
-        nsCOMPtr <DirectoryServiceProvider> dsProv;
-
-        char compDir [RTPATH_MAX];
-        RTStrPrintf (compDir, sizeof (compDir), "%s%c%s",
-                     appHomeDir, RTPATH_DELIMITER, "components");
-        LogFlowFunc (("component directory : \"%s\"\n", compDir));
-
+            szAppHomeDir[RTPATH_MAX - 1] = '\0';
+            strncpy(szAppHomeDir, kAppPathsToProbe [i], RTPATH_MAX - 1);
+            vrc = VINF_SUCCESS;
+        }
+        if (RT_FAILURE(vrc))
+        {
+            rc = NS_ERROR_FAILURE;
+            continue;
+        }
+
+        char szCompDir[RTPATH_MAX];
+        vrc = RTPathAppend(strcpy(szCompDir, szAppHomeDir), sizeof(szCompDir), "components");
+        if (RT_FAILURE(vrc))
+        {
+            rc = NS_ERROR_FAILURE;
+            continue;
+        }
+        LogFlowFunc(("component directory : \"%s\"\n", szCompDir));
+
+        nsCOMPtr<DirectoryServiceProvider> dsProv;
         dsProv = new DirectoryServiceProvider();
         if (dsProv)
-            rc = dsProv->init (compReg, xptiDat, compDir, appHomeDir);
+            rc = dsProv->init(szCompReg, szXptiDat, szCompDir, szAppHomeDir);
         else
             rc = NS_ERROR_OUT_OF_MEMORY;
-        if (NS_FAILED (rc))
+        if (NS_FAILED(rc))
             break;
 
@@ -475 +485 @@
         {
             char *appDirCP = NULL;
-            vrc = RTStrUtf8ToCurrentCP (&appDirCP, appHomeDir);
+            vrc = RTStrUtf8ToCurrentCP(&appDirCP, szAppHomeDir);
             if (RT_SUCCESS(vrc))
             {
-                nsCOMPtr <nsILocalFile> file;
-                rc = NS_NewNativeLocalFile (nsEmbedCString (appDirCP),
-                                            PR_FALSE, getter_AddRefs (file));
+                nsCOMPtr<nsILocalFile> file;
+                rc = NS_NewNativeLocalFile(nsEmbedCString(appDirCP),
+                                           PR_FALSE, getter_AddRefs(file));
                 if (NS_SUCCEEDED(rc))
-                    appDir = do_QueryInterface (file, &rc);
-
-                RTStrFree (appDirCP);
+                    appDir = do_QueryInterface(file, &rc);
+
+                RTStrFree(appDirCP);
             }
             else
                 rc = NS_ERROR_FAILURE;
         }
-        if (NS_FAILED (rc))
+        if (NS_FAILED(rc))
             break;
 
         /* Set VBOX_XPCOM_HOME to the same app path to make XPCOM sources that
          * still use it instead of the directory service happy */
-        {
-            char *pathCP = NULL;
-            vrc = RTStrUtf8ToCurrentCP (&pathCP, appHomeDir);
-            if (RT_SUCCESS(vrc))
-            {
-                vrc = RTEnvSet ("VBOX_XPCOM_HOME", pathCP);
-                RTStrFree (pathCP);
-            }
-            AssertRC (vrc);
-        }
+        vrc = RTEnvSetEx(RTENV_DEFAULT, "VBOX_XPCOM_HOME", szAppHomeDir);
+        AssertRC(vrc);
 
         /* Finally, initialize XPCOM */
         {
-            nsCOMPtr <nsIServiceManager> serviceManager;
-            rc = NS_InitXPCOM2 (getter_AddRefs (serviceManager),
-                                appDir, dsProv);
-
+            nsCOMPtr<nsIServiceManager> serviceManager;
+            rc = NS_InitXPCOM2(getter_AddRefs(serviceManager), appDir, dsProv);
             if (NS_SUCCEEDED(rc))
             {
-                nsCOMPtr <nsIComponentRegistrar> registrar =
-                    do_QueryInterface (serviceManager, &rc);
+                nsCOMPtr<nsIComponentRegistrar> registrar =
+                    do_QueryInterface(serviceManager, &rc);
                 if (NS_SUCCEEDED(rc))
                 {
-                    rc = registrar->AutoRegister (nsnull);
+                    rc = registrar->AutoRegister(nsnull);
                     if (NS_SUCCEEDED(rc))
                     {
                         /* We succeeded, stop probing paths */
-                        LogFlowFunc (("Succeeded.\n"));
+                        LogFlowFunc(("Succeeded.\n"));
                         break;
                     }
@@ -529 +529 @@
 
         /* clean up before the new try */
-        rc = NS_ShutdownXPCOM (nsnull);
+        rc = NS_ShutdownXPCOM(nsnull);
 
         if (i == 0)
@@ -545 +545 @@
     util::InitAutoLockSystem();
 
-    AssertComRC (rc);
+    AssertComRC(rc);
 
     /*
      * Init the main event queue (ASSUMES it cannot fail).
      */
-    if (SUCCEEDED (rc))
+    if (SUCCEEDED(rc))
         EventQueue::init();
 
@@ -560 +560 @@
     HRESULT rc = S_OK;
 
-#if !defined (VBOX_WITH_XPCOM)
+#if !defined(VBOX_WITH_XPCOM)
 
     /* EventQueue::uninit reference counting fun. */
@@ -570 +570 @@
         {
             EventQueue::uninit();
-            ASMAtomicWriteHandle (&gCOMMainThread, NIL_RTTHREAD);
+            ASMAtomicWriteHandle(&gCOMMainThread, NIL_RTTHREAD);
         }
     }
@@ -578 +578 @@
 #else /* !defined (VBOX_WITH_XPCOM) */
 
-    nsCOMPtr <nsIEventQueue> eventQ;
-    rc = NS_GetMainEventQ (getter_AddRefs (eventQ));
+    nsCOMPtr<nsIEventQueue> eventQ;
+    rc = NS_GetMainEventQ(getter_AddRefs(eventQ));
 
     if (NS_SUCCEEDED(rc) || rc == NS_ERROR_NOT_AVAILABLE)
@@ -593 +593 @@
         if (NS_SUCCEEDED(rc))
         {
-            rc = eventQ->IsOnCurrentThread (&isOnMainThread);
+            rc = eventQ->IsOnCurrentThread(&isOnMainThread);
             eventQ = nsnull; /* early release before shutdown */
         }
@@ -606 +606 @@
             /* only the main thread needs to uninitialize XPCOM and only if
              * init counter drops to zero */
-            if (-- gXPCOMInitCount == 0)
+            if (--gXPCOMInitCount == 0)
             {
                 EventQueue::uninit();
-                rc = NS_ShutdownXPCOM (nsnull);
+                rc = NS_ShutdownXPCOM(nsnull);
 
                 /* This is a thread initialized XPCOM and set gIsXPCOMInitialized to
                  * true. Reset it back to false. */
-                bool wasInited = ASMAtomicXchgBool (&gIsXPCOMInitialized, false);
-                Assert (wasInited == true);
-                NOREF (wasInited);
-
-#if defined (XPCOM_GLUE)
+                bool wasInited = ASMAtomicXchgBool(&gIsXPCOMInitialized, false);
+                Assert(wasInited == true);
+                NOREF(wasInited);
+
+# if defined (XPCOM_GLUE)
                 XPCOMGlueShutdown();
-#endif
+# endif
             }
         }
     }
 
-#endif /* !defined (VBOX_WITH_XPCOM) */
-
-    AssertComRC (rc);
+#endif /* !defined(VBOX_WITH_XPCOM) */
+
+    AssertComRC(rc);
 
     return rc;

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -581 +581 @@
     int rc = VINF_SUCCESS;
     bool success = false;
+    char *pszFreeMe = RTEnvDupEx(RTENV_DEFAULT, pcszVar);
 
     try
     {
-        const char *pcszCurrent = RTEnvGet (pcszVar);
+        const char *pcszCurrent = pszFreeMe;
         while (pcszCurrent && *pcszCurrent != '\0')
         {
@@ -611 +612 @@
         rc = VERR_NO_MEMORY;
     }
-    LogFlowFunc (("rc=%Rrc, success=%d\n", rc, success));
+    RTStrFree(pszFreeMe);
+    LogFlowFunc(("rc=%Rrc, success=%d\n", rc, success));
     return rc;
 }