X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstring%2Fstrtok.c;h=3c427c549c9ea0b87e6851a7862f3c77a78b7e8d;hp=c586b97eea2cb7d01af9ece6e50454f9a7146019;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=b08f4b52b1cd1f7a9553c0f357a7c90859fa3e73

diff --git a/functions/string/strtok.c b/functions/string/strtok.c
index c586b97..3c427c5 100644
--- a/functions/string/strtok.c
+++ b/functions/string/strtok.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* strtok( char *, const char * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -68,13 +66,14 @@ 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>
+#include "_PDCLIB_test.h"
 
 int main( void )
 {
@@ -91,6 +90,16 @@ int main( void )
     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