ShuriZma
/
suyu
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5151 from comex/xx-vfs 

vfs_real: When moving files or directories, don't assume file opening will succeed
This commit is contained in:
bunnei 2021-01-24 13:42:51 -08:00 committed by GitHub
parent 8959f3521f e9bb95ae16
commit 44c5ea3639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/file_sys/vfs_real.cpp
View File

@ -133,8 +133,11 @@ VirtualFile RealVfsFilesystem::MoveFile(std::string_view old_path_, std::string_
} }
cache.erase(old_path); cache.erase(old_path);
file->Open(new_path, "r+b"); if (file->Open(new_path, "r+b")) {
cache.insert_or_assign(new_path, std::move(file)); cache.insert_or_assign(new_path, std::move(file));
} else {
LOG_ERROR(Service_FS, "Failed to open path {} in order to re-cache it", new_path);
}
} else { } else {
UNREACHABLE(); UNREACHABLE();
return nullptr; return nullptr;
@ -214,9 +217,12 @@ VirtualDir RealVfsFilesystem::MoveDirectory(std::string_view old_path_,
} }
auto file = cached.lock(); auto file = cached.lock();
file->Open(file_new_path, "r+b");
cache.erase(file_old_path); cache.erase(file_old_path);
if (file->Open(file_new_path, "r+b")) {
cache.insert_or_assign(std::move(file_new_path), std::move(file)); cache.insert_or_assign(std::move(file_new_path), std::move(file));
} else {
LOG_ERROR(Service_FS, "Failed to open path {} in order to re-cache it", file_new_path);
}
} }
return OpenDirectory(new_path, Mode::ReadWrite); return OpenDirectory(new_path, Mode::ReadWrite);