summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-07-26 11:10:37 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-07-27 06:02:22 +0200
commitf5f04cce01a062fe00e2935f468c2cb9d92698ce (patch)
treed4ef6b7e0cb7627528b4cde1f4a21cbf2d95083e /src
parentMerge pull request #6696 from ameerj/speed-limit-rename (diff)
downloadyuzu-f5f04cce01a062fe00e2935f468c2cb9d92698ce.tar
yuzu-f5f04cce01a062fe00e2935f468c2cb9d92698ce.tar.gz
yuzu-f5f04cce01a062fe00e2935f468c2cb9d92698ce.tar.bz2
yuzu-f5f04cce01a062fe00e2935f468c2cb9d92698ce.tar.lz
yuzu-f5f04cce01a062fe00e2935f468c2cb9d92698ce.tar.xz
yuzu-f5f04cce01a062fe00e2935f468c2cb9d92698ce.tar.zst
yuzu-f5f04cce01a062fe00e2935f468c2cb9d92698ce.zip
Diffstat (limited to '')
-rw-r--r--src/common/fs/fs_util.cpp4
-rw-r--r--src/common/fs/fs_util.h11
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