ntfs_file::get_filename: use utf16_to_utf8

maharmstone · Aug 7, 2022 · 033b832 · 033b832
1 parent bd8f4ee
commit 033b832
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/ntfs.cpp b/src/ntfs.cpp
@@ -736,9 +736,7 @@ string ntfs_file::get_filename() {
  parts.pop_back();
  }
 
- wstring_convert<codecvt_utf8_utf16<char16_t>, char16_t> convert;
-
- return convert.to_bytes((char16_t*)retw.data(), (char16_t*)&retw[retw.length()]);
+ return utf16_to_utf8(retw);
 }
 
 void ntfs::seek(uint64_t pos) {

diff --git a/src/ntfs2btrfs.cpp b/src/ntfs2btrfs.cpp
@@ -254,7 +254,7 @@ static constexpr void utf16_to_utf8_span(u16string_view sv, span<char> t) noexce
  }
 }
 
-static constexpr string utf16_to_utf8(u16string_view sv) {
+string utf16_to_utf8(u16string_view sv) {
  if (sv.empty())
  return "";
 

diff --git a/src/ntfs2btrfs.h b/src/ntfs2btrfs.h
@@ -343,3 +343,6 @@ extern "C" void blake2b(void *out, size_t outlen, const void* in, size_t inlen);
 
 // rollback.cpp
 void rollback(const std::string& fn);
+
+// ntfs2btrfs.cpp
+std::string utf16_to_utf8(std::u16string_view sv);