RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2026-07-21 03:05:26 -04:00
Code Issues Packages Projects Releases 10 Wiki Activity

[VFS] Add "expand tilde" argument to getRealPath.

Browse Source 
Add an optional argument to expand tildes in the path to mirror llvm's
implementation of the corresponding function.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@346453 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jonas Devlieghere
2018-11-09 00:26:10 +00:00
parent 8c1c568cf5
commit 053ebae379
3 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Support/VirtualFileSystem.cpp
+14 -13
View File
@@ -132,7 +132,8 @@ std::error_code FileSystem::makeAbsolute(SmallVectorImpl<char> &Path) const {
}
std::error_code FileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output) const {
SmallVectorImpl<char> &Output,
bool ExpandTilde) const {
return errc::operation_not_permitted;
}
@@ -238,8 +239,8 @@ public:
llvm::ErrorOr<std::string> getCurrentWorkingDirectory() const override;
std::error_code setCurrentWorkingDirectory(const Twine &Path) override;
std::error_code isLocal(const Twine &Path, bool &Result) override;
std::error_code getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output) const override;
std::error_code getRealPath(const Twine &Path, SmallVectorImpl<char> &Output,
bool ExpandTilde = false) const override;
private:
mutable std::mutex CWDMutex;
@@ -297,9 +298,9 @@ std::error_code RealFileSystem::isLocal(const Twine &Path, bool &Result) {
return llvm::sys::fs::is_local(Path, Result);
}
std::error_code
RealFileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output) const {
std::error_code RealFileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output,
bool ExpandTilde) const {
return llvm::sys::fs::real_path(Path, Output);
}
@@ -393,12 +394,12 @@ std::error_code OverlayFileSystem::isLocal(const Twine &Path, bool &Result) {
return errc::no_such_file_or_directory;
}
std::error_code
OverlayFileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output) const {
std::error_code OverlayFileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output,
bool ExpandTilde) const {
for (auto &FS : FSList)
if (FS->exists(Path))
return FS->getRealPath(Path, Output);
return FS->getRealPath(Path, Output, ExpandTilde);
return errc::no_such_file_or_directory;
}
@@ -916,9 +917,9 @@ std::error_code InMemoryFileSystem::setCurrentWorkingDirectory(const Twine &P) {
return {};
}
std::error_code
InMemoryFileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output) const {
std::error_code InMemoryFileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output,
bool ExpandTilde) const {
auto CWD = getCurrentWorkingDirectory();
if (!CWD || CWD->empty())
return errc::operation_not_permitted;