Changeset 8e7c9fe in mainline for uspace/lib/posix/source/string.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/lib/posix/source/string.c (modified) (1 diff)

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;
 }