Changeset 00aece0 in mainline for uspace/lib/c/generic/str.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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.

File:

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

uspace/lib/c/generic/str.c

@@ -3 +3 @@
  * Copyright (c) 2008 Jiri Svoboda
  * Copyright (c) 2011 Martin Sucha
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -550 +551 @@
  *
  * Common legacy text encoding in hardware is 7-bit ASCII fitted into
- * a fixed-with byte buffer (bit 7 always zero), right-padded with spaces
+ * a fixed-width byte buffer (bit 7 always zero), right-padded with spaces
  * (ASCII 0x20). Convert space-padded ascii to string representation.
  *
@@ -640 +641 @@
 }
 
+/** Convert UTF16 string to string.
+ *
+ * Convert utf16 string @a src to string. The output is written to the buffer
+ * specified by @a dest and @a size. @a size must be non-zero and the string
+ * written will always be well-formed. Surrogate pairs also supported.
+ *
+ * @param dest  Destination buffer.
+ * @param size  Size of the destination buffer.
+ * @param src   Source utf16 string.
+ *
+ * @return EOK, if success, negative otherwise.
+ */
+int utf16_to_str(char *dest, size_t size, const uint16_t *src)
+{
+        size_t idx = 0, dest_off = 0;
+        wchar_t ch;
+        int rc = EOK;
+
+        /* There must be space for a null terminator in the buffer. */
+        assert(size > 0);
+
+        while (src[idx]) {
+                if ((src[idx] & 0xfc00) == 0xd800) {
+                        if (src[idx + 1] && (src[idx + 1] & 0xfc00) == 0xdc00) {
+                                ch = 0x10000;
+                                ch += (src[idx] & 0x03FF) << 10;
+                                ch += (src[idx + 1] & 0x03FF);
+                                idx += 2;
+                        }
+                        else
+                                break;
+                } else {
+                        ch = src[idx];
+                        idx++;
+                }
+                rc = chr_encode(ch, dest, &dest_off, size - 1);
+                if (rc != EOK)
+                        break;
+        }
+        dest[dest_off] = '\0';
+        return rc;
+}
+
+int str_to_utf16(uint16_t *dest, size_t size, const char *src)
+{
+        int rc = EOK;
+        size_t offset = 0;
+        size_t idx = 0;
+        wchar_t c;
+
+        assert(size > 0);
+        
+        while ((c = str_decode(src, &offset, STR_NO_LIMIT)) != 0) {
+                if (c > 0x10000) {
+                        if (idx + 2 >= size - 1) {
+                                rc = EOVERFLOW;
+                                break;
+                        }
+                        c = (c - 0x10000);
+                        dest[idx] = 0xD800 | (c >> 10);
+                        dest[idx + 1] = 0xDC00 | (c & 0x3FF);
+                        idx++;
+                } else {
+                         dest[idx] = c;
+                }
+
+                idx++;
+                if (idx >= size - 1) {
+                        rc = EOVERFLOW;
+                        break;
+                }
+        }
+
+        dest[idx] = '\0';
+        return rc;
+}
+
+
 /** Convert wide string to new string.
  *
@@ -731 +810 @@
 {
         size_t len = str_length(str);
-        wchar_t *wstr = calloc(len+1, sizeof(wchar_t));
-        if (wstr == NULL) {
-                return NULL;
-        }
-        str_to_wstr(wstr, len+1, str);
+        
+        wchar_t *wstr = calloc(len+1, sizeof(wchar_t));
+        if (wstr == NULL)
+                return NULL;
+        
+        str_to_wstr(wstr, len + 1, str);
         return wstr;
 }
@@ -759 +839 @@
         
         return NULL;
+}
+
+/** Removes specified trailing characters from a string.
+ *
+ * @param str String to remove from.
+ * @param ch  Character to remove.
+ */
+void str_rtrim(char *str, wchar_t ch)
+{
+        size_t off = 0;
+        size_t pos = 0;
+        wchar_t c;
+        bool update_last_chunk = true;
+        char *last_chunk = NULL;
+
+        while ((c = str_decode(str, &off, STR_NO_LIMIT))) {
+                if (c != ch) {
+                        update_last_chunk = true;
+                        last_chunk = NULL;
+                } else if (update_last_chunk) {
+                        update_last_chunk = false;
+                        last_chunk = (str + pos);
+                }
+                pos = off;
+        }
+
+        if (last_chunk)
+                *last_chunk = '\0';
+}
+
+/** Removes specified leading characters from a string.
+ *
+ * @param str String to remove from.
+ * @param ch  Character to remove.
+ */
+void str_ltrim(char *str, wchar_t ch)
+{
+        wchar_t acc;
+        size_t off = 0;
+        size_t pos = 0;
+        size_t str_sz = str_size(str);
+
+        while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
+                if (acc != ch)
+                        break;
+                else
+                        pos = off;
+        }
+
+        if (pos > 0) {
+                memmove(str, &str[pos], str_sz - pos);
+                pos = str_sz - pos;
+                str[str_sz - pos] = '\0';
+        }
 }
 
