Changeset 11781 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Aug 28, 2008 6:34:38 PM (16 years ago)

Author:

vboxsync

Message:

VBoxHDD-new: Prepend library path to plugin name to fix plugin detection on MacOS X

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -182 +182 @@
     if (!pBackend)
     {
+        char szSharedLibPath[RTPATH_MAX];
         char *pszPluginName;
 
+        rc = RTPathSharedLibs(szSharedLibPath, sizeof(szSharedLibPath));
+        if (RT_FAILURE(rc))
+            return rc;
+
         /* HDD Format Plugins have VBoxHDD as prefix, prepend it. */
-        RTStrAPrintf(&pszPluginName, "%s%s",
-                     VBOX_HDDFORMAT_PLUGIN_PREFIX, pszBackend);
+        RTStrAPrintf(&pszPluginName, "%s/%s%s",
+                     szSharedLibPath, VBOX_HDDFORMAT_PLUGIN_PREFIX, pszBackend);
         if (!pszPluginName)
         {
@@ -193 +198 @@
         }
 
-        /* Try to load the plugin (RTldrLoad takes care of the suffix). */
+        /* Try to load the plugin (RTLdrLoad takes care of the suffix). */
         rc = RTLdrLoad(pszPluginName, &hPlugin);
         if (RT_SUCCESS(rc))
@@ -699 +704 @@
             PFNVBOXHDDFORMATLOAD pfnHDDFormatLoad = NULL;
             PVBOXHDDBACKEND pBackend = NULL;
+            char *pszPluginPath = NULL;
 
             if (rc == VERR_BUFFER_OVERFLOW)
@@ -717 +723 @@
                 continue;
 
-            rc = RTLdrLoad(pPluginDirEntry->szName, &hPlugin);
+            /* Prepend the path to the libraries. */
+            rc = RTStrAPrintf(&pszPluginPath, "%s/%s", szPath, pPluginDirEntry->szName);
+            if (RT_FAILURE(rc))
+            {
+                rc = VERR_NO_MEMORY;
+                break;
+            }
+
+            rc = RTLdrLoad(pszPluginPath, &hPlugin);
             if (RT_SUCCESS(rc))
             {
@@ -757 +771 @@
                 RTLdrClose(hPlugin);
             }
+            RTStrFree(pszPluginPath);
         }
         if (rc == VERR_NO_MORE_FILES)
@@ -947 +962 @@
             PFNVBOXHDDFORMATLOAD pfnHDDFormatLoad = NULL;
             PVBOXHDDBACKEND pBackend = NULL;
+            char *pszPluginPath = NULL;
 
             if (rc == VERR_BUFFER_OVERFLOW)
@@ -965 +981 @@
                 continue;
 
-            rc = RTLdrLoad(pPluginDirEntry->szName, &hPlugin);
+            /* Prepend the path to the libraries. */
+            rc = RTStrAPrintf(&pszPluginPath, "%s/%s", szPath, pPluginDirEntry->szName);
+            if (RT_FAILURE(rc))
+            {
+                rc = VERR_NO_MEMORY;
+                break;
+            }
+
+            rc = RTLdrLoad(pszPluginPath, &hPlugin);
             if (RT_SUCCESS(rc))
             {
@@ -1009 +1033 @@
                 RTLdrClose(hPlugin);
             }
+            RTStrFree(pszPluginPath);
 
             /*