Remove strcasestr

CMakeLists.txt

@@ -867,7 +867,6 @@ endif()
 check_type_size(errno_t ERRNOT)
 check_function_exists("strcpy_s" HAVE_STRCPYS)
 check_function_exists("strncpy_s" HAVE_STRNCPYS)
-check_function_exists("strcasestr" HAVE_STRCASESTR)
 check_function_exists("strnlen" HAVE_STRNLEN)
 check_function_exists("getopt" HAVE_GETOPT)
 
@@ -891,10 +890,6 @@ if(HAVE_STRCATS)
 	add_definitions(-DHAVE_STRCATS)
 endif()
 
-if(HAVE_STRCASESTR)
-	add_definitions(-DHAVE_STRCASESTR)
-endif()
-
 if(HAVE_STRNLEN)
 	add_definitions(-DHAVE_STRNLEN)
 endif()

src/game/game.cpp

@@ -771,6 +771,17 @@ static void GameTypeMachineVsMachineTraining()
 --  Game creation
 ----------------------------------------------------------------------------*/
 
+static bool has_any_extension(fs::path filename, std::initializer_list<fs::path> extensions)
+{
+	while (filename.has_extension()) {
+		if (ranges::contains(extensions, filename.extension())) {
+			return true;
+		}
+		filename.replace_extension();
+	}
+	return false;
+}
+
 /**
 **  CreateGame.
 **
@@ -800,12 +811,9 @@ void CreateGame(const fs::path &filename, CMap *map)
 		InitSyncRand();
 	}
 
-	if (Map.Info.Filename.empty() && !filename.empty()) {
+	if (Map.Info.Filename.empty() && has_any_extension(filename, {".smp", ".SMP"})) {
 		const std::string path = LibraryFileName(filename.string());
-
-		if (strcasestr(filename.string().c_str(), ".smp")) {
-			LuaLoadFile(path);
-		}
+		LuaLoadFile(path);
 	}
 
 	for (int i = 0; i < PlayerMax; ++i) {

src/include/util.h

@@ -104,11 +104,6 @@ extern errno_t strncpy_s(char *dst, size_t dstsize, const char *src, size_t coun
 extern errno_t strcat_s(char *dst, size_t dstsize, const char *src);
 #endif
 
-#ifndef HAVE_STRCASESTR
-/// case insensitive strstr
-extern const char *strcasestr(const char *str, const char *substr) noexcept;
-#endif // !HAVE_STRCASESTR
-
 #if defined(WIN32) && defined(UNICODE)
 #define L(LITERAL) L"" LITERAL
 #else

src/stratagus/util.cpp

@@ -296,39 +296,6 @@ errno_t strcat_s(char *dst, size_t dstsize, const char *src)
 }
 #endif
 
-#if !defined(HAVE_STRCASESTR)
-/**
-**  Case insensitive version of strstr
-**
-**  @param a  String to search in
-**  @param b  Substring to search for
-**
-**  @return   Pointer to first occurrence of b or nullptr if not found.
-*/
-const char *strcasestr(const char *a, const char *b) noexcept
-{
-	int x;
-
-	if (!a || !*a || !b || !*b || strlen(a) < strlen(b)) {
-		return nullptr;
-	}
-
-	x = 0;
-	while (*a) {
-		if (a[x] && (tolower(a[x]) == tolower(b[x]))) {
-			++x;
-		} else if (b[x]) {
-			++a;
-			x = 0;
-		} else {
-			return (char *)a;
-		}
-	}
-
-	return nullptr;
-}
-#endif // !HAVE_STRCASESTR
-
 int to_number(std::string_view s, int base)
 {
 #if __has_include(<charconv>)

tests/stratagus/test_util.cpp

@@ -99,16 +99,6 @@ TEST_CASE("strcat_s")
 	CHECK(std::string_view{"hello world"} == buffer);
 }
 
-TEST_CASE("strcasestr")
-{
-	const char *text = "HELLO world";
-
-	CHECK(nullptr == strcasestr(text, "not found"));
-	CHECK(text == strcasestr(text, "HelLo"));
-	CHECK(text + 6 == strcasestr(text, "WoRlD"));
-	CHECK(text + 4 == strcasestr(text, "o"));
-}
-
 TEST_CASE("strnlen")
 {
 	CHECK(2u == strnlen("hello", 2));