KolibriOS/kolibrios
15
21
Fork 36
Code Issues 129 Pull Requests 31 Actions 2 Projects 1 Releases Wiki Activity

libc.obj: Added strtok_r (#341)

Browse Source 
Reviewed-on: #341
Reviewed-by: Max Logaev <maxlogaev@proton.me>
Co-authored-by: Egor00f <y.yarin@inbox.ru>
Co-committed-by: Egor00f <y.yarin@inbox.ru>
This commit is contained in:
Егор
2026-03-07 21:30:50 +00:00
committed by Max Logaev
parent 6f2a947deb
commit 91dc4d8cad
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
programs/develop/ktcc/trunk/libc.obj/include/string.h
View File

@@ -32,6 +32,7 @@ DLLAPI char* strrchr(const char* s, int c);
DLLAPI size_t strspn(const char* s1, const char* s2); DLLAPI size_t strspn(const char* s1, const char* s2);
DLLAPI char* strstr(const char* s1, const char* s2); DLLAPI char* strstr(const char* s1, const char* s2);
DLLAPI char* strtok(char* s1, const char* s2); DLLAPI char* strtok(char* s1, const char* s2);
DLLAPI char* strtok_r(char* s1, const char* s2, char** saveptr);
DLLAPI char* strerror(int errnum); DLLAPI char* strerror(int errnum);
DLLAPI size_t strlen(const char* s); DLLAPI size_t strlen(const char* s);
DLLAPI char* strrev(char* str); DLLAPI char* strrev(char* str);

1
programs/develop/ktcc/trunk/libc.obj/source/libc.c
View File

@@ -203,6 +203,7 @@ ksys_dll_t EXPORTS[] = {
{ "strspn", &strspn }, { "strspn", &strspn },
{ "strstr", &strstr }, { "strstr", &strstr },
{ "strtok", &strtok }, { "strtok", &strtok },
{ "strtok_r", &strtok_r },
{ "strxfrm", &strxfrm }, { "strxfrm", &strxfrm },
{ "strpbrk", &strpbrk }, { "strpbrk", &strpbrk },
{ "__errno", &__errno }, { "__errno", &__errno },

25
programs/develop/ktcc/trunk/libc.obj/source/string/strtok.c
View File

@@ -1,14 +1,12 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
#include <string.h> #include <string.h>
char* strtok(char* s, const char* delim) char* strtok_r(char* s, const char* delim, char** last)
{ {
const char* spanp; char *spanp, *tok;
int c, sc; int c, sc;
char* tok;
static char* last;
if (s == NULL && (s = last) == NULL) if (s == NULL && (s = *last) == NULL)
return (NULL); return (NULL);
/* /*
@@ -16,13 +14,13 @@ char* strtok(char* s, const char* delim)
*/ */
cont: cont:
c = *s++; c = *s++;
for (spanp = delim; (sc = *spanp++) != 0;) { for (spanp = (char*)delim; (sc = *spanp++) != 0;) {
if (c == sc) if (c == sc)
goto cont; goto cont;
} }
if (c == 0) { /* no non-delimiter characters */ if (c == 0) { /* no non-delimiter characters */
last = NULL; *last = NULL;
return (NULL); return (NULL);
} }
tok = s - 1; tok = s - 1;
@@ -33,17 +31,24 @@ cont:
*/ */
for (;;) { for (;;) {
c = *s++; c = *s++;
spanp = delim; spanp = (char*)delim;
do { do {
if ((sc = *spanp++) == c) { if ((sc = *spanp++) == c) {
if (c == 0) if (c == 0)
s = NULL; s = NULL;
else else
s[-1] = 0; s[-1] = '\0';
last = s; *last = s;
return (tok); return (tok);
} }
} while (sc != 0); } while (sc != 0);
} }
/* NOTREACHED */ /* NOTREACHED */
} }
char *strtok(char *s, const char *delim)
{
static char *last;
return (strtok_r(s, delim, &last));
}