OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-18 14:20:05 +00:00
Code Issues Projects Releases Wiki Activity

HLE/FS: Use IPCHelper in DeleteDirectoryRecursively.

Browse Source
This commit is contained in:
Subv 2017-12-09 12:52:27 -05:00
parent 67382e46c0
commit 92e71aff57
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/hle/service/fs/fs_user.cpp
View File

@ -272,19 +272,21 @@ static void DeleteDirectory(Service::Interface* self) {
* 1 : Result of function, 0 on success, otherwise error code * 1 : Result of function, 0 on success, otherwise error code
*/ */
static void DeleteDirectoryRecursively(Service::Interface* self) { static void DeleteDirectoryRecursively(Service::Interface* self) {
u32* cmd_buff = Kernel::GetCommandBuffer(); IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x807, 5, 2);
ArchiveHandle archive_handle = MakeArchiveHandle(cmd_buff[2], cmd_buff[3]); rp.Skip(1, false); // TransactionId
auto dirname_type = static_cast<FileSys::LowPathType>(cmd_buff[4]); ArchiveHandle archive_handle = rp.PopRaw<ArchiveHandle>();
u32 dirname_size = cmd_buff[5]; auto dirname_type = rp.PopEnum<FileSys::LowPathType>();
u32 dirname_ptr = cmd_buff[7]; u32 dirname_size = rp.Pop<u32>();
u32 dirname_ptr = rp.PopStaticBuffer(nullptr);
FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr); FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr);
LOG_DEBUG(Service_FS, "type=%u size=%u data=%s", static_cast<u32>(dirname_type), dirname_size, LOG_DEBUG(Service_FS, "type=%u size=%u data=%s", static_cast<u32>(dirname_type), dirname_size,
dir_path.DebugStr().c_str()); dir_path.DebugStr().c_str());
cmd_buff[1] = DeleteDirectoryRecursivelyFromArchive(archive_handle, dir_path).raw; IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
rb.Push(DeleteDirectoryRecursivelyFromArchive(archive_handle, dir_path));
} }
/* /*