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 +- 9 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/core/file_sys') diff --git a/src/core/file_sys/archive.h b/src/core/file_sys/archive.h index 7b3130f16..dc2d2ced9 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 cc759faa8..3ea60134f 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 ae2344e82..8d5715734 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 66931e93e..ecdb7f211 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 0e059b635..1f621b3f7 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 fd558def9..923ca6862 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 cb8d32fda..4520d0401 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 26204392c..a4b90670a 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 df032f7c0..80b445968 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; /** -- cgit v1.2.3