X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrtok.c;h=b922085ce38ac19ed423bfc29d97ce95d636e3eb;hb=cd6cfe0f578c4f744ddc9a342243aff6b42f8027;hp=9daf329351115309ddcc83822dac52d83176c0a0;hpb=1d1bcc009f3ebb75d549b078cfd0017f1298fae3;p=pdclib.old

diff --git a/functions/string/strtok.c b/functions/string/strtok.c
index 9daf329..b922085 100644
--- a/functions/string/strtok.c
+++ b/functions/string/strtok.c
@@ -1,21 +1,19 @@
 /* $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;
     const char * p = s2;
-    size_t len;
 
     if ( s1 != NULL )
     {
@@ -70,14 +68,40 @@ char * strtok( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2 )
     }
 
     /* parsed to end of string */
-    return ( tmp = NULL );
+    tmp = NULL;
+    return s1;
 }
 
-#warning Test driver missing.
+#endif
 
 #ifdef TEST
-int main()
+#include <_PDCLIB_test.h>
+
+int main( void )
 {
-    return 0;
+    char s[] = "_a_bc__d_";
+    TESTCASE( strtok( s, "_" ) == &s[1] );
+    TESTCASE( s[1] == 'a' );
+    TESTCASE( s[2] == '\0' );
+    TESTCASE( strtok( NULL, "_" ) == &s[3] );
+    TESTCASE( s[3] == 'b' );
+    TESTCASE( s[4] == 'c' );
+    TESTCASE( s[5] == '\0' );
+    TESTCASE( strtok( NULL, "_" ) == &s[7] );
+    TESTCASE( s[6] == '_' );
+    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