From 91bd11ad844eb7f39609ffc58b25e693b82ce51f Mon Sep 17 00:00:00 2001 From: "Tim J. Robbins" Date: Sat, 7 Sep 2002 02:53:19 +0000 Subject: [PATCH] Call strtok_r() via a libc private name from within strtok(). --- lib/libc/string/strtok.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c index e17e904921a..1a29cc53a66 100644 --- a/lib/libc/string/strtok.c +++ b/lib/libc/string/strtok.c @@ -48,8 +48,12 @@ __FBSDID("$FreeBSD$"); #endif #include +char *__strtok_r(char *, const char *, char **); + +__weak_reference(__strtok_r, strtok_r); + char * -strtok_r(char *s, const char *delim, char **last) +__strtok_r(char *s, const char *delim, char **last) { char *spanp, *tok; int c, sc; @@ -99,7 +103,7 @@ strtok(char *s, const char *delim) { static char *last; - return (strtok_r(s, delim, &last)); + return (__strtok_r(s, delim, &last)); } #ifdef DEBUG_STRTOK