@@ -1035 +1169 @@
         return dest;
 }
-
 
 /** Convert initial part of string to unsigned long according to given base.
@@ -1212 +1345 @@
 }
 
+/** Convert string to uint8_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+int str_uint8_t(const char *nptr, char **endptr, unsigned int base,
+    bool strict, uint8_t *result)
+{
+        assert(result != NULL);
+        
+        bool neg;
+        char *lendptr;
+        uint64_t res;
+        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        
+        if (endptr != NULL)
+                *endptr = (char *) lendptr;
+        
+        if (ret != EOK)
+                return ret;
+        
+        /* Do not allow negative values */
+        if (neg)
+                return EINVAL;
+        
+        /* Check whether we are at the end of
+           the string in strict mode */
+        if ((strict) && (*lendptr != 0))
+                return EINVAL;
+        
+        /* Check for overflow */
+        uint8_t _res = (uint8_t) res;
+        if (_res != res)
+                return EOVERFLOW;
+        
+        *result = _res;
+        
+        return EOK;
+}
+
+/** Convert string to uint16_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+int str_uint16_t(const char *nptr, char **endptr, unsigned int base,
+    bool strict, uint16_t *result)
+{
+        assert(result != NULL);
+        
+        bool neg;
+        char *lendptr;
+        uint64_t res;
+        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        
+        if (endptr != NULL)
+                *endptr = (char *) lendptr;
+        
+        if (ret != EOK)
+                return ret;
+        
+        /* Do not allow negative values */
+        if (neg)
+                return EINVAL;
+        
+        /* Check whether we are at the end of
+           the string in strict mode */
+        if ((strict) && (*lendptr != 0))
+                return EINVAL;
+        
+        /* Check for overflow */
+        uint16_t _res = (uint16_t) res;
+        if (_res != res)
+                return EOVERFLOW;
+        
+        *result = _res;
+        
+        return EOK;
+}
+
+/** Convert string to uint32_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+int str_uint32_t(const char *nptr, char **endptr, unsigned int base,
+    bool strict, uint32_t *result)
+{
+        assert(result != NULL);
+        
+        bool neg;
+        char *lendptr;
+        uint64_t res;
+        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        
+        if (endptr != NULL)
+                *endptr = (char *) lendptr;
+        
+        if (ret != EOK)
+                return ret;
+        
+        /* Do not allow negative values */
+        if (neg)
+                return EINVAL;
+        
+        /* Check whether we are at the end of
+           the string in strict mode */
+        if ((strict) && (*lendptr != 0))
+                return EINVAL;
+        
+        /* Check for overflow */
+        uint32_t _res = (uint32_t) res;
+        if (_res != res)
+                return EOVERFLOW;
+        
+        *result = _res;
+        
+        return EOK;
+}
+
 /** Convert string to uint64_t.
  *