mirror of
https://github.com/citra-mirror/citra.git
synced 2024-09-05 19:09:22 +02:00
Implemented RenameDirectory in FS:USER
This commit is contained in:
parent
45afc15aa6
commit
e5ff01c2cd
@ -213,6 +213,14 @@ public:
|
|||||||
*/
|
*/
|
||||||
virtual bool CreateDirectory(const Path& path) const = 0;
|
virtual bool CreateDirectory(const Path& path) const = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rename a Directory specified by its path
|
||||||
|
* @param src_path Source path relative to the archive
|
||||||
|
* @param dest_path Destination path relative to the archive
|
||||||
|
* @return Whether rename succeeded
|
||||||
|
*/
|
||||||
|
virtual bool RenameDirectory(const FileSys::Path& src_path, const FileSys::Path& dest_path) const = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Open a directory specified by its path
|
* Open a directory specified by its path
|
||||||
* @param path Path relative to the archive
|
* @param path Path relative to the archive
|
||||||
|
@ -74,6 +74,17 @@ bool Archive_RomFS::CreateDirectory(const Path& path) const {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rename a Directory specified by its path
|
||||||
|
* @param src_path Source path relative to the archive
|
||||||
|
* @param dest_path Destination path relative to the archive
|
||||||
|
* @return Whether rename succeeded
|
||||||
|
*/
|
||||||
|
bool Archive_RomFS::RenameDirectory(const FileSys::Path& src_path, const FileSys::Path& dest_path) const {
|
||||||
|
ERROR_LOG(FILESYS, "Attempted to rename a file within ROMFS.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Open a directory specified by its path
|
* Open a directory specified by its path
|
||||||
* @param path Path relative to the archive
|
* @param path Path relative to the archive
|
||||||
|
@ -65,6 +65,14 @@ public:
|
|||||||
*/
|
*/
|
||||||
bool CreateDirectory(const Path& path) const override;
|
bool CreateDirectory(const Path& path) const override;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rename a Directory specified by its path
|
||||||
|
* @param src_path Source path relative to the archive
|
||||||
|
* @param dest_path Destination path relative to the archive
|
||||||
|
* @return Whether rename succeeded
|
||||||
|
*/
|
||||||
|
bool RenameDirectory(const FileSys::Path& src_path, const FileSys::Path& dest_path) const override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Open a directory specified by its path
|
* Open a directory specified by its path
|
||||||
* @param path Path relative to the archive
|
* @param path Path relative to the archive
|
||||||
|
@ -94,6 +94,16 @@ bool Archive_SDMC::CreateDirectory(const Path& path) const {
|
|||||||
return FileUtil::CreateDir(GetMountPoint() + path.AsString());
|
return FileUtil::CreateDir(GetMountPoint() + path.AsString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rename a Directory specified by its path
|
||||||
|
* @param src_path Source path relative to the archive
|
||||||
|
* @param dest_path Destination path relative to the archive
|
||||||
|
* @return Whether rename succeeded
|
||||||
|
*/
|
||||||
|
bool Archive_SDMC::RenameDirectory(const FileSys::Path& src_path, const FileSys::Path& dest_path) const {
|
||||||
|
return FileUtil::Rename(GetMountPoint() + src_path.AsString(), GetMountPoint() + dest_path.AsString());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Open a directory specified by its path
|
* Open a directory specified by its path
|
||||||
* @param path Path relative to the archive
|
* @param path Path relative to the archive
|
||||||
|
@ -69,6 +69,14 @@ public:
|
|||||||
*/
|
*/
|
||||||
bool CreateDirectory(const Path& path) const override;
|
bool CreateDirectory(const Path& path) const override;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rename a Directory specified by its path
|
||||||
|
* @param src_path Source path relative to the archive
|
||||||
|
* @param dest_path Destination path relative to the archive
|
||||||
|
* @return Whether rename succeeded
|
||||||
|
*/
|
||||||
|
bool RenameDirectory(const FileSys::Path& src_path, const FileSys::Path& dest_path) const override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Open a directory specified by its path
|
* Open a directory specified by its path
|
||||||
* @param path Path relative to the archive
|
* @param path Path relative to the archive
|
||||||
|
@ -409,6 +409,30 @@ Result CreateDirectoryFromArchive(Handle archive_handle, const FileSys::Path& pa
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rename a Directory between two Archives
|
||||||
|
* @param src_archive_handle Handle to the source Archive object
|
||||||
|
* @param src_path Path to the Directory inside of the source Archive
|
||||||
|
* @param dest_archive_handle Handle to the destination Archive object
|
||||||
|
* @param dest_path Path to the Directory inside of the destination Archive
|
||||||
|
* @return Whether rename succeeded
|
||||||
|
*/
|
||||||
|
Result RenameDirectoryBetweenArchives(Handle src_archive_handle, const FileSys::Path& src_path,
|
||||||
|
Handle dest_archive_handle, const FileSys::Path& dest_path) {
|
||||||
|
Archive* src_archive = Kernel::g_object_pool.GetFast<Archive>(src_archive_handle);
|
||||||
|
Archive* dest_archive = Kernel::g_object_pool.GetFast<Archive>(dest_archive_handle);
|
||||||
|
if (src_archive == nullptr || dest_archive == nullptr)
|
||||||
|
return -1;
|
||||||
|
if (src_archive == dest_archive) {
|
||||||
|
if (src_archive->backend->RenameDirectory(src_path, dest_path))
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
// TODO: Implement renaming across archives
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Open a Directory from an Archive
|
* Open a Directory from an Archive
|
||||||
* @param archive_handle Handle to an open Archive object
|
* @param archive_handle Handle to an open Archive object
|
||||||
|
@ -79,6 +79,17 @@ Result DeleteDirectoryFromArchive(Handle archive_handle, const FileSys::Path& pa
|
|||||||
*/
|
*/
|
||||||
Result CreateDirectoryFromArchive(Handle archive_handle, const FileSys::Path& path);
|
Result CreateDirectoryFromArchive(Handle archive_handle, const FileSys::Path& path);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rename a Directory between two Archives
|
||||||
|
* @param src_archive_handle Handle to the source Archive object
|
||||||
|
* @param src_path Path to the Directory inside of the source Archive
|
||||||
|
* @param dest_archive_handle Handle to the destination Archive object
|
||||||
|
* @param dest_path Path to the Directory inside of the destination Archive
|
||||||
|
* @return Whether rename succeeded
|
||||||
|
*/
|
||||||
|
Result RenameDirectoryBetweenArchives(Handle src_archive_handle, const FileSys::Path& src_path,
|
||||||
|
Handle dest_archive_handle, const FileSys::Path& dest_path);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Open a Directory from an Archive
|
* Open a Directory from an Archive
|
||||||
* @param archive_handle Handle to an open Archive object
|
* @param archive_handle Handle to an open Archive object
|
||||||
|
@ -267,6 +267,48 @@ static void CreateDirectory(Service::Interface* self) {
|
|||||||
DEBUG_LOG(KERNEL, "called");
|
DEBUG_LOG(KERNEL, "called");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* FS_User::RenameDirectory service function
|
||||||
|
* Inputs:
|
||||||
|
* 2 : Source archive handle lower word
|
||||||
|
* 3 : Source archive handle upper word
|
||||||
|
* 4 : Source dir path type
|
||||||
|
* 5 : Source dir path size
|
||||||
|
* 6 : Dest archive handle lower word
|
||||||
|
* 7 : Dest archive handle upper word
|
||||||
|
* 8 : Dest dir path type
|
||||||
|
* 9 : Dest dir path size
|
||||||
|
* 11: Source dir path string data
|
||||||
|
* 13: Dest dir path string
|
||||||
|
* Outputs:
|
||||||
|
* 1 : Result of function, 0 on success, otherwise error code
|
||||||
|
*/
|
||||||
|
void RenameDirectory(Service::Interface* self) {
|
||||||
|
u32* cmd_buff = Service::GetCommandBuffer();
|
||||||
|
|
||||||
|
// TODO(Link Mauve): cmd_buff[2] and cmd_buff[6], aka archive handle lower word, aren't used according to
|
||||||
|
// 3dmoo's or ctrulib's implementations. Triple check if it's really the case.
|
||||||
|
Handle src_archive_handle = static_cast<Handle>(cmd_buff[3]);
|
||||||
|
auto src_dirname_type = static_cast<FileSys::LowPathType>(cmd_buff[4]);
|
||||||
|
u32 src_dirname_size = cmd_buff[5];
|
||||||
|
Handle dest_archive_handle = static_cast<Handle>(cmd_buff[7]);
|
||||||
|
auto dest_dirname_type = static_cast<FileSys::LowPathType>(cmd_buff[8]);
|
||||||
|
u32 dest_dirname_size = cmd_buff[9];
|
||||||
|
u32 src_dirname_ptr = cmd_buff[11];
|
||||||
|
u32 dest_dirname_ptr = cmd_buff[13];
|
||||||
|
|
||||||
|
FileSys::Path src_dir_path(src_dirname_type, src_dirname_size, src_dirname_ptr);
|
||||||
|
FileSys::Path dest_dir_path(dest_dirname_type, dest_dirname_size, dest_dirname_ptr);
|
||||||
|
|
||||||
|
DEBUG_LOG(KERNEL, "src_type=%d src_size=%d src_data=%s dest_type=%d dest_size=%d dest_data=%s",
|
||||||
|
src_dirname_type, src_dirname_size, src_dir_path.DebugStr().c_str(),
|
||||||
|
dest_dirname_type, dest_dirname_size, dest_dir_path.DebugStr().c_str());
|
||||||
|
|
||||||
|
cmd_buff[1] = Kernel::RenameDirectoryBetweenArchives(src_archive_handle, src_dir_path, dest_archive_handle, dest_dir_path);
|
||||||
|
|
||||||
|
DEBUG_LOG(KERNEL, "called");
|
||||||
|
}
|
||||||
|
|
||||||
static void OpenDirectory(Service::Interface* self) {
|
static void OpenDirectory(Service::Interface* self) {
|
||||||
u32* cmd_buff = Service::GetCommandBuffer();
|
u32* cmd_buff = Service::GetCommandBuffer();
|
||||||
|
|
||||||
@ -361,7 +403,7 @@ const Interface::FunctionInfo FunctionTable[] = {
|
|||||||
{0x08070142, nullptr, "DeleteDirectoryRecursively"},
|
{0x08070142, nullptr, "DeleteDirectoryRecursively"},
|
||||||
{0x08080202, nullptr, "CreateFile"},
|
{0x08080202, nullptr, "CreateFile"},
|
||||||
{0x08090182, CreateDirectory, "CreateDirectory"},
|
{0x08090182, CreateDirectory, "CreateDirectory"},
|
||||||
{0x080A0244, nullptr, "RenameDirectory"},
|
{0x080A0244, RenameDirectory, "RenameDirectory"},
|
||||||
{0x080B0102, OpenDirectory, "OpenDirectory"},
|
{0x080B0102, OpenDirectory, "OpenDirectory"},
|
||||||
{0x080C00C2, OpenArchive, "OpenArchive"},
|
{0x080C00C2, OpenArchive, "OpenArchive"},
|
||||||
{0x080D0144, nullptr, "ControlArchive"},
|
{0x080D0144, nullptr, "ControlArchive"},
|
||||||
|
Loading…
Reference in New Issue
Block a user