Changeset 18871 in vbox

Timestamp:

Apr 11, 2009 9:38:59 PM (16 years ago)

Author:

vboxsync

Message:

VBoxXPCOMCGlue.c: Use parameters for passing stuff down to the worker function, not globals, plz. (untested)

File:

• trunk/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c (modified) (7 diffs)

trunk/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c

@@ -69 +69 @@
 /** Pointer to VBoxGetXPCOMCFunctions for the loaded VBoxXPCOMC so/dylib/dll. */
 PFNVBOXGETXPCOMCFUNCTIONS g_pfnGetFunctions = NULL;
-/** boolean for checking if the VBOX_APP_HOME is already set by the users */
-int g_bVAHSet = 0;
 
 
@@ -79 +77 @@
  * @returns 0 on success, -1 on failure.
  * @param   pszHome         The director where to try load VBoxXPCOMC from. Can be NULL.
- */
-static int tryLoadOne(const char *pszHome)
+ * @param   fSetAppHome     Whether to set the VBOX_APP_HOME env.var. or not (boolean).
+ */
+static int tryLoadOne(const char *pszHome, int fSetAppHome)
 {
     size_t      cchHome = pszHome ? strlen(pszHome) : 0;
-    size_t      cbReq;
+    size_t      cbBufNeeded;
     char        szBuf[4096];
     int         rc = -1;
@@ -90 +89 @@
      * Construct the full name.
      */
-    cbReq = cchHome + sizeof("/" DYNLIB_NAME);
-    if (cbReq > sizeof(szBuf))
-    {
-        sprintf(g_szVBoxErrMsg, "path buffer too small: %u bytes required", (unsigned)cbReq);
+    cbBufNeeded = cchHome + sizeof("/" DYNLIB_NAME);
+    if (cbBufNeeded > sizeof(szBuf))
+    {
+        sprintf(g_szVBoxErrMsg, "path buffer too small: %u bytes needed", (unsigned)cbBufNeeded);
         return -1;
     }
-    memcpy(szBuf, pszHome, cchHome);
-    szBuf[cchHome] = '/';
-    cchHome++;
+    if (cchHome)
+    {
+        memcpy(szBuf, pszHome, cchHome);
+        szBuf[cchHome] = '/';
+        cchHome++;
+    }
     memcpy(&szBuf[cchHome], DYNLIB_NAME, sizeof(DYNLIB_NAME));
 
@@ -105 +107 @@
      * Then resolve and call the function table getter.
      */
-    if (!g_bVAHSet)
-    {
-        /* Override it as we know that user didn't set it
-         * and that we only did it in previous iteration
-         */
-        setenv("VBOX_APP_HOME", pszHome, 1);
+    if (fSetAppHome)
+    {
+        if (pszHome)
+            setenv("VBOX_APP_HOME", pszHome, 1 /* always override */);
+        else
+            unsetenv("VBOX_APP_HOME");
     }
     g_hVBoxXPCOMC = dlopen(szBuf, RTLD_NOW | RTLD_LOCAL);
@@ -163 +165 @@
     const char *pszHome = getenv("VBOX_APP_HOME");
     if (pszHome)
-    {
-        g_bVAHSet = 1;
-        return tryLoadOne(pszHome);
-    }
+        return tryLoadOne(pszHome, 0);
 
     /*
@@ -172 +171 @@
      */
 #if defined(__gnu__linux__) || defined(__linux__)
-    if (tryLoadOne("/opt/VirtualBox") == 0)
-        return 0;
-    if (tryLoadOne("/usr/lib/virtualbox") == 0)
+    if (tryLoadOne("/opt/VirtualBox", 1) == 0)
+        return 0;
+    if (tryLoadOne("/usr/lib/virtualbox", 1) == 0)
         return 0;
 #elif defined(__sun__)
-    if (tryLoadOne("/opt/VirtualBox/amd64") == 0)
-        return 0;
-    if (tryLoadOne("/opt/VirtualBox/i386") == 0)
+    if (tryLoadOne("/opt/VirtualBox/amd64", 1) == 0)
+        return 0;
+    if (tryLoadOne("/opt/VirtualBox/i386", 1) == 0)
         return 0;
 #elif defined(__APPLE__)
-    if (tryLoadOne("/Application/VirtualBox.app/Contents/MacOS") == 0)
+    if (tryLoadOne("/Application/VirtualBox.app/Contents/MacOS", 1) == 0)
         return 0;
 #else
@@ -191 +190 @@
      * Finally try the dynamic linker search path.
      */
-    if (tryLoadOne(NULL) == 0)
+    if (tryLoadOne(NULL, 1) == 0)
         return 0;