Changeset 18853 in vbox

Timestamp:

Apr 9, 2009 8:16:16 AM (16 years ago)

Author:

vboxsync

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

45868

Message:

VBoxXPCOMGlue: fixed a bug in path detection logic

File:

• trunk/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c (modified) (3 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;
 
 
@@ -103 +105 @@
      * Then resolve and call the function table getter.
      */
-    setenv("VBOX_APP_HOME", pszHome, 0 /* no need to overwrite */);
+    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);
+    }
     g_hVBoxXPCOMC = dlopen(szBuf, RTLD_NOW | RTLD_LOCAL);
     if (g_hVBoxXPCOMC)
@@ -155 +163 @@
     const char *pszHome = getenv("VBOX_APP_HOME");
     if (pszHome)
+    {
+        g_bVAHSet = 1;
         return tryLoadOne(pszHome);
+    }
 
     /*