فهرست منبع

Merge pull request #6730 from Morph1984/buf_to_stdstring

common: fs: fs_util: Add BufferToUTF8String
bunnei 5 سال پیش
والد
کامیت
6053f2e1fe
2فایلهای تغییر یافته به همراه15 افزوده شده و 0 حذف شده
  1. 4 0
      src/common/fs/fs_util.cpp
  2. 11 0
      src/common/fs/fs_util.h

+ 4 - 0
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()};
     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) {
 std::string PathToUTF8String(const std::filesystem::path& path) {
     return ToUTF8String(path.u8string());
     return ToUTF8String(path.u8string());
 }
 }

+ 11 - 0
src/common/fs/fs_util.h

@@ -46,6 +46,17 @@ concept IsChar = std::same_as<T, char>;
  */
  */
 [[nodiscard]] std::string ToUTF8String(std::u8string_view u8_string);
 [[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.
  * Converts a filesystem path to a UTF-8 encoded std::string.
  *
  *