ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7073 from leoetlino/fix 

WiiSave: Fix the way paths are handled
This commit is contained in:
Léo Lam 2018-06-05 18:32:13 +02:00 committed by GitHub
parent bfbd890caa 14d37e0493
commit 21d0d6711f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/HW/WiiSave.cpp
View File

@ -122,6 +122,7 @@ public:
}; };
u8 mode, attributes; u8 mode, attributes;
Type type; Type type;
/// File name relative to the title data directory.
std::string path; std::string path;
// Only valid for regular (i.e. non-directory) files. // Only valid for regular (i.e. non-directory) files.
Common::Lazy<std::optional<std::vector<u8>>> data; Common::Lazy<std::optional<std::vector<u8>>> data;
@ -220,20 +221,21 @@ public:
for (const SaveFile& file : files) for (const SaveFile& file : files)
{ {
const FS::Modes modes = GetFsMode(file.mode); const FS::Modes modes = GetFsMode(file.mode);
const std::string path = m_data_dir + '/' + file.path;
if (file.type == SaveFile::Type::File) if (file.type == SaveFile::Type::File)
{ {
const auto raw_file = m_fs->CreateAndOpenFile(*m_uid, *m_gid, file.path, modes); const auto raw_file = m_fs->CreateAndOpenFile(*m_uid, *m_gid, path, modes);
const std::optional<std::vector<u8>>& data = *file.data; const std::optional<std::vector<u8>>& data = *file.data;
if (!data || !raw_file || !raw_file->Write(data->data(), data->size())) if (!data || !raw_file || !raw_file->Write(data->data(), data->size()))
return false; return false;
} }
else if (file.type == SaveFile::Type::Directory) else if (file.type == SaveFile::Type::Directory)
{ {
const FS::Result<FS::Metadata> meta = m_fs->GetMetadata(*m_uid, *m_gid, file.path); const FS::Result<FS::Metadata> meta = m_fs->GetMetadata(*m_uid, *m_gid, path);
if (!meta || meta->is_file) if (!meta || meta->is_file)
return false; return false;
const FS::ResultCode result = m_fs->CreateDirectory(*m_uid, *m_gid, file.path, 0, modes); const FS::ResultCode result = m_fs->CreateDirectory(*m_uid, *m_gid, path, 0, modes);
if (result != FS::ResultCode::Success) if (result != FS::ResultCode::Success)
return false; return false;
} }
@ -265,7 +267,7 @@ private:
save_file.mode = GetBinMode(metadata->modes); save_file.mode = GetBinMode(metadata->modes);
save_file.attributes = 0; save_file.attributes = 0;
save_file.type = metadata->is_file ? SaveFile::Type::File : SaveFile::Type::Directory; save_file.type = metadata->is_file ? SaveFile::Type::File : SaveFile::Type::Directory;
save_file.path = path; save_file.path = path.substr(m_data_dir.size() + 1);
save_file.data = [this, path]() -> std::optional<std::vector<u8>> { save_file.data = [this, path]() -> std::optional<std::vector<u8>> {
const auto file = m_fs->OpenFile(*m_uid, *m_gid, path, FS::Mode::Read); const auto file = m_fs->OpenFile(*m_uid, *m_gid, path, FS::Mode::Read);
if (!file) if (!file)