device/lib/_strtok.c: fixed bug #734355 by Lenny Story and Tim Woodall

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2621 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 77bd4c72f83b79192daf0aa632c2c449d246a5f7..74cdb83cc3b3d91cd753e126868ffaf6365fce6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-14  Bernhard Held <bernhard@bernhardheld.de>
+
+        * device/lib/_strtok.c: fixed bug #734355 by Lenny Story and Tim Woodall 
+
 2003-05-13  Bernhard Held <bernhard@bernhardheld.de>
 
        * src/pic16/*: removed CR from many files, reported by Vangelis Rokas

diff --git a/device/lib/_strtok.c b/device/lib/_strtok.c
index 82a09c3aaeeec2e3afe0be347d884721eebd9fa1..ab2603698e58f86d45c80d113831ad53d1dcd1d3 100644 (file)
--- a/device/lib/_strtok.c
+++ b/device/lib/_strtok.c
@@ -37,7 +37,16 @@ char * strtok (
 
        if ( str )
                s = str ;
+       if ( !s )
+               return NULL;
 
+       while (*s) {
+               if (strchr(control,*s))
+                       s++;
+               else
+                       break;
+       }
+       
        s1 = s ;
 
        while (*s) {
@@ -47,6 +56,12 @@ char * strtok (
                }
                s++ ;
        }
-       return (NULL);
+
+       s = NULL;
+
+       if (*s1)
+               return s1;
+       else
+               return NULL;
 }