Path: Unicode handling and tests for SanitizeFileName

src/common-tests/path_tests.cpp

@@ -223,3 +223,19 @@ TEST(FileSystem, ChangeFileName)
   ASSERT_EQ(Path::ChangeFileName("/foo/bar", "baz"), "/foo/baz");
 #endif
 }
+
+TEST(FileSystem, SanitizeFileName)
+{
+  ASSERT_EQ(Path::SanitizeFileName(u8"foo"), u8"foo");
+  ASSERT_EQ(Path::SanitizeFileName(u8"foo/bar"), u8"foo_bar");
+  ASSERT_EQ(Path::SanitizeFileName(u8"f🙃o"), u8"f🙃o");
+  ASSERT_EQ(Path::SanitizeFileName(u8"ŻąłóРстуぬねのはen🍪⟑η∏☉ⴤℹ︎∩₲ ₱⟑♰⫳🐱"), u8"ŻąłóРстуぬねのはen🍪⟑η∏☉ⴤℹ︎∩₲ ₱⟑♰⫳🐱");
+#ifdef _WIN32
+  ASSERT_EQ(Path::SanitizeFileName(u8"foo:"), u8"foo_");
+  ASSERT_EQ(Path::SanitizeFileName(u8"foo:bar."), u8"foo_bar_");
+  ASSERT_EQ(Path::SanitizeFileName(u8"foo\\bar"), u8"foo_bar");
+  ASSERT_EQ(Path::SanitizeFileName(u8"foo>bar"), u8"foo_bar");
+  ASSERT_EQ(Path::SanitizeFileName(u8"foo\\bar", false), u8"foo\\bar");
+#endif
+  ASSERT_EQ(Path::SanitizeFileName(u8"foo/bar", false), u8"foo/bar");
+}

src/common/event.cpp

@@ -98,7 +98,7 @@ bool Event::TryWait(u32 timeout_in_ms)
 
   EnterCriticalSection(&m_cs);
   while (!m_signaled.load() && (GetTickCount() - start) < timeout_in_ms)
-    SleepConditionVariableCS(&m_cv, &m_cs, INFINITE);
+    SleepConditionVariableCS(&m_cv, &m_cs, timeout_in_ms);
 
   const bool result = m_signaled.load();
 

src/common/file_system.cpp

@@ -60,16 +60,28 @@ static std::time_t ConvertFileTimeToUnixTime(const FILETIME& ft)
 }
 #endif
 
-static inline bool FileSystemCharacterIsSane(char c, bool StripSlashes)
+static inline bool FileSystemCharacterIsSane(char32_t c, bool strip_slashes)
 {
-  if (!(c >= 'a' && c <= 'z') && !(c >= 'A' && c <= 'Z') && !(c >= '0' && c <= '9') && c != ' ' && c != ' ' &&
+#ifdef _WIN32
-      c != '_' && c != '-' && c != '.')
+  // https://docs.microsoft.com/en-gb/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN#naming-conventions
-  {
+  if ((c == U'/' || c == U'\\') && strip_slashes)
-    if (!StripSlashes && (c == '/' || c == '\\'))
+    return false;
-      return true;
 
+  if (c == U'<' || c == U'>' || c == U':' || c == U'"' || c == U'|' || c == U'?' || c == U'*' || c == U'0' ||
+      c <= static_cast<char32_t>(31))
+  {
     return false;
   }
+#else
+  if (c == '/' && strip_slashes)
+    return false;
+
+    // macos doesn't allow colons, apparently
+#ifdef __APPLE__
+  if (c == U':')
+    return false;
+#endif
+#endif
 
   return true;
 }
@@ -117,39 +129,27 @@ static inline void PathAppendString(std::string& dst, const T& src)
   }
 }
 
-void Path::SanitizeFileName(char* Destination, u32 cbDestination, const char* FileName, bool StripSlashes /* = true */)
+std::string Path::SanitizeFileName(const std::string_view& str, bool strip_slashes /* = true */)
 {
-  u32 i;
+  std::string ret;
-  u32 fileNameLength = static_cast<u32>(std::strlen(FileName));
+  ret.reserve(str.length());
 
-  if (FileName == Destination)
+  size_t pos = 0;
+  while (pos < str.length())
   {
-    for (i = 0; i < fileNameLength; i++)
+    char32_t ch;
-    {
+    pos += StringUtil::DecodeUTF8(str, pos, &ch);
-      if (!FileSystemCharacterIsSane(FileName[i], StripSlashes))
+    ch = FileSystemCharacterIsSane(ch, strip_slashes) ? ch : U'_';
-        Destination[i] = '_';
+    StringUtil::EncodeAndAppendUTF8(ret, ch);
   }
-  }
-  else
-  {
-    for (i = 0; i < fileNameLength && i < cbDestination; i++)
-    {
-      if (FileSystemCharacterIsSane(FileName[i], StripSlashes))
-        Destination[i] = FileName[i];
-      else
-        Destination[i] = '_';
-    }
-  }
-}
 
