From a3107a6b571dedb8828b20ddcb709ec17db9715a Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 11 Nov 2014 19:27:35 -0500 Subject: FileSys: Updated backend code to use FileSys::Path instead of string for paths. --- src/core/file_sys/archive.h | 6 +++--- src/core/file_sys/archive_romfs.cpp | 6 +++--- src/core/file_sys/archive_romfs.h | 6 +++--- src/core/file_sys/archive_sdmc.cpp | 12 ++++++------ src/core/file_sys/archive_sdmc.h | 6 +++--- src/core/file_sys/directory_sdmc.cpp | 4 ++-- src/core/file_sys/directory_sdmc.h | 2 +- src/core/file_sys/file_sdmc.cpp | 4 ++-- src/core/file_sys/file_sdmc.h | 2 +- src/core/hle/kernel/archive.cpp | 14 +++++++------- src/core/hle/kernel/archive.h | 6 +++--- src/core/hle/service/fs_user.cpp | 8 ++++---- 12 files changed, 38 insertions(+), 38 deletions(-) (limited to 'src') diff --git a/src/core/file_sys/archive.h b/src/core/file_sys/archive.h index 7b3130f1..dc2d2ced 100644 --- a/src/core/file_sys/archive.h +++ b/src/core/file_sys/archive.h @@ -182,21 +182,21 @@ public: * @param mode Mode to open the file with * @return Opened file, or nullptr */ - virtual std::unique_ptr OpenFile(const std::string& path, const Mode mode) const = 0; + virtual std::unique_ptr OpenFile(const Path& path, const Mode mode) const = 0; /** * Create a directory specified by its path * @param path Path relative to the archive * @return Whether the directory could be created */ - virtual bool CreateDirectory(const std::string& path) const = 0; + virtual bool CreateDirectory(const Path& path) const = 0; /** * Open a directory specified by its path * @param path Path relative to the archive * @return Opened directory, or nullptr */ - virtual std::unique_ptr OpenDirectory(const std::string& path) const = 0; + virtual std::unique_ptr OpenDirectory(const Path& path) const = 0; /** * Read data from the archive diff --git a/src/core/file_sys/archive_romfs.cpp b/src/core/file_sys/archive_romfs.cpp index cc759faa..3ea60134 100644 --- a/src/core/file_sys/archive_romfs.cpp +++ b/src/core/file_sys/archive_romfs.cpp @@ -29,7 +29,7 @@ Archive_RomFS::~Archive_RomFS() { * @param mode Mode to open the file with * @return Opened file, or nullptr */ -std::unique_ptr Archive_RomFS::OpenFile(const std::string& path, const Mode mode) const { +std::unique_ptr Archive_RomFS::OpenFile(const Path& path, const Mode mode) const { return std::unique_ptr(new File_RomFS); } @@ -38,7 +38,7 @@ std::unique_ptr Archive_RomFS::OpenFile(const std::string& path, const Mod * @param path Path relative to the archive * @return Whether the directory could be created */ -bool Archive_RomFS::CreateDirectory(const std::string& path) const { +bool Archive_RomFS::CreateDirectory(const Path& path) const { ERROR_LOG(FILESYS, "Attempted to create a directory in ROMFS."); return false; }; @@ -48,7 +48,7 @@ bool Archive_RomFS::CreateDirectory(const std::string& path) const { * @param path Path relative to the archive * @return Opened directory, or nullptr */ -std::unique_ptr Archive_RomFS::OpenDirectory(const std::string& path) const { +std::unique_ptr Archive_RomFS::OpenDirectory(const Path& path) const { return std::unique_ptr(new Directory_RomFS); } diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h index ae2344e8..8d571573 100644 --- a/src/core/file_sys/archive_romfs.h +++ b/src/core/file_sys/archive_romfs.h @@ -34,21 +34,21 @@ public: * @param mode Mode to open the file with * @return Opened file, or nullptr */ - std::unique_ptr OpenFile(const std::string& path, const Mode mode) const override; + std::unique_ptr OpenFile(const Path& path, const Mode mode) const override; /** * Create a directory specified by its path * @param path Path relative to the archive * @return Whether the directory could be created */ - bool CreateDirectory(const std::string& path) const override; + bool CreateDirectory(const Path& path) const override; /** * Open a directory specified by its path * @param path Path relative to the archive * @return Opened directory, or nullptr */ - std::unique_ptr OpenDirectory(const std::string& path) const override; + std::unique_ptr OpenDirectory(const Path& path) const override; /** * Read data from the archive diff --git a/src/core/file_sys/archive_sdmc.cpp b/src/core/file_sys/archive_sdmc.cpp index 66931e93..ecdb7f21 100644 --- a/src/core/file_sys/archive_sdmc.cpp +++ b/src/core/file_sys/archive_sdmc.cpp @@ -49,8 +49,8 @@ bool Archive_SDMC::Initialize() { * @param mode Mode to open the file with * @return Opened file, or nullptr */ -std::unique_ptr Archive_SDMC::OpenFile(const std::string& path, const Mode mode) const { - DEBUG_LOG(FILESYS, "called path=%s mode=%d", path.c_str(), mode); +std::unique_ptr Archive_SDMC::OpenFile(const Path& path, const Mode mode) const { + DEBUG_LOG(FILESYS, "called path=%s mode=%d", path.DebugStr().c_str(), mode); File_SDMC* file = new File_SDMC(this, path, mode); if (!file->Open()) return nullptr; @@ -62,8 +62,8 @@ std::unique_ptr Archive_SDMC::OpenFile(const std::string& path, const Mode * @param path Path relative to the archive * @return Whether the directory could be created */ -bool Archive_SDMC::CreateDirectory(const std::string& path) const { - return FileUtil::CreateDir(GetMountPoint() + path); +bool Archive_SDMC::CreateDirectory(const Path& path) const { + return FileUtil::CreateDir(GetMountPoint() + path.AsString()); } /** @@ -71,8 +71,8 @@ bool Archive_SDMC::CreateDirectory(const std::string& path) const { * @param path Path relative to the archive * @return Opened directory, or nullptr */ -std::unique_ptr Archive_SDMC::OpenDirectory(const std::string& path) const { - DEBUG_LOG(FILESYS, "called path=%s", path.c_str()); +std::unique_ptr Archive_SDMC::OpenDirectory(const Path& path) const { + DEBUG_LOG(FILESYS, "called path=%s", path.DebugStr().c_str()); Directory_SDMC* directory = new Directory_SDMC(this, path); return std::unique_ptr(directory); } diff --git a/src/core/file_sys/archive_sdmc.h b/src/core/file_sys/archive_sdmc.h index 0e059b63..1f621b3f 100644 --- a/src/core/file_sys/archive_sdmc.h +++ b/src/core/file_sys/archive_sdmc.h @@ -38,21 +38,21 @@ public: * @param mode Mode to open the file with * @return Opened file, or nullptr */ - std::unique_ptr OpenFile(const std::string& path, const Mode mode) const override; + std::unique_ptr OpenFile(const Path& path, const Mode mode) const override; /** * Create a directory specified by its path * @param path Path relative to the archive * @return Whether the directory could be created */ - bool CreateDirectory(const std::string& path) const override; + bool CreateDirectory(const Path& path) const override; /** * Open a directory specified by its path * @param path Path relative to the archive * @return Opened directory, or nullptr */ - std::unique_ptr OpenDirectory(const std::string& path) const override; + std::unique_ptr OpenDirectory(const Path& path) const override; /** * Read data from the archive diff --git a/src/core/file_sys/directory_sdmc.cpp b/src/core/file_sys/directory_sdmc.cpp index fd558def..923ca686 100644 --- a/src/core/file_sys/directory_sdmc.cpp +++ b/src/core/file_sys/directory_sdmc.cpp @@ -15,11 +15,11 @@ namespace FileSys { -Directory_SDMC::Directory_SDMC(const Archive_SDMC* archive, const std::string& path) { +Directory_SDMC::Directory_SDMC(const Archive_SDMC* archive, const Path& path) { // TODO(Link Mauve): normalize path into an absolute path without "..", it can currently bypass // the root directory we set while opening the archive. // For example, opening /../../usr/bin can give the emulated program your installed programs. - std::string absolute_path = archive->GetMountPoint() + path; + std::string absolute_path = archive->GetMountPoint() + path.AsString(); FileUtil::ScanDirectoryTree(absolute_path, directory); children_iterator = directory.children.begin(); } diff --git a/src/core/file_sys/directory_sdmc.h b/src/core/file_sys/directory_sdmc.h index cb8d32fd..4520d040 100644 --- a/src/core/file_sys/directory_sdmc.h +++ b/src/core/file_sys/directory_sdmc.h @@ -19,7 +19,7 @@ namespace FileSys { class Directory_SDMC final : public Directory { public: Directory_SDMC(); - Directory_SDMC(const Archive_SDMC* archive, const std::string& path); + Directory_SDMC(const Archive_SDMC* archive, const Path& path); ~Directory_SDMC() override; /** diff --git a/src/core/file_sys/file_sdmc.cpp b/src/core/file_sys/file_sdmc.cpp index 26204392..a4b90670 100644 --- a/src/core/file_sys/file_sdmc.cpp +++ b/src/core/file_sys/file_sdmc.cpp @@ -15,11 +15,11 @@ namespace FileSys { -File_SDMC::File_SDMC(const Archive_SDMC* archive, const std::string& path, const Mode mode) { +File_SDMC::File_SDMC(const Archive_SDMC* archive, const Path& path, const Mode mode) { // TODO(Link Mauve): normalize path into an absolute path without "..", it can currently bypass // the root directory we set while opening the archive. // For example, opening /../../etc/passwd can give the emulated program your users list. - this->path = archive->GetMountPoint() + path; + this->path = archive->GetMountPoint() + path.AsString(); this->mode.hex = mode.hex; } diff --git a/src/core/file_sys/file_sdmc.h b/src/core/file_sys/file_sdmc.h index df032f7c..80b44596 100644 --- a/src/core/file_sys/file_sdmc.h +++ b/src/core/file_sys/file_sdmc.h @@ -19,7 +19,7 @@ namespace FileSys { class File_SDMC final : public File { public: File_SDMC(); - File_SDMC(const Archive_SDMC* archive, const std::string& path, const Mode mode); + File_SDMC(const Archive_SDMC* archive, const Path& path, const Mode mode); ~File_SDMC() override; /** diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/kernel/archive.cpp index 764082d7..5d734d04 100644 --- a/src/core/hle/kernel/archive.cpp +++ b/src/core/hle/kernel/archive.cpp @@ -129,12 +129,12 @@ public: class File : public Object { public: std::string GetTypeName() const override { return "File"; } - std::string GetName() const override { return path; } + std::string GetName() const override { return path.DebugStr(); } static Kernel::HandleType GetStaticHandleType() { return HandleType::File; } Kernel::HandleType GetHandleType() const override { return HandleType::File; } - std::string path; ///< Path of the file + FileSys::Path path; ///< Path of the file std::unique_ptr backend; ///< File backend interface /** @@ -221,12 +221,12 @@ public: class Directory : public Object { public: std::string GetTypeName() const override { return "Directory"; } - std::string GetName() const override { return path; } + std::string GetName() const override { return path.DebugStr(); } static Kernel::HandleType GetStaticHandleType() { return HandleType::Directory; } Kernel::HandleType GetHandleType() const override { return HandleType::Directory; } - std::string path; ///< Path of the directory + FileSys::Path path; ///< Path of the directory std::unique_ptr backend; ///< File backend interface /** @@ -366,7 +366,7 @@ Handle CreateArchive(FileSys::Archive* backend, const std::string& name) { * @param mode Mode under which to open the File * @return Opened File object */ -Handle OpenFileFromArchive(Handle archive_handle, const std::string& path, const FileSys::Mode mode) { +Handle OpenFileFromArchive(Handle archive_handle, const FileSys::Path& path, const FileSys::Mode mode) { File* file = new File; Handle handle = Kernel::g_object_pool.Create(file); @@ -386,7 +386,7 @@ Handle OpenFileFromArchive(Handle archive_handle, const std::string& path, const * @param path Path to the Directory inside of the Archive * @return Opened Directory object */ -Result CreateDirectoryFromArchive(Handle archive_handle, const std::string& path) { +Result CreateDirectoryFromArchive(Handle archive_handle, const FileSys::Path& path) { Archive* archive = Kernel::g_object_pool.GetFast(archive_handle); if (archive == nullptr) return -1; @@ -401,7 +401,7 @@ Result CreateDirectoryFromArchive(Handle archive_handle, const std::string& path * @param path Path to the Directory inside of the Archive * @return Opened Directory object */ -Handle OpenDirectoryFromArchive(Handle archive_handle, const std::string& path) { +Handle OpenDirectoryFromArchive(Handle archive_handle, const FileSys::Path& path) { Directory* directory = new Directory; Handle handle = Kernel::g_object_pool.Create(directory); diff --git a/src/core/hle/kernel/archive.h b/src/core/hle/kernel/archive.h index 0230996b..9c601550 100644 --- a/src/core/hle/kernel/archive.h +++ b/src/core/hle/kernel/archive.h @@ -43,7 +43,7 @@ Handle CreateArchive(FileSys::Archive* backend, const std::string& name); * @param mode Mode under which to open the File * @return Opened File object */ -Handle OpenFileFromArchive(Handle archive_handle, const std::string& name, const FileSys::Mode mode); +Handle OpenFileFromArchive(Handle archive_handle, const FileSys::Path& path, const FileSys::Mode mode); /** * Create a Directory from an Archive @@ -51,7 +51,7 @@ Handle OpenFileFromArchive(Handle archive_handle, const std::string& name, const * @param path Path to the Directory inside of the Archive * @return Whether creation of directory succeeded */ -Result CreateDirectoryFromArchive(Handle archive_handle, const std::string& name); +Result CreateDirectoryFromArchive(Handle archive_handle, const FileSys::Path& path); /** * Open a Directory from an Archive @@ -59,7 +59,7 @@ Result CreateDirectoryFromArchive(Handle archive_handle, const std::string& name * @param path Path to the Directory inside of the Archive * @return Opened Directory object */ -Handle OpenDirectoryFromArchive(Handle archive_handle, const std::string& name); +Handle OpenDirectoryFromArchive(Handle archive_handle, const FileSys::Path& path); /// Initialize archives void ArchiveInit(); diff --git a/src/core/hle/service/fs_user.cpp b/src/core/hle/service/fs_user.cpp index 9dc83291..1548b9ee 100644 --- a/src/core/hle/service/fs_user.cpp +++ b/src/core/hle/service/fs_user.cpp @@ -55,7 +55,7 @@ void OpenFile(Service::Interface* self) { DEBUG_LOG(KERNEL, "type=%d size=%d mode=%d attrs=%d data=%s", filename_type, filename_size, mode, attributes, file_string.c_str()); - Handle handle = Kernel::OpenFileFromArchive(archive_handle, file_string, mode); + Handle handle = Kernel::OpenFileFromArchive(archive_handle, file_path, mode); if (handle) { cmd_buff[1] = 0; cmd_buff[3] = handle; @@ -115,7 +115,7 @@ void OpenFileDirectly(Service::Interface* self) { return; } - Handle handle = Kernel::OpenFileFromArchive(archive_handle, file_string, mode); + Handle handle = Kernel::OpenFileFromArchive(archive_handle, file_path, mode); if (handle) { cmd_buff[1] = 0; cmd_buff[3] = handle; @@ -163,7 +163,7 @@ void CreateDirectory(Service::Interface* self) { DEBUG_LOG(KERNEL, "type=%d size=%d data=%s", dirname_type, dirname_size, dir_string.c_str()); - cmd_buff[1] = Kernel::CreateDirectoryFromArchive(archive_handle, dir_string); + cmd_buff[1] = Kernel::CreateDirectoryFromArchive(archive_handle, dir_path); DEBUG_LOG(KERNEL, "called"); } @@ -192,7 +192,7 @@ void OpenDirectory(Service::Interface* self) { DEBUG_LOG(KERNEL, "type=%d size=%d data=%s", dirname_type, dirname_size, dir_string.c_str()); - Handle handle = Kernel::OpenDirectoryFromArchive(archive_handle, dir_string); + Handle handle = Kernel::OpenDirectoryFromArchive(archive_handle, dir_path); if (handle) { cmd_buff[1] = 0; cmd_buff[3] = handle; -- cgit v1.2.3