Porting current working set from CVS.

[pdclib] / functions / string / strtok.c

diff --git a/functions/string/strtok.c b/functions/string/strtok.c
index 0a21a675068492785802306fca235dfb2126ba93..c4b72f914d2c261dd0d29fe1baa352e062a90365 100644 (file)
--- a/functions/string/strtok.c
+++ b/functions/string/strtok.c
@@ -10,11 +10,12 @@
 
 #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 )
     {
@@ -25,7 +26,7 @@ char * strtok( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2 )
     {
         /* old string continued */
         if ( tmp == NULL )
-        }
+        {
             /* No old string, no new string, nothing to do */
             return NULL;
         }
@@ -72,4 +73,26 @@ char * strtok( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2 )
     return ( tmp = NULL );
 }
 
-#warning Test driver missing.
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    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 );
+    return TEST_RESULTS;
+}
+#endif