From 3e36e507ec21c6777d4a26880f49022ff0dd7836 Mon Sep 17 00:00:00 2001 From: Sean Silva Date: Thu, 30 Jul 2015 00:52:32 +0000 Subject: Attempt to make clang-x64-ninja-win7 happy. It looks like we were somehow relying somewhere on removing 'foo/./bar' but *not* 'foo/../foo/bar'. Currently investigating. llvm-svn: 243600 --- clang/lib/Basic/FileManager.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'clang/lib/Basic/FileManager.cpp') diff --git a/clang/lib/Basic/FileManager.cpp b/clang/lib/Basic/FileManager.cpp index 3d160569bc8..209abad6567 100644 --- a/clang/lib/Basic/FileManager.cpp +++ b/clang/lib/Basic/FileManager.cpp @@ -517,7 +517,7 @@ void FileManager::modifyFileEntry(FileEntry *File, /// Remove '.' and '..' path components from the given absolute path. /// \return \c true if any changes were made. // FIXME: Move this to llvm::sys::path. -bool FileManager::removeDotPaths(SmallVectorImpl &Path) { +bool FileManager::removeDotPaths(SmallVectorImpl &Path, bool RemoveDotDot) { using namespace llvm::sys; SmallVector ComponentStack; @@ -528,10 +528,12 @@ bool FileManager::removeDotPaths(SmallVectorImpl &Path) { for (StringRef C : llvm::make_range(path::begin(Rel), path::end(Rel))) { if (C == ".") continue; - if (C == "..") { - if (!ComponentStack.empty()) - ComponentStack.pop_back(); - continue; + if (RemoveDotDot) { + if (C == "..") { + if (!ComponentStack.empty()) + ComponentStack.pop_back(); + continue; + } } ComponentStack.push_back(C); } @@ -566,7 +568,7 @@ StringRef FileManager::getCanonicalName(const DirectoryEntry *Dir) { SmallString<256> CanonicalNameBuf(CanonicalName); llvm::sys::fs::make_absolute(CanonicalNameBuf); llvm::sys::path::native(CanonicalNameBuf); - removeDotPaths(CanonicalNameBuf); + removeDotPaths(CanonicalNameBuf, true); char *Mem = CanonicalNameStorage.Allocate(CanonicalNameBuf.size()); memcpy(Mem, CanonicalNameBuf.data(), CanonicalNameBuf.size()); CanonicalName = StringRef(Mem, CanonicalNameBuf.size()); -- cgit v1.2.3