Changeset 49077 in vbox for trunk/src

Timestamp:

Oct 14, 2013 2:13:37 AM (11 years ago)

Author:

vboxsync

Message:

RTDbgSymCache: flat kext hack.

File:

• trunk/src/VBox/Runtime/tools/RTDbgSymCache.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/tools/RTDbgSymCache.cpp

@@ -665 +665 @@
                                             const char * const *papszSuffixes)
 {
-    int rc = RTPathAppend(pszPath, RTPATH_MAX, pszSubDir);
-    if (RT_SUCCESS(rc))
-    {
-        /* Strip off the bundle suffix. */
-        const char *pszEnd = &pszPath[cchPath + cchName];
-        for (unsigned i = 0; papszSuffixes[i]; i++)
-        {
-            Assert(papszSuffixes[i][0] == '.');
-            size_t cchSuff = strlen(papszSuffixes[i]);
-            if (   cchSuff < cchName
-                && !memcmp(&pszEnd[-(ssize_t)cchSuff], papszSuffixes[i], cchSuff))
-            {
-                cchName -= cchSuff;
-                break;
-            }
-        }
-
-        /* Add the name. */
-        rc = RTPathAppendEx(pszPath, RTPATH_MAX, &pszPath[cchPath], cchName);
-    }
-    if (RT_FAILURE(rc))
-    {
-        pszPath[cchPath + cchName] = '\0';
-        return RTMsgErrorRc(rc, "Error constructing image bundle path for '%s': %Rrc", pszPath, rc);
-    }
+    /*
+     * Calc the name without the bundle extension.
+     */
+    size_t const cchOrgName = cchName;
+    const char  *pszEnd     = &pszPath[cchPath + cchName];
+    for (unsigned i = 0; papszSuffixes[i]; i++)
+    {
+        Assert(papszSuffixes[i][0] == '.');
+        size_t cchSuff = strlen(papszSuffixes[i]);
+        if (   cchSuff < cchName
+            && !memcmp(&pszEnd[-(ssize_t)cchSuff], papszSuffixes[i], cchSuff))
+        {
+            cchName -= cchSuff;
+            break;
+        }
+    }
+
+    /*
+     * Check the immediate directory first, in case it's layed out like
+     * IOPCIFamily.kext.
+     */
+    int rc = RTPathAppendEx(pszPath, RTPATH_MAX, &pszPath[cchPath], cchName);
+    if (RT_FAILURE(rc) || !RTFileExists(pszPath))
+    {
+        /*
+         * Not there, ok then try the given subdirectory + name.
+         */
+        pszPath[cchPath + cchOrgName] = '\0';
+        rc = RTPathAppend(pszPath, RTPATH_MAX, pszSubDir);
+        if (RT_SUCCESS(rc))
+            rc = RTPathAppendEx(pszPath, RTPATH_MAX, &pszPath[cchPath], cchName);
+        if (RT_FAILURE(rc))
+        {
+            pszPath[cchPath + cchOrgName] = '\0';
+            return RTMsgErrorRc(rc, "Error constructing image bundle path for '%s': %Rrc", pszPath, rc);
+        }
+    }
+
     return VINF_SUCCESS;
 }