Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

libc.obj: add strtok_s

Browse Source
This commit is contained in:
Егор
2026-02-16 23:12:22 +05:00
parent 7505baa105
commit 97e7404c9e
5 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
programs/develop/ktcc/trunk/bin/lib/libc.def
View File

@@ -89,6 +89,7 @@ strrev
strspn
strstr
strtok
strtok_s
strxfrm
__errno
;____SYS____

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

@@ -32,6 +32,11 @@ DLLAPI char* strrchr(const char* s, int c);
DLLAPI size_t strspn(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_s(char* s1, const char* s2, char** saveptr);
#ifndef strtok_r
#define strtok_r strtok_s
#endif
DLLAPI char* strerror(int errnum);
DLLAPI size_t strlen(const char* s);
DLLAPI char* strrev(char* str);

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

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

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

@@ -1,49 +1,8 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
#include <string.h>
char* strtok(char* s, const char* delim)
{
const char* spanp;
int c, sc;
char* tok;
static char* last;
static char *saveptr;
if (s == NULL && (s = last) == NULL)
return (NULL);
/*
* Skip (span) leading delimiters (s += strspn(s, delim), sort of).
*/
cont:
c = *s++;
for (spanp = delim; (sc = *spanp++) != 0;) {
if (c == sc)
goto cont;
}
if (c == 0) { /* no non-delimiter characters */
last = NULL;
return (NULL);
}
tok = s - 1;
/*
* Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
* Note that delim must have one NUL; we stop if we see that, too.
*/
for (;;) {
c = *s++;
spanp = delim;
do {
if ((sc = *spanp++) == c) {
if (c == 0)
s = NULL;
else
s[-1] = 0;
last = s;
return (tok);
}
} while (sc != 0);
}
/* NOTREACHED */
return strtok_s(s, delim, &saveptr);
}

48
programs/develop/ktcc/trunk/libc.obj/source/string/strtok_s.c Normal file
View File

@@ -0,0 +1,48 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
#include <string.h>
char* strtok_s(char* s, const char* delim, char** saveptr)
{
const char* spanp;
int c, sc;
char* tok;
if (s == NULL && (s = *saveptr) == NULL)
return (NULL);
/*
* Skip (span) leading delimiters (s += strspn(s, delim), sort of).
*/
cont:
c = *s++;
for (spanp = delim; (sc = *spanp++) != 0;) {
if (c == sc)
goto cont;
}
if (c == 0) { /* no non-delimiter characters */
*saveptr = NULL;
return (NULL);
}
tok = s - 1;
/*
* Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
* Note that delim must have one NUL; we stop if we see that, too.
*/
for (;;) {
c = *s++;
spanp = delim;
do {
if ((sc = *spanp++) == c) {
if (c == 0)
s = NULL;
else
s[-1] = 0;
*saveptr = s;
return (tok);
}
} while (sc != 0);
}
/* NOTREACHED */
}