Fix issue #53: wrong file path returned under Windows when reaching a breakpoint.

Author: Vincent Couvert

src/MICmnLLDBDebugSessionInfo.cpp

@@ -28,6 +28,14 @@
 #include "MICmnResources.h"
 #include "Platform.h"
 
+// Paths separators
+#ifdef _WIN32
+#define PATH_SEPARATOR "\\"
+#else
+#define PATH_SEPARATOR "/"
+#endif // _WIN32
+#define RETURNED_PATH_SEPARATOR "/"
+
 //++
 // Details: CMICmnLLDBDebugSessionInfo constructor.
 // Type:    Method.
@@ -283,21 +291,31 @@ bool CMICmnLLDBDebugSessionInfo::ResolvePath(const CMIUtilString &vstrUnknown,
   bool bOk = MIstatus::success;
 
   CMIUtilString::VecString_t vecPathFolders;
-  const MIuint nSplits = vwrResolvedPath.Split("/", vecPathFolders);
+  const MIuint nSplits = vwrResolvedPath.Split(PATH_SEPARATOR, vecPathFolders);
   MIunused(nSplits);
   MIuint nFoldersBack = 1; // 1 is just the file (last element of vector)
+  CMIUtilString strTestPath;
   while (bOk && (vecPathFolders.size() >= nFoldersBack)) {
-    CMIUtilString strTestPath;
     MIuint nFoldersToAdd = nFoldersBack;
+    strTestPath = "";
     while (nFoldersToAdd > 0) {
-      strTestPath += "/";
+      strTestPath += RETURNED_PATH_SEPARATOR;
       strTestPath += vecPathFolders[vecPathFolders.size() - nFoldersToAdd];
       nFoldersToAdd--;
     }
     bool bYesAccessible = false;
     bOk = AccessPath(strTestPath, bYesAccessible);
     if (bYesAccessible) {
-      vwrResolvedPath = strTestPath;
+#ifdef _WIN32
+      if (nFoldersBack == (vecPathFolders.size() - 1)) {
+        // First folder is probably a Windows drive letter ==> must be returned
+        vwrResolvedPath = vecPathFolders[0] + strTestPath;
+      } else {
+#endif
+        vwrResolvedPath = strTestPath;
+#ifdef _WIN32
+      }
+#endif
       return MIstatus::success;
     } else
       nFoldersBack++;
@@ -306,6 +324,11 @@ bool CMICmnLLDBDebugSessionInfo::ResolvePath(const CMIUtilString &vstrUnknown,
   // No files exist in the union of working directory and debuginfo path
   // Simply use the debuginfo path and let the IDE handle it.
 
+#ifdef _WIN32 // Under Windows we must returned vwrResolvedPath to replace "\\"
+              // by "/"
+  vwrResolvedPath = strTestPath;
+#endif
+
   return bOk;
 }