X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrtok.c;h=69c2d683d7b1b0f871928011ac46d843565800c7;hb=d865c4403fc91d1f1ac95ba76febcee9f429bb97;hp=071f4f8607e4063f093674c3d81263f16d332793;hpb=2f57d79a5a24856fdea69b2119d67e5fb5029b3e;p=pdclib

diff --git a/functions/string/strtok.c b/functions/string/strtok.c
index 071f4f8..69c2d68 100644
--- a/functions/string/strtok.c
+++ b/functions/string/strtok.c
@@ -1,16 +1,13 @@
-/* $Id$ */
-
-/* Release $Name$ */
-
 /* strtok( char *, const char * )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
 */
 
-#include <_PDCLIB_aux.h>
 #include <string.h>
 
+#ifndef REGTEST
+
 char * strtok( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2 )
 {
     static char * tmp = NULL;
@@ -69,16 +66,19 @@ char * strtok( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2 )
     }
 
     /* parsed to end of string */
-    return ( tmp = NULL );
+    tmp = NULL;
+    return s1;
 }
 
+#endif
+
 #ifdef TEST
-#include <_PDCLIB_test.h>
 
-int main()
+#include "_PDCLIB_test.h"
+
+int main( void )
 {
     char s[] = "_a_bc__d_";
-    BEGIN_TESTS;
     TESTCASE( strtok( s, "_" ) == &s[1] );
     TESTCASE( s[1] == 'a' );
     TESTCASE( s[2] == '\0' );
@@ -91,6 +91,17 @@ int main()
     TESTCASE( s[7] == 'd' );
     TESTCASE( s[8] == '\0' );
     TESTCASE( strtok( NULL, "_" ) == NULL );
+    strcpy( s, "ab_cd" );
+    TESTCASE( strtok( s, "_" ) == &s[0] );
+    TESTCASE( s[0] == 'a' );
+    TESTCASE( s[1] == 'b' );
+    TESTCASE( s[2] == '\0' );
+    TESTCASE( strtok( NULL, "_" ) == &s[3] );
+    TESTCASE( s[3] == 'c' );
+    TESTCASE( s[4] == 'd' );
+    TESTCASE( s[5] == '\0' );
+    TESTCASE( strtok( NULL, "_" ) == NULL );
     return TEST_RESULTS;
 }
+
 #endif