mirrors
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add SDL_strpbrk

This commit is contained in:
Anonymous Maarten 2024-09-02 14:13:54 +02:00 committed by Anonymous Maarten
parent 55934bc85e
commit baa1a5e2f4
15 changed files with 96 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -979,7 +979,7 @@ if(SDL_LIBC)
pow powf putenv
realloc rindex round roundf
scalbn scalbnf setenv sin sinf sqr sqrt sqrtf sscanf strchr
strcmp strlcat strlcpy strlen strncmp strnlen
strcmp strlcat strlcpy strlen strncmp strnlen strpbrk
strrchr strstr strnstr strtod strtok_r strtol strtoll strtoul strtoull
tan tanf trunc truncf
unsetenv

1
cmake/PreseedEmscriptenCache.cmake
View File

@ -98,6 +98,7 @@ if(EMSCRIPTEN)
set(LIBC_HAS_STRNCMP "1" CACHE INTERNAL "Have symbol strncmp")
set(LIBC_HAS_STRNLEN "1" CACHE INTERNAL "Have symbol strnlen")
set(LIBC_HAS_STRNSTR "" CACHE INTERNAL "Have symbol strnstr")
set(LIBC_HAS_STRPBRK "1" CACHE INTERNAL "Have symbol strpbrk")
set(LIBC_HAS_STRRCHR "1" CACHE INTERNAL "Have symbol strrchr")
set(LIBC_HAS_STRSTR "1" CACHE INTERNAL "Have symbol strstr")
set(LIBC_HAS_STRTOD "1" CACHE INTERNAL "Have symbol strtod")

1
cmake/PreseedMSVCCache.cmake
View File

@ -111,6 +111,7 @@ if(MSVC)
set(LIBC_HAS_STRNCMP "1" CACHE INTERNAL "Have symbol strncmp")
set(LIBC_HAS_STRNLEN "1" CACHE INTERNAL "Have symbol strnlen")
set(LIBC_HAS_STRNSTR "" CACHE INTERNAL "Have symbol strnstr")
set(LIBC_HAS_STRPBRK "1" CACHE INTERNAL "Have symbol strpbrk")
set(LIBC_HAS_STRRCHR "1" CACHE INTERNAL "Have symbol strrchr")
set(LIBC_HAS_STRSTR "1" CACHE INTERNAL "Have symbol strstr")
set(LIBC_HAS_STRTOD "1" CACHE INTERNAL "Have symbol strtod")

17
include/SDL3/SDL_stdinc.h
View File

@ -1297,6 +1297,22 @@ extern SDL_DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str
*/
extern SDL_DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen);
/**
* Searches a string for the first occurence of any character contained in a
* breakset, and returns a pointer from the string to that character.
*
* \param str The null-terminated string to be searched.
* \param breakset A null-terminated string containing the list of characters
* to look for.
* \returns A pointer to the location, in str, of the first occurence of a
* character present in the breakset, or NULL if none is found.
*
* \threadsafety It is safe to call this function from any thread.
*
* \since This function is available since SDL 3.0.0.
*/
extern SDL_DECLSPEC char * SDLCALL SDL_strpbrk(const char * SDL_RESTRICT str, const char * SDL_RESTRICT breakset);
/**
* The Unicode REPLACEMENT CHARACTER codepoint.
*
@ -3079,6 +3095,7 @@ size_t wcslcat(wchar_t *dst, const wchar_t *src, size_t size);
#define SDL_wcsncmp wcsncmp
#define SDL_strcasecmp strcasecmp
#define SDL_strncasecmp strncasecmp
#define SDL_strpbrk strpbrk
#define SDL_sscanf sscanf
#define SDL_vsscanf vsscanf
#define SDL_snprintf snprintf

1
include/build_config/SDL_build_config.h.cmake
View File

@ -100,6 +100,7 @@
#cmakedefine HAVE_STRNLEN 1
#cmakedefine HAVE_STRLCPY 1
#cmakedefine HAVE_STRLCAT 1
#cmakedefine HAVE_STRPBRK 1
#cmakedefine HAVE__STRREV 1
#cmakedefine HAVE__STRUPR 1
#cmakedefine HAVE__STRLWR 1

1
include/build_config/SDL_build_config_ios.h
View File

@ -76,6 +76,7 @@
#define HAVE_ATOF 1
#define HAVE_STRCMP 1
#define HAVE_STRNCMP 1
#define HAVE_STRPBRK 1
#define HAVE_STRCASESTR 1
#define HAVE_VSSCANF 1
#define HAVE_VSNPRINTF 1

1
include/build_config/SDL_build_config_macos.h
View File

@ -68,6 +68,7 @@
#define HAVE_STRLEN 1
#define HAVE_STRLCPY 1
#define HAVE_STRLCAT 1
#define HAVE_STRPBRK 1
#define HAVE_STRCHR 1
#define HAVE_STRRCHR 1
#define HAVE_STRSTR 1

1
include/build_config/SDL_build_config_windows.h
View File

@ -160,6 +160,7 @@ typedef unsigned int uintptr_t;
#define HAVE_ATOF 1
#define HAVE_STRCMP 1
#define HAVE_STRNCMP 1
#define HAVE_STRPBRK 1
#define HAVE__WCSDUP 1
#define HAVE_SSCANF 1
#define HAVE_VSSCANF 1

1
include/build_config/SDL_build_config_winrt.h
View File

@ -85,6 +85,7 @@
#define HAVE__STRREV 1
#define HAVE__STRUPR 1
#define HAVE_STRCHR 1
#define HAVE_STRPBRK 1
#define HAVE_STRRCHR 1
#define HAVE_STRSTR 1
#define HAVE_STRTOL 1

1
include/build_config/SDL_build_config_xbox.h
View File

@ -82,6 +82,7 @@
#define HAVE_MEMMOVE 1
#define HAVE_MEMCMP 1
#define HAVE_STRLEN 1
#define HAVE_STRPBRK 1
#define HAVE__STRREV 1
/* These functions have security warnings, so we won't use them */
/* #undef HAVE__STRUPR */

