mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-05 15:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vfs::host::unlink (Win32)

Browse Source 
Use fs::get_virtual_device properly.
This commit is contained in:
Nekotekina 2019-11-07 23:46:01 +03:00
parent 63673b1a9f
commit d6087978b5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/Emu/VFS.cpp
View File

@ -582,7 +582,11 @@ bool vfs::host::rename(const std::string& from, const std::string& to, bool over
bool vfs::host::unlink(const std::string& path, const std::string& dev_root) bool vfs::host::unlink(const std::string& path, const std::string& dev_root)
{ {
#ifdef _WIN32 #ifdef _WIN32
if (path.size() < 2 || reinterpret_cast<const u16&>(path.front()) != "//"_u16) if (auto device = fs::get_virtual_device(path))
{
return device->remove(path);
}
else
{ {
// Rename to special dummy name which will be ignored by VFS (but opened file handles can still read or write it) // Rename to special dummy name which will be ignored by VFS (but opened file handles can still read or write it)
const std::string dummy = fmt::format(u8"%s/＄%s%s", dev_root, fmt::base57(std::hash<std::string>()(path)), fmt::base57(__rdtsc())); const std::string dummy = fmt::format(u8"%s/＄%s%s", dev_root, fmt::base57(std::hash<std::string>()(path)), fmt::base57(__rdtsc()));
@ -602,9 +606,9 @@ bool vfs::host::unlink(const std::string& path, const std::string& dev_root)
// TODO: what could cause this and how to handle it // TODO: what could cause this and how to handle it
return true; return true;
} }
#endif #else
return fs::remove_file(path); return fs::remove_file(path);
#endif
} }
bool vfs::host::remove_all(const std::string& path, const std::string& dev_root, bool remove_root) bool vfs::host::remove_all(const std::string& path, const std::string& dev_root, bool remove_root)