1 files changed, 15 insertions, 19 deletions

diff --git a/src/lib/libc/string/strtok.c b/src/lib/libc/string/strtok.c
index 9f712579bf..4e963a019e 100644
--- a/src/lib/libc/string/strtok.c
+++ b/src/lib/libc/string/strtok.c
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,25 +27,25 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)strtok.c     5.8 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: strtok.c,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <string.h>
 
 char *
-strtok(s, delim)
-        register char *s;
-        register const char *delim;
+strtok(char *s, const char *delim)
 {
-        register char *spanp;
-        register int c, sc;
-        char *tok;
         static char *last;
 
+        return strtok_r(s, delim, &last);
+}
+
+char *
+strtok_r(char *s, const char *delim, char **last)
+{
+        char *spanp;
+        int c, sc;
+        char *tok;
+
 
-        if (s == NULL && (s = last) == NULL)
+        if (s == NULL && (s = *last) == NULL)
                 return (NULL);
 
         /*
@@ -63,7 +59,7 @@ cont:
         }
 
         if (c == 0) {           /* no non-delimiter characters */
-                last = NULL;
+                *last = NULL;
                 return (NULL);
         }
         tok = s - 1;
@@ -81,7 +77,7 @@ cont:
                                         s = NULL;
                                 else
                                         s[-1] = 0;
-                                last = s;
+                                *last = s;
                                 return (tok);
                         }
                 } while (sc != 0);