diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-09-16 11:40:10 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-16 11:40:10 -0400 |
commit | 13d551846accd4e3f2a4f5ab9a5c5ab461f8ed1b (patch) | |
tree | 083b8b14d59b71183aa3bb1942cf5c6ad0e36a7b /src/common/fs/fs.cpp | |
parent | c05ea35f78bd4de663bc022a7048e88d6ade594b (diff) | |
parent | 21ecf01a17c9936d11f86fdb8d7bbf5c5163441c (diff) |
Merge pull request #11499 from Squall-Leonhart/bitlockerfix
add std::error_code for std::filesystem exceptions
Diffstat (limited to 'src/common/fs/fs.cpp')
-rw-r--r-- | src/common/fs/fs.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/common/fs/fs.cpp b/src/common/fs/fs.cpp index 36e67c145..174aed49b 100644 --- a/src/common/fs/fs.cpp +++ b/src/common/fs/fs.cpp @@ -528,38 +528,41 @@ void IterateDirEntriesRecursively(const std::filesystem::path& path, // Generic Filesystem Operations bool Exists(const fs::path& path) { + std::error_code ec; #ifdef ANDROID if (Android::IsContentUri(path)) { return Android::Exists(path); } else { - return fs::exists(path); + return fs::exists(path, ec); } #else - return fs::exists(path); + return fs::exists(path, ec); #endif } bool IsFile(const fs::path& path) { + std::error_code ec; #ifdef ANDROID if (Android::IsContentUri(path)) { return !Android::IsDirectory(path); } else { - return fs::is_regular_file(path); + return fs::is_regular_file(path, ec); } #else - return fs::is_regular_file(path); + return fs::is_regular_file(path, ec); #endif } bool IsDir(const fs::path& path) { + std::error_code ec; #ifdef ANDROID if (Android::IsContentUri(path)) { return Android::IsDirectory(path); } else { - return fs::is_directory(path); + return fs::is_directory(path, ec); } #else - return fs::is_directory(path); + return fs::is_directory(path, ec); #endif } |