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

Timestamp:

Apr 20, 2009 2:09:04 PM (16 years ago)

Author:

vboxsync

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

46138

Message:

Main/cbindins,libvirt/*glue: Bought back g_szVBoxErrMsg and change the code to use vsnprintf as well as fixing a couple of the string length constraints. When compiling with libvirt, we won't set g_szVBoxErrMsg. Renamed szBuf to szName to make it easier to read.

Location:

trunk/src/VBox/Main/cbinding

Files:

• VBoxXPCOMCGlue.c (modified) (8 diffs)
• VBoxXPCOMCGlue.h (modified) (1 diff)
• tstXPCOMCCall.c (modified) (1 diff)
• tstXPCOMCGlue.c (modified) (1 diff)

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

@@ -32 +32 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef LIBVIRT_VERSION
-# include <config.h>
-#endif /* LIBVIRT_VERSION */
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <dlfcn.h>
 
@@ -64 +61 @@
 void *g_hVBoxXPCOMC = NULL;
 /** The last load error. */
+char g_szVBoxErrMsg[256];
+/** Pointer to the VBoxXPCOMC function table. */
 PCVBOXXPCOM g_pVBoxFuncs = NULL;
 /** Pointer to VBoxGetXPCOMCFunctions for the loaded VBoxXPCOMC so/dylib/dll. */
@@ -70 +69 @@
 
 /**
+ * Wrapper for setting g_szVBoxErrMsg. Can be an empty stub.
+ *
+ * @param   pszFormat       The format string.
+ * @param   ...             The arguments.
+ */
+static void setErrMsg(const char *pszFormat, ...)
+{
+    va_list va;
+    va_start(va, pszFormat);
+    vsnprintf(g_szVBoxErrMsg, sizeof(g_szVBoxErrMsg), pszFormat, va);
+    va_end(va);
+}
+
+
+/**
  * Try load VBoxXPCOMC.so/dylib/dll from the specified location and resolve all
  * the symbols we need.
  *
  * @returns 0 on success, -1 on failure.
- * @param   pszHome         The director where to try load VBoxXPCOMC from. Can be NULL.
- * @param   fSetAppHome     Whether to set the VBOX_APP_HOME env.var. or not (boolean).
+ * @param   pszHome         The director where to try load VBoxXPCOMC from. Can
+ *                          be NULL.
+ * @param   fSetAppHome     Whether to set the VBOX_APP_HOME env.var. or not
+ *                          (boolean).
  */
 static int tryLoadOne(const char *pszHome, int fSetAppHome)
@@ -81 +97 @@
     size_t      cchHome = pszHome ? strlen(pszHome) : 0;
     size_t      cbBufNeeded;
-    char        szBuf[4096];
+    char        szName[4096];
     int         rc = -1;
 
@@ -88 +104 @@
      */
     cbBufNeeded = cchHome + sizeof("/" DYNLIB_NAME);
-    if (cbBufNeeded > sizeof(szBuf))
-    {
+    if (cbBufNeeded > sizeof(szName))
+    {
+        setErrMsg("path buffer too small: %u bytes needed",
+                  (unsigned)cbBufNeeded);
         return -1;
     }
     if (cchHome)
     {
-        memcpy(szBuf, pszHome, cchHome);
-        szBuf[cchHome] = '/';
+        memcpy(szName, pszHome, cchHome);
+        szName[cchHome] = '/';
         cchHome++;
     }
-    memcpy(&szBuf[cchHome], DYNLIB_NAME, sizeof(DYNLIB_NAME));
+    memcpy(&szName[cchHome], DYNLIB_NAME, sizeof(DYNLIB_NAME));
 
     /*
@@ -111 +129 @@
             unsetenv("VBOX_APP_HOME");
     }
-    g_hVBoxXPCOMC = dlopen(szBuf, RTLD_NOW | RTLD_LOCAL);
+    g_hVBoxXPCOMC = dlopen(szName, RTLD_NOW | RTLD_LOCAL);
     if (g_hVBoxXPCOMC)
     {
@@ -123 +141 @@
             {
                 g_pfnGetFunctions = pfnGetFunctions;
-                rc = 0;
+                return 0;
             }
+
+            /* bail out */
+            setErrMsg("%.80s: pfnGetFunctions(%#x) failed",
+                      szName, VBOX_XPCOMC_VERSION);
         }
-        if (rc != 0)
-        {
-            dlclose(g_hVBoxXPCOMC);
-            g_hVBoxXPCOMC = NULL;
-        }
-    }
+        else
+            setErrMsg("dlsym(%.80s/%.32s): %.128s",
+                      szName, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, dlerror());
+        dlclose(g_hVBoxXPCOMC);
+        g_hVBoxXPCOMC = NULL;
+    }
+    else
+        setErrMsg("dlopen(%.80s): %.160s", szName, dlerror());
     return rc;
 }
@@ -204 +228 @@
     g_pVBoxFuncs = NULL;
     g_pfnGetFunctions = NULL;
-}
-
+    memset(g_szVBoxErrMsg, 0, sizeof(g_szVBoxErrMsg));
+}
+

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

@@ -41 +41 @@
 extern void *g_hVBoxXPCOMC;
 /** The last load error. */
+extern char g_szVBoxErrMsg[256];
+/** Pointer to the VBoxXPCOMC function table. */
 extern PCVBOXXPCOM g_pVBoxFuncs;
 /** Pointer to VBoxGetXPCOMCFunctions for the loaded VBoxXPCOMC so/dylib/dll. */

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

@@ -600 +600 @@
     if (VBoxCGlueInit() != 0)
     {
-        fprintf(stderr, "%s: FATAL: VBoxCGlueInit failed.\n", argv[0]);
+        fprintf(stderr, "%s: FATAL: VBoxCGlueInit failed: %s\n",
+                argv[0], g_szVBoxErrMsg);
         return EXIT_FAILURE;
     }

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

@@ -321 +321 @@
     if (VBoxCGlueInit() != 0)
     {
-        fprintf(stderr, "%s: FATAL: VBoxCGlueInit failed.\n", argv[0]);
+        fprintf(stderr, "%s: FATAL: VBoxCGlueInit failed: %s\n",
+                argv[0], g_szVBoxErrMsg);
         return EXIT_FAILURE;
     }