From 46a844786bea0871bcfbc3b30aa1282adf88e897 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 24 Nov 2020 12:43:01 -0800 Subject: [PATCH] Added SDL_wcscasecmp() and SDL_wcsncasecmp() --- configure | 2 +- configure.ac | 2 +- include/SDL_config.h.in | 4 ++ include/SDL_config_windows.h | 2 + include/SDL_stdinc.h | 2 + src/dynapi/SDL_dynapi_overrides.h | 2 + src/dynapi/SDL_dynapi_procs.h | 2 + src/stdlib/SDL_string.c | 79 +++++++++++++++++++++++++++++++ 8 files changed, 93 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e3dc06c012cc0..7823da9898092 100755 --- a/configure +++ b/configure @@ -17072,7 +17072,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - for ac_func in malloc calloc realloc free getenv setenv putenv unsetenv qsort abs bcopy memset memcpy memmove wcslen wcslcpy wcslcat wcsdup wcsstr wcscmp wcsncmp strlen strlcpy strlcat _strrev _strupr _strlwr strchr strrchr strstr strtok_r itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp vsscanf vsnprintf fopen64 fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname getauxval poll _Exit + for ac_func in malloc calloc realloc free getenv setenv putenv unsetenv qsort abs bcopy memset memcpy memmove wcslen wcslcpy wcslcat wcsdup wcsstr wcscmp wcsncmp wcscasecmp _wcsicmp wcsncasecmp _wcsnicmp strlen strlcpy strlcat _strrev _strupr _strlwr strchr strrchr strstr strtok_r itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp vsscanf vsnprintf fopen64 fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname getauxval poll _Exit do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/configure.ac b/configure.ac index 843cc171dcdbb..a1aada1995473 100644 --- a/configure.ac +++ b/configure.ac @@ -346,7 +346,7 @@ if test x$enable_libc = xyes; then AC_DEFINE(HAVE_MPROTECT, 1, [ ]) ]), ) - AC_CHECK_FUNCS(malloc calloc realloc free getenv setenv putenv unsetenv qsort abs bcopy memset memcpy memmove wcslen wcslcpy wcslcat wcsdup wcsstr wcscmp wcsncmp strlen strlcpy strlcat _strrev _strupr _strlwr strchr strrchr strstr strtok_r itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp vsscanf vsnprintf fopen64 fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname getauxval poll _Exit) + AC_CHECK_FUNCS(malloc calloc realloc free getenv setenv putenv unsetenv qsort abs bcopy memset memcpy memmove wcslen wcslcpy wcslcat wcsdup wcsstr wcscmp wcsncmp wcscasecmp _wcsicmp wcsncasecmp _wcsnicmp strlen strlcpy strlcat _strrev _strupr _strlwr strchr strrchr strstr strtok_r itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp vsscanf vsnprintf fopen64 fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname getauxval poll _Exit) AC_CHECK_LIB(m, pow, [LIBS="$LIBS -lm"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm"]) AC_CHECK_FUNCS(acos acosf asin asinf atan atanf atan2 atan2f ceil ceilf copysign copysignf cos cosf exp expf fabs fabsf floor floorf trunc truncf fmod fmodf log logf log10 log10f pow powf scalbn scalbnf sin sinf sqrt sqrtf tan tanf) diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in index 48bc2a6bc7b9d..ee9b4342c5651 100644 --- a/include/SDL_config.h.in +++ b/include/SDL_config.h.in @@ -103,6 +103,10 @@ #undef HAVE_WCSSTR #undef HAVE_WCSCMP #undef HAVE_WCSNCMP +#undef HAVE_WCSCASECMP +#undef HAVE__WCSICMP +#undef HAVE_WCSNCASECMP +#undef HAVE__WCSNICMP #undef HAVE_STRLEN #undef HAVE_STRLCPY #undef HAVE_STRLCAT diff --git a/include/SDL_config_windows.h b/include/SDL_config_windows.h index ca591c23d3e32..d43c90ac58a5f 100644 --- a/include/SDL_config_windows.h +++ b/include/SDL_config_windows.h @@ -134,6 +134,8 @@ typedef unsigned int uintptr_t; #define HAVE_STRNCMP 1 #define HAVE__STRICMP 1 #define HAVE__STRNICMP 1 +#define HAVE__WCSICMP 1 +#define HAVE__WCSNICMP 1 #define HAVE_ACOS 1 #define HAVE_ACOSF 1 #define HAVE_ASIN 1 diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h index 5798a054bc736..a317c34e5c7cc 100644 --- a/include/SDL_stdinc.h +++ b/include/SDL_stdinc.h @@ -469,6 +469,8 @@ extern DECLSPEC wchar_t *SDLCALL SDL_wcsstr(const wchar_t *haystack, const wchar extern DECLSPEC int SDLCALL SDL_wcscmp(const wchar_t *str1, const wchar_t *str2); extern DECLSPEC int SDLCALL SDL_wcsncmp(const wchar_t *str1, const wchar_t *str2, size_t maxlen); +extern DECLSPEC int SDLCALL SDL_wcscasecmp(const wchar_t *str1, const wchar_t *str2); +extern DECLSPEC int SDLCALL SDL_wcsncasecmp(const wchar_t *str1, const wchar_t *str2, size_t len); extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str); extern DECLSPEC size_t SDLCALL SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen); diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h index 1a583cf53c653..221a193862a0b 100644 --- a/src/dynapi/SDL_dynapi_overrides.h +++ b/src/dynapi/SDL_dynapi_overrides.h @@ -786,3 +786,5 @@ #define SDL_GameControllerSetSensorEnabled SDL_GameControllerSetSensorEnabled_REAL #define SDL_GameControllerIsSensorEnabled SDL_GameControllerIsSensorEnabled_REAL #define SDL_GameControllerGetSensorData SDL_GameControllerGetSensorData_REAL +#define SDL_wcscasecmp SDL_wcscasecmp_REAL +#define SDL_wcsncasecmp SDL_wcsncasecmp_REAL diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h index 0fd1939ad545b..4aee1c404c09e 100644 --- a/src/dynapi/SDL_dynapi_procs.h +++ b/src/dynapi/SDL_dynapi_procs.h @@ -847,3 +847,5 @@ SDL_DYNAPI_PROC(SDL_bool,SDL_GameControllerHasSensor,(SDL_GameController *a, SDL SDL_DYNAPI_PROC(int,SDL_GameControllerSetSensorEnabled,(SDL_GameController *a, SDL_SensorType b, SDL_bool c),(a,b,c),return) SDL_DYNAPI_PROC(SDL_bool,SDL_GameControllerIsSensorEnabled,(SDL_GameController *a, SDL_SensorType b),(a,b),return) SDL_DYNAPI_PROC(int,SDL_GameControllerGetSensorData,(SDL_GameController *a, SDL_SensorType b, float *c, int d),(a,b,c,d),return) +SDL_DYNAPI_PROC(int,SDL_wcscasecmp,(const wchar_t *a, const wchar_t *b),(a,b),return) +SDL_DYNAPI_PROC(int,SDL_wcsncasecmp,(const wchar_t *a, const wchar_t *b, size_t c),(a,b,c),return) diff --git a/src/stdlib/SDL_string.c b/src/stdlib/SDL_string.c index 7abeafdbd6000..766f8cf9dabac 100644 --- a/src/stdlib/SDL_string.c +++ b/src/stdlib/SDL_string.c @@ -531,6 +531,85 @@ SDL_wcsncmp(const wchar_t *str1, const wchar_t *str2, size_t maxlen) #endif /* HAVE_WCSNCMP */ } +int +SDL_wcscasecmp(const wchar_t *str1, const wchar_t *str2) +{ +#if defined(HAVE_WCSCASECMP) + return wcscasecmp(str1, str2); +#elif defined(HAVE__WCSICMP) + return _wcsicmp(str1, str2); +#else + wchar_t a = 0; + wchar_t b = 0; + while (*str1 && *str2) { + /* FIXME: This doesn't actually support wide characters */ + if (*str1 >= 0x80 || *str2 >= 0x80) { + a = *str1; + b = *str2; + } else { + a = SDL_toupper((unsigned char) *str1); + b = SDL_toupper((unsigned char) *str2); + } + if (a != b) + break; + ++str1; + ++str2; + } + + /* FIXME: This doesn't actually support wide characters */ + if (*str1 >= 0x80 || *str2 >= 0x80) { + a = *str1; + b = *str2; + } else { + a = SDL_toupper((unsigned char) *str1); + b = SDL_toupper((unsigned char) *str2); + } + return (int) ((unsigned int) a - (unsigned int) b); +#endif /* HAVE__WCSICMP */ +} + +int +SDL_wcsncasecmp(const wchar_t *str1, const wchar_t *str2, size_t maxlen) +{ +#if defined(HAVE_WCSNCASECMP) + return wcsncasecmp(str1, str2, maxlen); +#elif defined(HAVE__WCSNICMP) + return _wcsnicmp(str1, str2, maxlen); +#else + wchar_t a = 0; + wchar_t b = 0; + while (*str1 && *str2 && maxlen) { + /* FIXME: This doesn't actually support wide characters */ + if (*str1 >= 0x80 || *str2 >= 0x80) { + a = *str1; + b = *str2; + } else { + a = SDL_toupper((unsigned char) *str1); + b = SDL_toupper((unsigned char) *str2); + } + if (a != b) + break; + ++str1; + ++str2; + --maxlen; + } + + if (maxlen == 0) { + return 0; + } else { + /* FIXME: This doesn't actually support wide characters */ + if (*str1 >= 0x80 || *str2 >= 0x80) { + a = *str1; + b = *str2; + } else { + a = SDL_toupper((unsigned char) *str1); + b = SDL_toupper((unsigned char) *str2); + } + return (int) ((unsigned int) a - (unsigned int) b); + } +#endif /* HAVE__WCSNICMP */ +} + size_t SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen) {