Changeset b06414f in mainline for uspace/lib/c/generic/str.c

Timestamp:

2017-05-19T14:04:36Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e540bc87

Parents:

2628642

Message:

Use proper sizes for buffers holding conversions from/to UTF-16 LFN's

FAT uses UTF-16 for encoding long file names. HelenOS needs to convert
these strings into and from its native UTF-8 encoding. The size of the
UTF-8 buffer in bytes needs to be at least 4 times the number of
characters in a LFN.

File:

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

uspace/lib/c/generic/str.c

@@ -951 +951 @@
 }
 
-int str_to_utf16(uint16_t *dest, size_t size, const char *src)
+/** Convert string to UTF16 string.
+ *
+ * Convert string @a src to utf16 string. The output is written to the buffer
+ * specified by @a dest and @a dlen. @a dlen must be non-zero and the string
+ * written will always be well-formed. Surrogate pairs also supported.
+ *
+ * @param dest  Destination buffer.
+ * @param dlen  Number of utf16 characters that fit in the destination buffer.
+ * @param src   Source string.
+ *
+ * @return EOK, if success, negative otherwise.
+ */
+int str_to_utf16(uint16_t *dest, size_t dlen, const char *src)
 {
         int rc = EOK;
@@ -958 +970 @@
         wchar_t c;
 
-        assert(size > 0);
+        assert(dlen > 0);
         
         while ((c = str_decode(src, &offset, STR_NO_LIMIT)) != 0) {
                 if (c > 0x10000) {
-                        if (idx + 2 >= size - 1) {
+                        if (idx + 2 >= dlen - 1) {
                                 rc = EOVERFLOW;
                                 break;
@@ -975 +987 @@
 
                 idx++;
-                if (idx >= size - 1) {
+                if (idx >= dlen - 1) {
                         rc = EOVERFLOW;
                         break;