Changes in uspace/lib/c/generic/str.c [1558d85:b49d872] in mainline

File:

• uspace/lib/c/generic/str.c (modified) (6 diffs)

uspace/lib/c/generic/str.c

@@ -45 +45 @@
 #include <align.h>
 #include <mem.h>
+#include <str.h>
 
 /** Check the condition if wchar_t is signed */
@@ -518 +519 @@
         wchar_t c1 = 0;
         wchar_t c2 = 0;
-
+        
         size_t off1 = 0;
         size_t off2 = 0;
@@ -528 +529 @@
                 if (c1 < c2)
                         return -1;
-
+                
                 if (c1 > c2)
                         return 1;
 
                 if (c1 == 0 || c2 == 0)
-                        break;
+                        break;          
         }
 
@@ -565 +566 @@
         wchar_t c1 = 0;
         wchar_t c2 = 0;
-
+        
         size_t off1 = 0;
         size_t off2 = 0;
-
+        
         size_t len = 0;
 
@@ -577 +578 @@
                 c1 = str_decode(s1, &off1, STR_NO_LIMIT);
                 c2 = str_decode(s2, &off2, STR_NO_LIMIT);
-
-                if (c1 < c2)
-                        return -1;
-
-                if (c1 > c2)
-                        return 1;
-
-                if (c1 == 0 || c2 == 0)
-                        break;
-
-                ++len;
-        }
-
-        return 0;
-
-}
-
-/** Compare two NULL terminated strings in case-insensitive manner.
- *
- * Do a char-by-char comparison of two NULL-terminated strings.
- * The strings are considered equal iff their length is equal
- * and both strings consist of the same sequence of characters
- * when converted to lower case.
- *
- * A string S1 is less than another string S2 if it has a character with
- * lower value at the first character position where the strings differ.
- * If the strings differ in length, the shorter one is treated as if
- * padded by characters with a value of zero.
- *
- * @param s1 First string to compare.
- * @param s2 Second string to compare.
- *
- * @return 0 if the strings are equal, -1 if the first is less than the second,
- *         1 if the second is less than the first.
- *
- */
-int str_casecmp(const char *s1, const char *s2)
-{
-        wchar_t c1 = 0;
-        wchar_t c2 = 0;
-
-        size_t off1 = 0;
-        size_t off2 = 0;
-
-        while (true) {
-                c1 = tolower(str_decode(s1, &off1, STR_NO_LIMIT));
-                c2 = tolower(str_decode(s2, &off2, STR_NO_LIMIT));
-
-                if (c1 < c2)
-                        return -1;
-
-                if (c1 > c2)
-                        return 1;
-
-                if (c1 == 0 || c2 == 0)
-                        break;
-        }
-
-        return 0;
-}
-
-/** Compare two NULL terminated strings with length limit in case-insensitive
- * manner.
- *
- * Do a char-by-char comparison of two NULL-terminated strings.
- * The strings are considered equal iff
- * min(str_length(s1), max_len) == min(str_length(s2), max_len)
- * and both strings consist of the same sequence of characters,
- * up to max_len characters.
- *
- * A string S1 is less than another string S2 if it has a character with
- * lower value at the first character position where the strings differ.
- * If the strings differ in length, the shorter one is treated as if
- * padded by characters with a value of zero. Only the first max_len
- * characters are considered.
- *
- * @param s1      First string to compare.
- * @param s2      Second string to compare.
- * @param max_len Maximum number of characters to consider.
- *
- * @return 0 if the strings are equal, -1 if the first is less than the second,
- *         1 if the second is less than the first.
- *
- */
-int str_lcasecmp(const char *s1, const char *s2, size_t max_len)
-{
-        wchar_t c1 = 0;
-        wchar_t c2 = 0;
-        
-        size_t off1 = 0;
-        size_t off2 = 0;
-        
-        size_t len = 0;
-
-        while (true) {
-                if (len >= max_len)
-                        break;
-
-                c1 = tolower(str_decode(s1, &off1, STR_NO_LIMIT));
-                c2 = tolower(str_decode(s2, &off2, STR_NO_LIMIT));
 
                 if (c1 < c2)
@@ -1459 +1360 @@
 }
 
-/** 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 *str_tok(char *s, const char *delim, char **next)
+char *strtok(char *s, const char *delim)
+{
+        static char *next;
+
+        return strtok_r(s, delim, &next);
+}
+
+char *strtok_r(char *s, const char *delim, char **next)
 {
         char *start, *end;
 
-        if (!s)
-                return NULL;
-        
-        size_t len = str_size(s);
-        size_t cur;
-        size_t tmp;
-        wchar_t ch;
+        if (s == NULL)
+                s = *next;
 
         /* Skip over leading delimiters. */
-        for (tmp = cur = 0;
-            (ch = str_decode(s, &tmp, len)) && str_chr(delim, ch); /**/)
-                cur = tmp;
-        start = &s[cur];
+        while (*s && (str_chr(delim, *s) != NULL)) ++s;
+        start = s;
 
         /* Skip over token characters. */
-        for (tmp = cur;
-            (ch = str_decode(s, &tmp, len)) && !str_chr(delim, ch); /**/)
-                cur = tmp;
-        end = &s[cur];
-        if (next)
-                *next = (ch ? &s[tmp] : &s[cur]);
-
-        if (start == end)
+        while (*s && (str_chr(delim, *s) == NULL)) ++s;
+        end = s;
+        *next = (*s ? s + 1 : s);
+
+        if (start == end) {
                 return NULL;    /* No more tokens. */
+        }
 
         /* Overwrite delimiter with NULL terminator. */