Changeset 1354 in vbox for trunk

Timestamp:

Mar 9, 2007 9:39:20 AM (18 years ago)

Author:

vboxsync

Message:

Make it possible to move shared libs from /opt/VirtualBox-xxx to /usr/lib as required for Mandriva packages. Make it possible to move runtime modules to /usr/lib/virtualbox.

Location:

trunk/src/VBox/VMM

Files:

• PDMDevice.cpp (modified) (2 diffs)
• PDMDriver.cpp (modified) (1 diff)
• PDMInternal.h (modified) (1 diff)
• PDMLdr.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -573 +573 @@
     {
         /* make filename */
-        char *pszFilename = pdmR3FileR3("VBoxDD");
+        char *pszFilename = pdmR3FileR3("VBoxDD", /*fShared=*/true);
         if (!pszFilename)
             return VERR_NO_TMP_MEMORY;
@@ -582 +582 @@
 
         /* make filename */
-        pszFilename = pdmR3FileR3("VBoxDD2");
+        pszFilename = pdmR3FileR3("VBoxDD2", /*fShared=*/true);
         if (!pszFilename)
             return VERR_NO_TMP_MEMORY;

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -204 +204 @@
     {
         /* make filename */
-        char *pszFilename = pdmR3FileR3("VBoxDD");
+        char *pszFilename = pdmR3FileR3("VBoxDD", /*fShared=*/true);
         if (!pszFilename)
             return VERR_NO_TMP_MEMORY;

trunk/src/VBox/VMM/PDMInternal.h

@@ -724 +724 @@
 int         pdmR3LdrInit(PVM pVM);
 void        pdmR3LdrTerm(PVM pVM);
-char *      pdmR3FileR3(const char *pszFile);
+char *      pdmR3FileR3(const char *pszFile, bool fShared=false);
 int         pdmR3LoadR3(PVM pVM, const char *pszFilename, const char *pszName);
 

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -67 +67 @@
 static char *   pdmR3FileGC(const char *pszFile);
 static char *   pdmR3FileR0(const char *pszFile);
-static char *   pdmR3File(const char *pszFile, const char *pszDefaultExt);
+static char *   pdmR3File(const char *pszFile, const char *pszDefaultExt, bool fShared);
 static DECLCALLBACK(int) pdmR3QueryModFromEIPEnumSymbols(RTLDRMOD hLdrMod, const char *pszSymbol, unsigned uSymbol, RTUINTPTR Value, void *pvUser);
 
@@ -834 +834 @@
  * @todo    We'll have this elsewhere than in the root later!
  */
-char *pdmR3FileR3(const char *pszFile)
-{
-    return pdmR3File(pszFile, NULL);
+char *pdmR3FileR3(const char *pszFile, bool fShared)
+{
+    return pdmR3File(pszFile, NULL, fShared);
 }
 
@@ -851 +851 @@
 char * pdmR3FileR0(const char *pszFile)
 {
-    return pdmR3File(pszFile, NULL);
+    return pdmR3File(pszFile, NULL, /*fShared=*/false);
 }
 
@@ -866 +866 @@
 char * pdmR3FileGC(const char *pszFile)
 {
-    return pdmR3File(pszFile, NULL);
-}
-
+    return pdmR3File(pszFile, NULL, /*fShared=*/false);
+}
+
+/**
+ * Worker for pdmR3File().
+ *
+ * @returns Pointer to temporary memory containing the filename.
+ *          Caller must free this using RTMemTmpFree().
+ * @returns NULL on failure.
+ * @param   pszDir        Directory part
+ * @param   pszFile       File name part
+ * @param   pszDefaultExt Extension part
+ */
+static char * pdmR3FileConstruct(const char *pszDir, const char *pszFile, const char *pszDefaultExt)
+{
+    /*
+     * Allocate temp memory for return buffer.
+     */
+    unsigned cchDir  = strlen(pszDir);
+    unsigned cchFile = strlen(pszFile);
+    unsigned cchDefaultExt;
+
+    /*
+     * Default extention?
+     */
+    if (!pszDefaultExt || strchr(pszFile, '.'))
+        cchDefaultExt = 0;
+    else
+        cchDefaultExt = strlen(pszDefaultExt);
+
+    unsigned cchPath = cchDir + 1 + cchFile + cchDefaultExt + 1;
+    if (cchPath > RTPATH_MAX)
+    {
+        AssertMsgFailed("Path too long!\n");
+        return NULL;
+    }
+
+    char *pszRet = (char *)RTMemTmpAlloc(cchDir + 1 + cchFile + cchDefaultExt + 1);
+    if (!pszRet)
+    {
+        AssertMsgFailed(("Out of temporary memory!\n"));
+        return NULL;
+    }
+
+    /*
+     * Construct the filename.
+     */
+    memcpy(pszRet, pszDir, cchDir);
+    pszRet[cchDir++] = '/';            /* this works everywhere */
+    memcpy(pszRet + cchDir, pszFile, cchFile + 1);
+    if (cchDefaultExt)
+        memcpy(pszRet + cchDir + cchFile, pszDefaultExt, cchDefaultExt + 1);
+
+    return pszRet;
+}
 
 /**
@@ -878 +930 @@
  * @param   pszFile         File name (no path).
  * @param   pszDefaultExt   The default extention, NULL if none.
+ * @param   fShared         If true, search in the shared directory (/usr/lib on Unix), else
+ *                          search in the private directory (/usr/lib/virtualbox on Unix).
+ *                          Ignored if VBOX_PATH_SHARED_LIBS is not defined.
  * @todo    We'll have this elsewhere than in the root later!
- */
-static char * pdmR3File(const char *pszFile, const char *pszDefaultExt)
-{
-    /*
-     * Default extention?
-     */
-    unsigned cchDefaultExt;
-    if (!pszDefaultExt || strchr(pszFile, '.'))
-        cchDefaultExt = 0;
-    else
-        cchDefaultExt = strlen(pszDefaultExt);
-
-    /*
-     * Query program path.
-     */
-    unsigned    cchFile = strlen(pszFile);
-    char        szPath[RTPATH_MAX];
-    int rc = RTPathProgram(szPath, sizeof(szPath) - cchFile - cchDefaultExt - 1);
+ * @todo    Remove the fShared hack again once we don't need to link against VBoxDD anymore!
+ */
+static char * pdmR3File(const char *pszFile, const char *pszDefaultExt, bool fShared)
+{
+    char    *pszRet;
+
+#ifdef VBOX_PATH_PRIVATE_LIBS
+
+    /*
+     * Unix: Search in /usr/lib/virtualbox
+     */
+    pszRet = pdmR3FileConstruct(
+# ifdef VBOX_PATH_SHARED_LIBS
+                                fShared ? VBOX_PATH_SHARED_LIBS : VBOX_PATH_PRIVATE_LIBS,
+# else
+                                VBOX_PATH_PRIVATE_LIBS,
+# endif
+                                pszFile, pszDefaultExt);
+
+#else
+
+    NOREF(fShared);
+
+    /*
+     * Default: Search in the program path.
+     */
+    char     szPath[RTPATH_MAX];
+    int rc = RTPathProgram(szPath, sizeof(szPath));
     if (!VBOX_SUCCESS(rc))
     {
@@ -903 +968 @@
     }
 
-    /*
-     * Allocate temp memory for return buffer.
-     */
-    unsigned cch = strlen(szPath);
-    char *pszRet = (char *)RTMemTmpAlloc(cch + 1 + cchFile + cchDefaultExt + 1);
-    if (!pszRet)
-    {
-        AssertMsgFailed(("Out of temporary memory!\n"));
-        return NULL;
-    }
-
-    /*
-     * Construct the filename.
-     */
-    memcpy(pszRet, szPath, cch);
-    pszRet[cch++] = '/';            /* this works everywhere */
-    memcpy(pszRet + cch, pszFile, cchFile + 1);
-    if (cchDefaultExt)
-        memcpy(pszRet + cch + cchFile, pszDefaultExt, cchDefaultExt + 1);
+    pszRet = pdmR3FileConstruct(szPath, pszFile, pszDefaultExt);
+
+#endif
+
     return pszRet;
 }