1
src/dynapi/SDL_dynapi.sym
View File

@ -1144,6 +1144,7 @@ SDL3_0.0.0 {
SDL_wcsnstr;
SDL_wcsstr;
SDL_wcstol;
SDL_strpbrk;
# extra symbols go here (don't modify this line)
local: *;
};

1
src/dynapi/SDL_dynapi_overrides.h
View File

@ -1169,3 +1169,4 @@
#define SDL_wcsnstr SDL_wcsnstr_REAL
#define SDL_wcsstr SDL_wcsstr_REAL
#define SDL_wcstol SDL_wcstol_REAL
#define SDL_strpbrk SDL_strpbrk_REAL

1
src/dynapi/SDL_dynapi_procs.h
View File

@ -1175,3 +1175,4 @@ SDL_DYNAPI_PROC(size_t,SDL_wcsnlen,(const wchar_t *a, size_t b),(a,b),return)
SDL_DYNAPI_PROC(wchar_t*,SDL_wcsnstr,(const wchar_t *a, const wchar_t *b, size_t c),(a,b,c),return)
SDL_DYNAPI_PROC(wchar_t*,SDL_wcsstr,(const wchar_t *a, const wchar_t *b),(a,b),return)
SDL_DYNAPI_PROC(long,SDL_wcstol,(const wchar_t *a, wchar_t **b, int c),(a,b,c),return)
SDL_DYNAPI_PROC(char*,SDL_strpbrk,(const char *a, const char *b),(a,b),return)

19
src/stdlib/SDL_string.c
View File

@ -2401,3 +2401,22 @@ int SDL_vasprintf(char **strp, SDL_PRINTF_FORMAT_STRING const char *fmt, va_list
}
}
}
char * SDL_strpbrk(const char *str, const char *breakset)
{
#ifdef HAVE_STRPBRK
return strpbrk(str, breakset);
#else
for (; *str; str++) {
const char *b;
for (b = breakset; *b; b++) {
if (*str == *b) {
return (char *) str;
}
}
}
return NULL;
#endif
}

51
test/testautomation_stdlib.c
View File

@ -1188,6 +1188,46 @@ stdlib_iconv(void *arg)
return TEST_COMPLETED;
}
static int
stdlib_strpbrk(void *arg)
{
struct {
const char *input;
const char *accept;
int expected[3]; /* negative if NULL */
} test_cases[] = {
{ "", "", { -1, -1, -1 } },
{ "abc", "", { -1, -1, -1 } },
{ "Abc", "a", { -1, -1, -1 } },
{ "abc", "a", { 0, -1, -1 } },
{ "abcbd", "bbbb", { 1, 3, -1 } },
{ "a;b;c", ";", { 1, 3, -1 } },
{ "a;b;c", ",", { -1, -1, -1 } },
{ "a:bbbb;c", ";:", { 1, 6, -1 } },
{ "Hello\tS DL\n", " \t\r\n", { 5, 7, 10 } },
};
int i;
for (i = 0; i < SDL_arraysize(test_cases); i++) {
int j;
const char *input = test_cases[i].input;
for (j = 0; j < SDL_arraysize(test_cases[i].expected); j++) {
char *result;
SDLTest_AssertPass("About to call SDL_strpbrk(\"%s\", \"%s\")", input, test_cases[i].accept);
result = SDL_strpbrk(input, test_cases[i].accept);
if (test_cases[i].expected[j] < 0) {
SDLTest_AssertCheck(result == NULL, "Expected NULL, got %p", result);
} else {
SDLTest_AssertCheck(result == test_cases[i].input + test_cases[i].expected[j], "Expected %p, got %p", test_cases[i].input + test_cases[i].expected[j], result);
input = test_cases[i].input + test_cases[i].expected[j] + 1;
}
}
}
return TEST_COMPLETED;
}
/* ================= Test References ================== */
/* Standard C routine test cases */
@ -1227,8 +1267,12 @@ static const SDLTest_TestCaseReference stdlibTestOverflow = {
stdlib_overflow, "stdlib_overflow", "Overflow detection", TEST_ENABLED
};
static const SDLTest_TestCaseReference stdlibIconv = {
stdlib_iconv, "stdlib_iconv", "Calls to iconv", TEST_ENABLED
static const SDLTest_TestCaseReference stdlibTest_iconv = {
stdlib_iconv, "stdlib_iconv", "Calls to SDL_iconv", TEST_ENABLED
};
static const SDLTest_TestCaseReference stdlibTest_strpbrk = {
stdlib_strpbrk, "stdlib_strpbrk", "Calls to SDL_strpbrk", TEST_ENABLED
};
/* Sequence of Standard C routine test cases */
@ -1242,7 +1286,8 @@ static const SDLTest_TestCaseReference *stdlibTests[] = {
&stdlibTest_sscanf,
&stdlibTest_aligned_alloc,
&stdlibTestOverflow,
&stdlibIconv,
&stdlibTest_iconv,
&stdlibTest_strpbrk,
NULL
};