diff options
author | bunnei <bunneidev@gmail.com> | 2014-11-13 04:56:27 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-11-13 04:56:27 +0100 |
commit | 3cfdabb2e3594f8b380b53db2af7de41958408c6 (patch) | |
tree | 082f1d6a5530f35f5d702bf77704e13489f6f978 /src/core/file_sys | |
parent | Merge pull request #188 from bunnei/apt-fixes (diff) | |
parent | Use std::u16string for conversion between UTF-8 and UTF-16, FS:USER functions (diff) | |
download | yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.tar yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.tar.gz yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.tar.bz2 yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.tar.lz yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.tar.xz yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.tar.zst yuzu-3cfdabb2e3594f8b380b53db2af7de41958408c6.zip |
Diffstat (limited to 'src/core/file_sys')
-rw-r--r-- | src/core/file_sys/archive.h | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/src/core/file_sys/archive.h b/src/core/file_sys/archive.h index aeabf09ac..38145eed8 100644 --- a/src/core/file_sys/archive.h +++ b/src/core/file_sys/archive.h @@ -7,11 +7,13 @@ #include <memory> #include "common/common_types.h" +#include "common/string_util.h" #include "common/bit_field.h" #include "core/file_sys/file.h" #include "core/file_sys/directory.h" +#include "core/mem_map.h" #include "core/hle/kernel/kernel.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -19,6 +21,15 @@ namespace FileSys { +// Path string type +enum LowPathType : u32 { + Invalid = 0, + Empty = 1, + Binary = 2, + Char = 3, + Wchar = 4 +}; + union Mode { u32 hex; BitField<0, 1, u32> read_flag; @@ -26,6 +37,94 @@ union Mode { BitField<2, 1, u32> create_flag; }; +class Path { +public: + + Path(): + type(Invalid) + { + } + + Path(LowPathType type, u32 size, u32 pointer): + type(type) + { + switch (type) { + case Binary: + { + u8* data = Memory::GetPointer(pointer); + binary = std::vector<u8>(data, data + size); + break; + } + case Char: + { + const char* data = reinterpret_cast<const char*>(Memory::GetPointer(pointer)); + string = std::string(data, size - 1); // Data is always null-terminated. + break; + } + case Wchar: + { + const char16_t* data = reinterpret_cast<const char16_t*>(Memory::GetPointer(pointer)); + u16str = std::u16string(data, size/2 - 1); // Data is always null-terminated. + break; + } + } + } + + LowPathType GetType() const { + return type; + } + + const std::string AsString() const { + switch (GetType()) { + case Char: + return string; + case Wchar: + return Common::UTF16ToUTF8(u16str); + case Empty: + return {}; + default: + ERROR_LOG(KERNEL, "LowPathType cannot be converted to string!"); + return {}; + } + } + + const std::u16string AsU16Str() const { + switch (GetType()) { + case Char: + return Common::UTF8ToUTF16(string); + case Wchar: + return u16str; + case Empty: + return {}; + default: + ERROR_LOG(KERNEL, "LowPathType cannot be converted to u16string!"); + return {}; + } + } + + const std::vector<u8> AsBinary() const { + switch (GetType()) { + case Binary: + return binary; + case Char: + return std::vector<u8>(string.begin(), string.end()); + case Wchar: + return std::vector<u8>(u16str.begin(), u16str.end()); + case Empty: + return {}; + default: + ERROR_LOG(KERNEL, "LowPathType cannot be converted to binary!"); + return {}; + } + } + +private: + LowPathType type; + std::vector<u8> binary; + std::string string; + std::u16string u16str; +}; + class Archive : NonCopyable { public: /// Supported archive types |