maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Sean Silva 2015-07-30 00:52:32 +00:00
parent ba46a47e07
commit 3e36e507ec
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/FileManager.h
View File

@ -267,7 +267,7 @@ public:
time_t ModificationTime);
/// \brief Remove any './' components from a path.
static bool removeDotPaths(SmallVectorImpl<char> &Path);
static bool removeDotPaths(SmallVectorImpl<char> &Path, bool RemoveDotDot = false);
/// \brief Retrieve the canonical name for a given directory.
///

14
clang/lib/Basic/FileManager.cpp
View File

@ -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<char> &Path) {
bool FileManager::removeDotPaths(SmallVectorImpl<char> &Path, bool RemoveDotDot) {
using namespace llvm::sys;
SmallVector<StringRef, 16> ComponentStack;
@ -528,10 +528,12 @@ bool FileManager::removeDotPaths(SmallVectorImpl<char> &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<char>(CanonicalNameBuf.size());
memcpy(Mem, CanonicalNameBuf.data(), CanonicalNameBuf.size());
CanonicalName = StringRef(Mem, CanonicalNameBuf.size());