mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-19 11:02:59 +02:00
[VFS] Add "expand tilde" argument to getRealPath.
Add an optional argument to expand tildes in the path to mirror llvm's implementation of the corresponding function. llvm-svn: 346453
This commit is contained in:
parent
f2727f2785
commit
94677b4b80
@ -274,7 +274,8 @@ public:
|
||||
/// symlinks. For real file system, this uses `llvm::sys::fs::real_path`.
|
||||
/// This returns errc::operation_not_permitted if not implemented by subclass.
|
||||
virtual std::error_code getRealPath(const Twine &Path,
|
||||
SmallVectorImpl<char> &Output) const;
|
||||
SmallVectorImpl<char> &Output,
|
||||
bool ExpandTilde = false) const;
|
||||
|
||||
/// Check whether a file exists. Provided for convenience.
|
||||
bool exists(const Twine &Path);
|
||||
@ -330,8 +331,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;
|
||||
|
||||
using iterator = FileSystemList::reverse_iterator;
|
||||
using const_iterator = FileSystemList::const_reverse_iterator;
|
||||
@ -370,9 +371,9 @@ public:
|
||||
std::error_code setCurrentWorkingDirectory(const Twine &Path) override {
|
||||
return FS->setCurrentWorkingDirectory(Path);
|
||||
}
|
||||
std::error_code getRealPath(const Twine &Path,
|
||||
SmallVectorImpl<char> &Output) const override {
|
||||
return FS->getRealPath(Path, Output);
|
||||
std::error_code getRealPath(const Twine &Path, SmallVectorImpl<char> &Output,
|
||||
bool ExpandTilde = false) const override {
|
||||
return FS->getRealPath(Path, Output, ExpandTilde);
|
||||
}
|
||||
|
||||
protected:
|
||||
@ -465,8 +466,8 @@ public:
|
||||
///
|
||||
/// This doesn't resolve symlinks as they are not supported in in-memory file
|
||||
/// system.
|
||||
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;
|
||||
std::error_code isLocal(const Twine &Path, bool &Result) override;
|
||||
std::error_code setCurrentWorkingDirectory(const Twine &Path) override;
|
||||
};
|
||||
|
@ -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;
|
||||
|
@ -73,8 +73,8 @@ public:
|
||||
return std::error_code();
|
||||
}
|
||||
// Map any symlink to "/symlink".
|
||||
std::error_code getRealPath(const Twine &Path,
|
||||
SmallVectorImpl<char> &Output) const override {
|
||||
std::error_code getRealPath(const Twine &Path, SmallVectorImpl<char> &Output,
|
||||
bool ExpandTilde) const override {
|
||||
auto I = FilesAndDirs.find(Path.str());
|
||||
if (I == FilesAndDirs.end())
|
||||
return make_error_code(llvm::errc::no_such_file_or_directory);
|
||||
|
Loading…
Reference in New Issue
Block a user