Change the PathMappingList::FindFile to use FileSpec API's
Also, when appending path components, collapse multiple "/" into one at the join.
llvm-svn: 279533
diff --git a/lldb/source/Host/common/FileSpec.cpp b/lldb/source/Host/common/FileSpec.cpp
index 53c0ab4..62117b78 100644
--- a/lldb/source/Host/common/FileSpec.cpp
+++ b/lldb/source/Host/common/FileSpec.cpp
@@ -1552,6 +1552,9 @@
stream.PutChar(GetPrefferedPathSeparator(m_syntax));
}
+ while (IsPathSeparator(new_path[0], m_syntax))
+ new_path++;
+
stream.PutCString(new_path);
const bool resolve = false;
diff --git a/lldb/source/Target/PathMappingList.cpp b/lldb/source/Target/PathMappingList.cpp
index 7bb86d9..bc1334a 100644
--- a/lldb/source/Target/PathMappingList.cpp
+++ b/lldb/source/Target/PathMappingList.cpp
@@ -224,6 +224,7 @@
for (const auto& it : m_pairs)
{
+ // FIXME: This should be using FileSpec API's to do the path appending.
const size_t prefixLen = it.second.GetLength();
if (::strncmp (it.second.GetCString(), path_cstr, prefixLen) == 0)
{
@@ -242,7 +243,6 @@
if (!m_pairs.empty())
{
char orig_path[PATH_MAX];
- char new_path[PATH_MAX];
const size_t orig_path_len = orig_spec.GetPath (orig_path, sizeof(orig_path));
if (orig_path_len > 0)
{
@@ -255,13 +255,10 @@
{
if (::strncmp (pos->first.GetCString(), orig_path, prefix_len) == 0)
{
- const size_t new_path_len = snprintf(new_path, sizeof(new_path), "%s/%s", pos->second.GetCString(), orig_path + prefix_len);
- if (new_path_len < sizeof(new_path))
- {
- new_spec.SetFile (new_path, true);
- if (new_spec.Exists())
- return true;
- }
+ new_spec.SetFile(pos->second.GetCString(), false);
+ new_spec.AppendPathComponent(orig_path+prefix_len);
+ if (new_spec.Exists())
+ return true;
}
}
}