X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrtok.c;h=e57507a890476f98a9f4e78de417cf506ec3e2fc;hb=b1fc26afebd4d557ff89a44bc21767a8704c3809;hp=a7fc461793e4bce30f50bd21177418483c730ab5;hpb=b533867fc9062c9f88f94a1de99ef78c6b7e91a1;p=pdclib

diff --git a/functions/string/strtok.c b/functions/string/strtok.c
index a7fc461..e57507a 100644
--- a/functions/string/strtok.c
+++ b/functions/string/strtok.c
@@ -1,7 +1,3 @@
-/* $Id$ */
-
-/* Release $Name$ */
-
 /* strtok( char *, const char * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -70,7 +66,8 @@ char * strtok( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2 )
     }
 
     /* parsed to end of string */
-    return ( tmp = NULL );
+    tmp = NULL;
+    return s1;
 }
 
 #endif
@@ -78,10 +75,9 @@ char * strtok( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2 )
 #ifdef TEST
 #include <_PDCLIB_test.h>
 
-int main()
+int main( void )
 {
     char s[] = "_a_bc__d_";
-    BEGIN_TESTS;
     TESTCASE( strtok( s, "_" ) == &s[1] );
     TESTCASE( s[1] == 'a' );
     TESTCASE( s[2] == '\0' );
@@ -94,6 +90,16 @@ 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