Bug #36, covered by testdriver but not yet fixed.

[fw/pdclib] / functions / string / strtok.c

diff --git a/functions/string/strtok.c b/functions/string/strtok.c
index a7fc461793e4bce30f50bd21177418483c730ab5..691c640cac060bf4cbc16ed79adc660ff21bde2b 100644 (file)
--- a/functions/string/strtok.c
+++ b/functions/string/strtok.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* strtok( char *, const char * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -78,10 +76,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 +91,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