-void Path::SanitizeFileName(std::string& Destination, bool StripSlashes /* = true*/)
+#ifdef _WIN32
-{
+  // Windows: Can't end filename with a period.
-  const std::size_t len = Destination.length();
+  if (ret.length() > 0 && ret.back() == '.')
-  for (std::size_t i = 0; i < len; i++)
+    ret.back() = '_';
-  {
+#endif
-    if (!FileSystemCharacterIsSane(Destination[i], StripSlashes))
+
-      Destination[i] = '_';
+  return ret;
-  }
 }
 
 bool Path::IsAbsolute(const std::string_view& path)

src/common/path.h

@@ -22,8 +22,7 @@ std::string Canonicalize(const std::string_view& path);
 void Canonicalize(std::string* path);
 
 /// Sanitizes a filename for use in a filesystem.
-void SanitizeFileName(char* Destination, u32 cbDestination, const char* FileName, bool StripSlashes /* = true */);
+std::string SanitizeFileName(const std::string_view& str, bool strip_slashes = true);
-void SanitizeFileName(std::string& Destination, bool StripSlashes = true);
 
 /// Returns true if the specified path is an absolute path (C:\Path on Windows or /path on Unix).
 bool IsAbsolute(const std::string_view& path);

src/common/string_util.cpp

@@ -295,25 +295,88 @@ bool StringUtil::ParseAssignmentString(const std::string_view& str, std::string_
   return true;
 }
 
-void StringUtil::AppendUTF16CharacterToUTF8(std::string& s, u16 ch)
+void StringUtil::EncodeAndAppendUTF8(std::string& s, char32_t ch)
 {
-  if (ch & 0xf800)
+  if (ch <= 0x7F)
   {
-    s.push_back(static_cast<char>(static_cast<u8>(0xe0 | static_cast<u8>(ch >> 12))));
+    s.push_back(static_cast<char>(static_cast<u8>(ch)));
+  }
+  else if (ch <= 0x07FF)
+  {
+    s.push_back(static_cast<char>(static_cast<u8>(0xc0 | static_cast<u8>((ch >> 6) & 0x1f))));
+    s.push_back(static_cast<char>(static_cast<u8>(0x80 | static_cast<u8>((ch & 0x3f)))));
+  }
+  else if (ch <= 0xFFFF)
+  {
+    s.push_back(static_cast<char>(static_cast<u8>(0xe0 | static_cast<u8>(((ch >> 12) & 0x0f)))));
     s.push_back(static_cast<char>(static_cast<u8>(0x80 | static_cast<u8>(((ch >> 6) & 0x3f)))));
     s.push_back(static_cast<char>(static_cast<u8>(0x80 | static_cast<u8>((ch & 0x3f)))));
   }
-  else if (ch & 0xff80)
+  else if (ch <= 0x10FFFF)
   {
-    s.push_back(static_cast<char>(static_cast<u8>(0xc0 | static_cast<u8>((ch >> 6)))));
+    s.push_back(static_cast<char>(static_cast<u8>(0xf0 | static_cast<u8>(((ch >> 18) & 0x07)))));
+    s.push_back(static_cast<char>(static_cast<u8>(0x80 | static_cast<u8>(((ch >> 12) & 0x3f)))));
+    s.push_back(static_cast<char>(static_cast<u8>(0x80 | static_cast<u8>(((ch >> 6) & 0x3f)))));
     s.push_back(static_cast<char>(static_cast<u8>(0x80 | static_cast<u8>((ch & 0x3f)))));
   }
   else
   {
-    s.push_back(static_cast<char>(static_cast<u8>(ch)));
+    s.push_back(static_cast<char>(0xefu));
+    s.push_back(static_cast<char>(0xbfu));
+    s.push_back(static_cast<char>(0xbdu));
   }
 }
 
