Fix basename util function on windows

volt-software · Feb 2, 2024 · ac02fbe · ac02fbe
1 parent 995b669
commit ac02fbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/include/ichor/stl/StringUtils.h b/include/ichor/stl/StringUtils.h
@@ -89,9 +89,9 @@ namespace Ichor {
 #ifdef _WIN32
         const std::reverse_iterator<const char *> begin(filename + std::strlen(filename));
         const std::reverse_iterator<const char *> end(filename);
+        const std::string_view seperator{"\\/"};
 
-        const auto it = std::find_first_of(begin, end, std::begin("\\/"),
-                                           std::end("\\/") - 1);
+        const auto it = std::find_first_of(begin, end, std::begin(seperator), std::end(seperator));
         return it != end ? it.base() : filename;
 #else
         const char *rv = std::strrchr(filename, '/');

diff --git a/test/StlTests.cpp b/test/StlTests.cpp
@@ -436,8 +436,13 @@ TEST_CASE("STL Tests") {
     }
 
     SECTION("Basename tests") {
+        REQUIRE(Ichor::basename("") == ""sv);
         REQUIRE(Ichor::basename("file.cpp") == "file.cpp"sv);
+#ifdef _WIN32
+        REQUIRE(Ichor::basename("path\\file.cpp") == "file.cpp"sv);
+#else
         REQUIRE(Ichor::basename("path/file.cpp") == "file.cpp"sv);
         REQUIRE(Ichor::basename("more/path/file.cpp") == "file.cpp"sv);
+#endif
     }
 }