From a1eeb9908d9cba0a51fbad519ce770b96d0a78d5 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Tue, 1 Jun 2021 09:19:08 -0400
Subject: [PATCH 1/2] common: fs: fs_util: Add more string conversion functions

---
 src/common/fs/fs_util.cpp | 10 ++++++++++
 src/common/fs/fs_util.h   | 23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/common/fs/fs_util.cpp b/src/common/fs/fs_util.cpp
index 0ddfc31316..9db746c4bd 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 951df53b6c..de452c0f6c 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

From dba7bcd489b9802c3d25e3e8183ef7991af301b8 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Tue, 1 Jun 2021 09:22:18 -0400
Subject: [PATCH 2/2] common: fs: fs_util: Move PathToUTF8String to fs_util

---
 src/common/fs/fs_util.cpp   |  4 ++++
 src/common/fs/fs_util.h     | 10 ++++++++++
 src/common/fs/path_util.cpp |  6 ------
 src/common/fs/path_util.h   |  9 ---------
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/common/fs/fs_util.cpp b/src/common/fs/fs_util.cpp
index 9db746c4bd..357cf5855d 100644
--- a/src/common/fs/fs_util.cpp
+++ b/src/common/fs/fs_util.cpp
@@ -20,4 +20,8 @@ std::string ToUTF8String(std::u8string_view u8_string) {
     return std::string{u8_string.begin(), u8_string.end()};
 }
 
+std::string PathToUTF8String(const std::filesystem::path& path) {
+    return ToUTF8String(path.u8string());
+}
+
 } // namespace Common::FS
diff --git a/src/common/fs/fs_util.h b/src/common/fs/fs_util.h
index de452c0f6c..ec9950ee72 100644
--- a/src/common/fs/fs_util.h
+++ b/src/common/fs/fs_util.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <concepts>
+#include <filesystem>
 #include <span>
 #include <string>
 #include <string_view>
@@ -45,4 +46,13 @@ concept IsChar = std::same_as<T, char>;
  */
 [[nodiscard]] std::string ToUTF8String(std::u8string_view u8_string);
 
+/**
+ * Converts a filesystem path to a UTF-8 encoded std::string.
+ *
+ * @param path Filesystem path
+ *
+ * @returns UTF-8 encoded std::string.
+ */
+[[nodiscard]] std::string PathToUTF8String(const std::filesystem::path& path);
+
 } // namespace Common::FS
diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp
index 8b732a21c3..6cdd14f138 100644
--- a/src/common/fs/path_util.cpp
+++ b/src/common/fs/path_util.cpp
@@ -129,12 +129,6 @@ private:
     std::unordered_map<YuzuPath, fs::path> yuzu_paths;
 };
 
-std::string PathToUTF8String(const fs::path& path) {
-    const auto utf8_string = path.u8string();
-
-    return std::string{utf8_string.begin(), utf8_string.end()};
-}
-
 bool ValidatePath(const fs::path& path) {
     if (path.empty()) {
         LOG_ERROR(Common_Filesystem, "Input path is empty, path={}", PathToUTF8String(path));
diff --git a/src/common/fs/path_util.h b/src/common/fs/path_util.h
index a9fadbceb9..14e8c35d74 100644
--- a/src/common/fs/path_util.h
+++ b/src/common/fs/path_util.h
@@ -25,15 +25,6 @@ enum class YuzuPath {
     ShaderDir,      // Where shaders are stored.
 };
 
-/**
- * Converts a filesystem path to a UTF-8 encoded std::string.
- *
- * @param path Filesystem path
- *
- * @returns UTF-8 encoded std::string.
- */
-[[nodiscard]] std::string PathToUTF8String(const std::filesystem::path& path);
-
 /**
  * Validates a given path.
  *