Merge branch 'update-libc.obj' of https://git.kolibrios.org/Egor00f/kolibrios into update-libc.obj

programs/develop/ktcc/trunk/bin/lib/libc.def

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

programs/develop/ktcc/trunk/libc.obj/include/string.h

@@ -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);

programs/develop/ktcc/trunk/libc.obj/source/libc.c

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

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

@@ -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);
 }

programs/develop/ktcc/trunk/libc.obj/source/string/strtok_s.c

@@ -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 */
+}