Changeset 12b29f3 in mainline

Timestamp:

2014-08-29T07:50:09Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

293703e

Parents:

69c664e

Message:

Reintroduce strtok to libposix (needed by GCC & Python)

Implementation taken from the original libc implementation before
revision 2122 (where it was changed to str_tok()).

Location:

uspace/lib/posix

Files:

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

uspace/lib/posix/include/posix/string.h

@@ -64 +64 @@
  * forward declarations ought to be enough.
  */
-/* From str.h. */
-extern char * strtok_r(char *, const char *, char **);
-extern char * strtok(char *, const char *);
 
 /* From mem.h */
@@ -101 +98 @@
 extern char *__POSIX_DEF__(strstr)(const char *haystack, const char *needle);
 
+/* Tokenization functions. */
+extern char *__POSIX_DEF__(strtok_r)(char *, const char *, char **);
+extern char *__POSIX_DEF__(strtok)(char *, const char *);
+
+
 /* Collation Functions */
 extern int __POSIX_DEF__(strcoll)(const char *s1, const char *s2);

uspace/lib/posix/source/string.c

@@ -508 +508 @@
         
         return NULL;
+}
+
+/** Split string by delimiters.
+ *
+ * @param s             String to be tokenized. May not be NULL.
+ * @param delim         String with the delimiters.
+ * @return              Pointer to the prefix of @a s before the first
+ *                      delimiter character. NULL if no such prefix
+ *                      exists.
+ */
+char *posix_strtok(char *s, const char *delim)
+{
+        static char *next;
+
+        return posix_strtok_r(s, delim, &next);
+}
+
+
+/** Split string by delimiters.
+ *
+ * @param s             String to be tokenized. May not be NULL.
+ * @param delim         String with the delimiters.
+ * @param next          Variable which will receive the pointer to the
+ *                      continuation of the string following the first
+ *                      occurrence of any of the delimiter characters.
+ *                      May be NULL.
+ * @return              Pointer to the prefix of @a s before the first
+ *                      delimiter character. NULL if no such prefix
+ *                      exists.
+ */
+char *posix_strtok_r(char *s, const char *delim, char **next)
+{
+        char *start, *end;
+
+        if (s == NULL)
+                s = *next;
+
+        /* Skip over leading delimiters. */
+        while (*s && (posix_strchr(delim, *s) != NULL)) ++s;
+        start = s;
+
+        /* Skip over token characters. */
+        while (*s && (posix_strchr(delim, *s) == NULL)) ++s;
+        end = s;
+        *next = (*s ? s + 1 : s);
+
+        if (start == end) {
+                return NULL;    /* No more tokens. */
+        }
+
+        /* Overwrite delimiter with NULL terminator. */
+        *end = '\0';
+        return start;
 }