Changeset fc97128 in mainline

Timestamp:

2011-07-07T19:56:00Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

411e9ca

Parents:

042a725

Message:

Update to str.h: new function str_to_utf16

Location:

uspace/lib/c

Files:

• generic/str.c (modified) (1 diff)
• include/str.h (modified) (1 diff)

uspace/lib/c/generic/str.c

@@ -633 +633 @@
         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.

uspace/lib/c/include/str.h

@@ -79 +79 @@
 extern int str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
 extern int utf16_to_str(char *dest, size_t size, const uint16_t *src);
+extern int str_to_utf16(uint16_t *dest, size_t size, const char *src);
 
 extern char *str_chr(const char *str, wchar_t ch);