diff options
| -rw-r--r-- | lldb/source/Host/common/FileSpec.cpp | 3 | ||||
| -rw-r--r-- | lldb/source/Target/PathMappingList.cpp | 13 | ||||
| -rw-r--r-- | lldb/unittests/Host/FileSpecTest.cpp | 6 |
3 files changed, 14 insertions, 8 deletions
diff --git a/lldb/source/Host/common/FileSpec.cpp b/lldb/source/Host/common/FileSpec.cpp index 53c0ab40e67..62117b78f06 100644 --- a/lldb/source/Host/common/FileSpec.cpp +++ b/lldb/source/Host/common/FileSpec.cpp @@ -1552,6 +1552,9 @@ FileSpec::AppendPathComponent(const char *new_path) 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 7bb86d9d895..bc1334aca46 100644 --- a/lldb/source/Target/PathMappingList.cpp +++ b/lldb/source/Target/PathMappingList.cpp @@ -224,6 +224,7 @@ PathMappingList::ReverseRemapPath (const ConstString &path, ConstString &new_pat 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 @@ PathMappingList::FindFile (const FileSpec &orig_spec, FileSpec &new_spec) const 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 @@ PathMappingList::FindFile (const FileSpec &orig_spec, FileSpec &new_spec) const { 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; } } } diff --git a/lldb/unittests/Host/FileSpecTest.cpp b/lldb/unittests/Host/FileSpecTest.cpp index 4e619529773..522f4bc69ea 100644 --- a/lldb/unittests/Host/FileSpecTest.cpp +++ b/lldb/unittests/Host/FileSpecTest.cpp @@ -69,6 +69,12 @@ TEST(FileSpecTest, AppendPathComponent) EXPECT_STREQ("/foo", fs_posix.GetDirectory().GetCString()); EXPECT_STREQ("bar", fs_posix.GetFilename().GetCString()); + FileSpec fs_posix_2("/foo", false, FileSpec::ePathSyntaxPosix); + fs_posix_2.AppendPathComponent("//bar/baz"); + EXPECT_STREQ("/foo/bar/baz", fs_posix_2.GetCString()); + EXPECT_STREQ("/foo/bar", fs_posix_2.GetDirectory().GetCString()); + EXPECT_STREQ("baz", fs_posix_2.GetFilename().GetCString()); + FileSpec fs_windows("F:\\bar", false, FileSpec::ePathSyntaxWindows); fs_windows.AppendPathComponent("baz"); EXPECT_STREQ("F:\\bar\\baz", fs_windows.GetCString()); |
