yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #11499 from Squall-Leonhart/bitlockerfix 

add std::error_code for std::filesystem exceptions
This commit is contained in:
liamwhite 2023-09-16 11:40:10 -04:00 committed by GitHub
parent c05ea35f78 21ecf01a17
commit 13d551846a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/fs/fs.cpp
View File

@ -528,38 +528,41 @@ void IterateDirEntriesRecursively(const std::filesystem::path& path,
// Generic Filesystem Operations // Generic Filesystem Operations
bool Exists(const fs::path& path) { bool Exists(const fs::path& path) {
std::error_code ec;
#ifdef ANDROID #ifdef ANDROID
if (Android::IsContentUri(path)) { if (Android::IsContentUri(path)) {
return Android::Exists(path); return Android::Exists(path);
} else { } else {
return fs::exists(path); return fs::exists(path, ec);
} }
#else #else
return fs::exists(path); return fs::exists(path, ec);
#endif #endif
} }
bool IsFile(const fs::path& path) { bool IsFile(const fs::path& path) {
std::error_code ec;
#ifdef ANDROID #ifdef ANDROID
if (Android::IsContentUri(path)) { if (Android::IsContentUri(path)) {
return !Android::IsDirectory(path); return !Android::IsDirectory(path);
} else { } else {
return fs::is_regular_file(path); return fs::is_regular_file(path, ec);
} }
#else #else
return fs::is_regular_file(path); return fs::is_regular_file(path, ec);
#endif #endif
} }
bool IsDir(const fs::path& path) { bool IsDir(const fs::path& path) {
std::error_code ec;
#ifdef ANDROID #ifdef ANDROID
if (Android::IsContentUri(path)) { if (Android::IsContentUri(path)) {
return Android::IsDirectory(path); return Android::IsDirectory(path);
} else { } else {
return fs::is_directory(path); return fs::is_directory(path, ec);
} }
#else #else
return fs::is_directory(path); return fs::is_directory(path, ec);
#endif #endif
} }