From f5f04cce01a062fe00e2935f468c2cb9d92698ce Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Mon, 26 Jul 2021 05:10:37 -0400 Subject: [PATCH] common: fs: fs_util: Add BufferToUTF8String Allows for direct conversion to std::string without having to convert std::u8string to std::string --- src/common/fs/fs_util.cpp | 4 ++++ src/common/fs/fs_util.h | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/common/fs/fs_util.cpp b/src/common/fs/fs_util.cpp index 357cf5855d..9f8671982b 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 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 ec9950ee72..1ec82eb350 100644 --- a/src/common/fs/fs_util.h +++ b/src/common/fs/fs_util.h @@ -46,6 +46,17 @@ concept IsChar = std::same_as; */ [[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 buffer); + /** * Converts a filesystem path to a UTF-8 encoded std::string. *