Changeset 1435

Timestamp:

May 4, 2004, 9:07:51 AM (21 years ago)

Author:

bird

Message:

Got strtok_r and strtok from FreeBSD 5.2

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/thread.h (modified) (1 diff, 1 prop)
• src/lib/bsd/string/strtok.c (modified) (4 diffs, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/str/strtok.c (deleted)

trunk/src/emx/include/InnoTekLIBC/thread.h

@@ -83 +83 @@
     char            szTmpNamBuf[16];
     /** Current posistion of strtok(). */
-    unsigned char  *pszStrTokPos;
+    char           *pszStrTokPos;
     /** Buffer used by strerror() to format unknown error values. */
     char            szStrErrorBuf[28];

trunk/src/emx/src/lib/bsd/string/strtok.c

@@ -40 +40 @@
 static char sccsid[] = "@(#)strtok.c    8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#ifdef __EMX__
+#include "namespace.h"
+#endif 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/string/strtok.c,v 1.9 2002/09/07 02:53:19 tjr Exp $");
@@ -48 +51 @@
 #endif
 #include <string.h>
+#ifdef __EMX__
+#include <InnoTekLIBC/thread.h>
+#endif 
+
 
 char    *__strtok_r(char *, const char *, char **);
@@ -54 +61 @@
 
 char *
-__strtok_r(char *s, const char *delim, char **last)
+#ifdef __EMX__
+_STD(strtok_r)
+#else
+__strtok_r
+#endif 
+(char *s, const char *delim, char **last)
 {
         char *spanp, *tok;
@@ -100 +112 @@
 
 char *
-strtok(char *s, const char *delim)
+#ifdef __EMX__
+_STD(strtok)
+#else
+strtok
+#endif
+(char *s, const char *delim)
 {
+#ifdef __EMX__
+        __LIBC_PTHREAD  pThrd = __libc_threadCurrent();
+        #define last pThrd->pszStrTokPos
+#else
         static char *last;
-
+#endif 
         return (__strtok_r(s, delim, &last));
+    
 }
 

trunk/src/emx/src/lib/libc.def

@@ -1110 +1110 @@
 ; LIBGCCEND
     
+    "__std_strtok_r" @1127