From caba64040cb2a2df96bda1df6be5cd4d75defbee Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Tue, 11 Jul 2023 01:21:16 +0200
Subject: [PATCH] Reimplement sys_string_to_string using utfcpp

---
 src/dwarfs/util.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/dwarfs/util.cpp b/src/dwarfs/util.cpp
index 4a80e89d..c05e5a50 100644
--- a/src/dwarfs/util.cpp
+++ b/src/dwarfs/util.cpp
@@ -19,13 +19,9 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <algorithm>
 #include <array>
 #include <charconv>
-#include <climits>
-#include <codecvt>
-#include <locale>
-#include <string>
-#include <string_view>
 
 #include <utf8cpp/utf8.h>
 
@@ -126,8 +122,10 @@ std::chrono::milliseconds parse_time_with_unit(std::string const& str) {
 
 std::string sys_string_to_string(sys_string const& in) {
 #ifdef _WIN32
-  static std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter;
-  return converter.to_bytes(in);
+  std::u16string tmp(in.size(), 0);
+  std::transform(in.begin(), in.end(), tmp.begin(),
+                 [](sys_char c) { return static_cast<char16_t>(c); });
+  return utf8::utf16to8(tmp);
 #else
   return in;
 #endif