summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-06-01 15:19:08 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-06-02 06:26:26 +0200
commita1eeb9908d9cba0a51fbad519ce770b96d0a78d5 (patch)
tree937e4376d04b63b747d2e931b29b4ede31e9dbc5
parentMerge pull request #6361 from lat9nq/per-hb-cfg (diff)
downloadyuzu-a1eeb9908d9cba0a51fbad519ce770b96d0a78d5.tar
yuzu-a1eeb9908d9cba0a51fbad519ce770b96d0a78d5.tar.gz
yuzu-a1eeb9908d9cba0a51fbad519ce770b96d0a78d5.tar.bz2
yuzu-a1eeb9908d9cba0a51fbad519ce770b96d0a78d5.tar.lz
yuzu-a1eeb9908d9cba0a51fbad519ce770b96d0a78d5.tar.xz
yuzu-a1eeb9908d9cba0a51fbad519ce770b96d0a78d5.tar.zst
yuzu-a1eeb9908d9cba0a51fbad519ce770b96d0a78d5.zip
-rw-r--r--src/common/fs/fs_util.cpp10
-rw-r--r--src/common/fs/fs_util.h23
2 files changed, 33 insertions, 0 deletions
diff --git a/src/common/fs/fs_util.cpp b/src/common/fs/fs_util.cpp
index 0ddfc3131..9db746c4b 100644
--- a/src/common/fs/fs_util.cpp
+++ b/src/common/fs/fs_util.cpp
@@ -2,6 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <algorithm>
+
#include "common/fs/fs_util.h"
namespace Common::FS {
@@ -10,4 +12,12 @@ std::u8string ToU8String(std::string_view utf8_string) {
return std::u8string{utf8_string.begin(), utf8_string.end()};
}
+std::u8string BufferToU8String(std::span<const u8> buffer) {
+ return std::u8string{buffer.begin(), std::ranges::find(buffer, u8{0})};
+}
+
+std::string ToUTF8String(std::u8string_view u8_string) {
+ return std::string{u8_string.begin(), u8_string.end()};
+}
+
} // namespace Common::FS
diff --git a/src/common/fs/fs_util.h b/src/common/fs/fs_util.h
index 951df53b6..de452c0f6 100644
--- a/src/common/fs/fs_util.h
+++ b/src/common/fs/fs_util.h
@@ -5,9 +5,12 @@
#pragma once
#include <concepts>
+#include <span>
#include <string>
#include <string_view>
+#include "common/common_types.h"
+
namespace Common::FS {
template <typename T>
@@ -22,4 +25,24 @@ concept IsChar = std::same_as<T, char>;
*/
[[nodiscard]] std::u8string ToU8String(std::string_view utf8_string);
+/**
+ * Converts a buffer of bytes to a UTF8-encoded std::u8string.
+ * 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::u8string.
+ */
+[[nodiscard]] std::u8string BufferToU8String(std::span<const u8> buffer);
+
+/**
+ * Converts a std::u8string or std::u8string_view to a UTF-8 encoded std::string.
+ *
+ * @param u8_string UTF-8 encoded u8string
+ *
+ * @returns UTF-8 encoded std::string.
+ */
+[[nodiscard]] std::string ToUTF8String(std::u8string_view u8_string);
+
} // namespace Common::FS