diff options
author | bunnei <bunneidev@gmail.com> | 2021-07-28 00:50:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-28 00:50:54 +0200 |
commit | 6053f2e1fea122c783eade21bed0ae285bdf9933 (patch) | |
tree | 4a6c2ad145485ae8eea308b454dbdc3a7ecbd47f /src/common | |
parent | Merge pull request #6748 from lioncash/engine-init (diff) | |
parent | common: fs: fs_util: Add BufferToUTF8String (diff) | |
download | yuzu-6053f2e1fea122c783eade21bed0ae285bdf9933.tar yuzu-6053f2e1fea122c783eade21bed0ae285bdf9933.tar.gz yuzu-6053f2e1fea122c783eade21bed0ae285bdf9933.tar.bz2 yuzu-6053f2e1fea122c783eade21bed0ae285bdf9933.tar.lz yuzu-6053f2e1fea122c783eade21bed0ae285bdf9933.tar.xz yuzu-6053f2e1fea122c783eade21bed0ae285bdf9933.tar.zst yuzu-6053f2e1fea122c783eade21bed0ae285bdf9933.zip |
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/fs/fs_util.cpp | 4 | ||||
-rw-r--r-- | src/common/fs/fs_util.h | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/common/fs/fs_util.cpp b/src/common/fs/fs_util.cpp index 357cf5855..9f8671982 100644 --- a/src/common/fs/fs_util.cpp +++ b/src/common/fs/fs_util.cpp @@ -20,6 +20,10 @@ std::string ToUTF8String(std::u8string_view u8_string) { return std::string{u8_string.begin(), u8_string.end()}; } +std::string BufferToUTF8String(std::span<const u8> buffer) { + return std::string{buffer.begin(), std::ranges::find(buffer, u8{0})}; +} + std::string PathToUTF8String(const std::filesystem::path& path) { return ToUTF8String(path.u8string()); } diff --git a/src/common/fs/fs_util.h b/src/common/fs/fs_util.h index ec9950ee7..1ec82eb35 100644 --- a/src/common/fs/fs_util.h +++ b/src/common/fs/fs_util.h @@ -47,6 +47,17 @@ concept IsChar = std::same_as<T, char>; [[nodiscard]] std::string ToUTF8String(std::u8string_view u8_string); /** + * Converts a buffer of bytes to a UTF8-encoded std::string. + * This converts from the start of the buffer until the first encountered null-terminator. + * If no null-terminator is found, this converts the entire buffer instead. + * + * @param buffer Buffer of bytes + * + * @returns UTF-8 encoded std::string. + */ +[[nodiscard]] std::string BufferToUTF8String(std::span<const u8> buffer); + +/** * Converts a filesystem path to a UTF-8 encoded std::string. * * @param path Filesystem path |