Changeset 69df837f in mainline

Timestamp:

2008-09-16T10:06:32Z (16 years ago)

Author:

Tim Post <echo@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

06a195bc

Parents:

eeb2bde2

Message:

Added strtok() and strtok_r() to userspace libc

Location:

uspace/lib/libc

Files:

• generic/string.c (modified) (2 diffs)
• include/string.h (modified) (1 diff)

uspace/lib/libc/generic/string.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Martin Decky
+ * Copyright (C) 1998 by Wes Peters <wes@softweyr.com>
+ * Copyright (c) 1988, 1993 The Regents of the University of California.
  * All rights reserved.
  *
@@ -397 +399 @@
 }
 
+/* Ported from FBSD strtok.c 8.1 (Berkeley) 6/4/93 */
+char * strtok_r(char *s, const char *delim, char **last)
+{
+        char *spanp, *tok;
+        int c, sc;
+
+        if (s == NULL && (s = *last) == NULL)
+                return (NULL);
+
+cont:
+        c = *s++;
+        for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
+                if (c == sc)
+                        goto cont;
+        }
+
+        if (c == 0) {           /* no non-delimiter characters */
+                *last = NULL;
+                return (NULL);
+        }
+
+        tok = s - 1;
+
+        for (;;) {
+                c = *s++;
+                spanp = (char *)delim;
+                do {
+                        if ((sc = *spanp++) == c) {
+                                if (c == 0)
+                                        s = NULL;
+                                else
+                                        s[-1] = '\0';
+                                *last = s;
+                                return (tok);
+                        }
+                } while (sc != 0);
+        }
+}
+
+/* Ported from FBSD strtok.c 8.1 (Berkeley) 6/4/93 */
+char * strtok(char *s, const char *delim)
+{
+        static char *last;
+
+        return (strtok_r(s, delim, &last));
+}
+
 /** @}
  */

uspace/lib/libc/include/string.h

@@ -65 +65 @@
 extern unsigned long strtoul(const char *, char **, int);
 
+extern char * strtok_r(char *, const char *, char **);
+extern char * strtok(char *, const char *);
+
 #endif