From 70e0cbb3ed7c66dfc1c8ace91e86c8777aa045ce Mon Sep 17 00:00:00 2001 From: Chaoren Lin Date: Tue, 19 May 2015 23:11:58 +0000 Subject: Remove trailing slash from dumping directory FileSpec. Reviewers: domipheus, ovyalov Reviewed By: ovyalov Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D9862 llvm-svn: 237741 --- lldb/source/Host/common/FileSpec.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lldb/source/Host/common/FileSpec.cpp') diff --git a/lldb/source/Host/common/FileSpec.cpp b/lldb/source/Host/common/FileSpec.cpp index 062cdcd98b4..7f0407578e1 100644 --- a/lldb/source/Host/common/FileSpec.cpp +++ b/lldb/source/Host/common/FileSpec.cpp @@ -609,12 +609,13 @@ FileSpec::RemoveBackupDots (const ConstString &input_const_str, ConstString &res // directory delimiter, and the filename. //------------------------------------------------------------------ void -FileSpec::Dump(Stream *s) const +FileSpec::Dump(Stream *s, bool trailing_slash) const { if (s) { m_directory.Dump(s); - if (m_directory && m_directory.GetStringRef().back() != '/') + if ((m_filename || trailing_slash) && m_directory && + !m_directory.GetStringRef().endswith("/")) s->PutChar('/'); m_filename.Dump(s); } @@ -816,7 +817,7 @@ void FileSpec::GetPath(llvm::SmallVectorImpl &path, bool denormalize) const { StreamString stream; - Dump(&stream); + Dump(&stream, false); path.append(stream.GetString().begin(), stream.GetString().end()); Normalize(path, m_syntax); if (denormalize && !path.empty()) -- cgit v1.2.3