+size_t StringUtil::DecodeUTF8(const void* bytes, size_t length, char32_t* ch)
+{
+  const u8* s = reinterpret_cast<const u8*>(bytes);
+  if (s[0] < 0x80)
+  {
+    *ch = s[0];
+    return 1;
+  }
+  else if ((s[0] & 0xe0) == 0xc0)
+  {
+    if (length < 2)
+      goto invalid;
+
+    *ch = static_cast<char32_t>((static_cast<u32>(s[0] & 0x1f) << 6) | (static_cast<u32>(s[1] & 0x3f) << 0));
+    return 2;
+  }
+  else if ((s[0] & 0xf0) == 0xe0)
+  {
+    if (length < 3)
+      goto invalid;
+
+    *ch = static_cast<char32_t>((static_cast<u32>(s[0] & 0x0f) << 12) | (static_cast<u32>(s[1] & 0x3f) << 6) |
+                                (static_cast<u32>(s[2] & 0x3f) << 0));
+    return 3;
+  }
+  else if ((s[0] & 0xf8) == 0xf0 && (s[0] <= 0xf4))
+  {
+    if (length < 4)
+      goto invalid;
+
+    *ch = static_cast<char32_t>((static_cast<u32>(s[0] & 0x07) << 18) | (static_cast<u32>(s[1] & 0x3f) << 12) |
+                                (static_cast<u32>(s[2] & 0x3f) << 6) | (static_cast<u32>(s[3] & 0x3f) << 0));
+    return 4;
+  }
+
+invalid:
+  *ch = 0xFFFFFFFFu;
+  return 1;
+}
+
+size_t StringUtil::DecodeUTF8(const std::string_view& str, size_t offset, char32_t* ch)
+{
+  return DecodeUTF8(str.data() + offset, str.length() - offset, ch);
+}
+
+size_t StringUtil::DecodeUTF8(const std::string& str, size_t offset, char32_t* ch)
+{
+  return DecodeUTF8(str.data() + offset, str.length() - offset, ch);
+}
+
 #ifdef _WIN32
 
 std::wstring StringUtil::UTF8StringToWideString(const std::string_view& str)

src/common/string_util.h

@@ -185,7 +185,13 @@ void ReplaceAll(std::string* subject, const std::string_view& search, const std:
 bool ParseAssignmentString(const std::string_view& str, std::string_view* key, std::string_view* value);
 
 /// Appends a UTF-16/UTF-32 codepoint to a UTF-8 string.
-void AppendUTF16CharacterToUTF8(std::string& s, u16 ch);
+void EncodeAndAppendUTF8(std::string& s, char32_t ch);
+
+/// Decodes UTF-8 to a single codepoint, updating the position parameter.
+/// Returns the number of bytes the codepoint took in the original string.
+size_t DecodeUTF8(const void* bytes, size_t length, char32_t* ch);
+size_t DecodeUTF8(const std::string_view& str, size_t offset, char32_t* ch);
+size_t DecodeUTF8(const std::string& str, size_t offset, char32_t* ch);
 
 /// Strided memcpy/memcmp.
 ALWAYS_INLINE static void StrideMemCpy(void* dst, std::size_t dst_stride, const void* src, std::size_t src_stride,

src/core/system.cpp

@@ -703,9 +703,7 @@ std::optional<DiscRegion> System::GetRegionForPath(const char* image_path)
 
 std::string System::GetGameSettingsPath(const std::string_view& game_serial)
 {
-  std::string sanitized_serial(game_serial);
+  const std::string sanitized_serial(Path::SanitizeFileName(game_serial));
-  Path::SanitizeFileName(sanitized_serial);
-
   return Path::Combine(EmuFolders::GameSettings, fmt::format("{}.ini", sanitized_serial));
 }
 

src/frontend-common/achievements.cpp

@@ -1747,8 +1747,7 @@ const std::string& Achievements::GetAchievementBadgePath(const Achievement& achi
     return badge_path;
 
   // well, this comes from the internet.... :)
-  std::string clean_name(achievement.badge_name);
+  const std::string clean_name(Path::SanitizeFileName(achievement.badge_name));
-  Path::SanitizeFileName(clean_name);
   badge_path = Path::Combine(s_achievement_icon_cache_directory,
                              fmt::format("{}{}.png", clean_name, achievement.locked ? "_lock" : ""));
   if (FileSystem::FileExists(badge_path.c_str()))

src/frontend-common/game_list.cpp

@@ -660,8 +660,7 @@ std::string GameList::GetNewCoverImagePathForEntry(const Entry* entry, const cha
   }
 
   // Check for illegal characters, use serial instead.
-  std::string sanitized_name(entry->title);
+  const std::string sanitized_name(Path::SanitizeFileName(entry->title));
-  Path::SanitizeFileName(sanitized_name);
 
   std::string name;
   if (sanitized_name != entry->title)