Changeset 49054 in vbox for trunk/src/VBox/Runtime

Timestamp:

Oct 11, 2013 2:31:27 PM (11 years ago)

Author:

vboxsync

Message:

Resolve the uuid mapping link, in case the caller doesn't know the filename.

File:

• trunk/src/VBox/Runtime/common/dbg/dbgcfg.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/dbg/dbgcfg.cpp

@@ -795 +795 @@
     }
 
-    size_t cchPath = strlen(pszPath);
-
     /*
      * If we got a UUID mapping option, try it first as we can hopefully
@@ -807 +805 @@
             && RTFileExists(pszPath))
         {
+            /* Try resolve the path before presenting it to the client, a
+               12 digit filename is of little worth. */
+            char szBackup[RTPATH_MAX];
+            strcpy(szBackup, pszPath);
+            rc = RTPathAbs(szBackup, pszPath, RTPATH_MAX);
+            if (RT_FAILURE(rc))
+                strcpy(pszPath, szBackup);
+
+            /* Do the callback thing. */
             rtDbgCfgLog1(pThis, "Trying '%s'...\n", pszPath);
             int rc2 = pfnCallback(pThis, pszPath, pvUser1, pvUser2);
             if (rc2 == VINF_CALLBACK_RETURN)
-                rtDbgCfgLog1(pThis, "Found '%s'.\n", pszPath);
+                rtDbgCfgLog1(pThis, "Found '%s' via uuid mapping.\n", pszPath);
             else if (rc2 == VERR_CALLBACK_RETURN)
                 rtDbgCfgLog1(pThis, "Error opening '%s'.\n", pszPath);
@@ -817 +824 @@
             if (rc2 == VINF_CALLBACK_RETURN || rc2 == VERR_CALLBACK_RETURN)
                 return rc2;
+
+            /* Failed, restore the cache path. */
+            memcpy(pszPath, szBackup, cchCachePath);
         }
         pszPath[cchCachePath] = '\0';