Changeset b2906c0 in mainline

Timestamp:

2017-07-11T18:44:04Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f3504c1

Parents:

9bf4488

Message:

One function to compute the number of code units in a UTF-16 null-terminated string.

Location:

uspace

Files:

• lib/c/generic/str.c (modified) (1 diff)
• lib/c/include/str.h (modified) (1 diff)
• srv/fs/exfat/exfat_dentry.c (modified) (1 diff)
• srv/fs/exfat/exfat_dentry.h (modified) (1 diff)
• srv/fs/exfat/exfat_directory.c (modified) (1 diff)
• srv/fs/fat/fat_dentry.c (modified) (1 diff)
• srv/fs/fat/fat_dentry.h (modified) (1 diff)
• srv/fs/fat/fat_directory.c (modified) (1 diff)
• srv/fs/udf/udf_osta.c (modified) (2 diffs)

uspace/lib/c/generic/str.c

@@ -995 +995 @@
         dest[idx] = '\0';
         return rc;
+}
+
+/** Get size of UTF-16 string.
+ *
+ * Get the number of words which are used by the UTF-16 string @a ustr
+ * (excluding the NULL-terminator).
+ *
+ * @param ustr UTF-16 string to consider.
+ *
+ * @return Number of words used by the UTF-16 string
+ *
+ */
+size_t utf16_wsize(const uint16_t *ustr)
+{
+        size_t wsize = 0;
+
+        while (*ustr++ != 0)
+                wsize++;
+
+        return wsize;
 }
 

uspace/lib/c/include/str.h

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

uspace/srv/fs/exfat/exfat_dentry.c

@@ -130 +130 @@
 }
 
-size_t exfat_utf16_length(const uint16_t *wstr)
-{
-        size_t len = 0;
-        
-        while (*wstr++ != 0)
-                len++;
-        
-        return len;
-}
-
 /**
  * @}

uspace/srv/fs/exfat/exfat_dentry.h

@@ -161 +161 @@
 extern bool exfat_valid_name(const char *);
 
-extern size_t exfat_utf16_length(const uint16_t *);
-
-
 #endif
 

uspace/srv/fs/exfat/exfat_directory.c

@@ -371 +371 @@
         ds.stream.valid_data_size = 0;
         ds.stream.data_size = 0;
-        ds.stream.name_size = exfat_utf16_length(wname);
+        ds.stream.name_size = utf16_wsize(wname);
         ds.stream.hash = host2uint16_t_le(exfat_name_hash(wname, uctable, 
             uctable_chars));

uspace/srv/fs/fat/fat_dentry.c

@@ -427 +427 @@
 }
 
-size_t utf16_length(const uint16_t *wstr)
-{
-        size_t len = 0;
-        
-        while (*wstr++ != 0)
-                len++;
-        
-        return len;
-}
-
 /**
  * @}

uspace/srv/fs/fat/fat_dentry.h

@@ -152 +152 @@
 
 extern void str_to_ascii(char *, const char *, size_t, uint8_t);
-extern size_t utf16_length(const uint16_t *);
 
 extern bool fat_valid_name(const char *);

uspace/srv/fs/fat/fat_directory.c

@@ -301 +301 @@
                         return rc;
                 
-                lfn_size = utf16_length(wname);
+                lfn_size = utf16_wsize(wname);
                 long_entry_count = lfn_size / FAT_LFN_ENTRY_SIZE;
                 if (lfn_size % FAT_LFN_ENTRY_SIZE)

uspace/srv/fs/udf/udf_osta.c

@@ -51 +51 @@
 #include "udf_osta.h"
 #include "udf_cksum.h"
-
-/** Calculate length of UTF-16 string
- *
- * FIXME: This is wrong! UTF-16 is not a fixed-width encoding,
- *        it is a variable-width encoding (mind the surrogate
- *        pairs).
- *
- */
-static size_t utf16_length(uint16_t *string) {
-        size_t len = 0;
-        
-        while (*string++ != 0)
-                len++;
-        
-        return len;
-}
 
 /** Illegal UNIX characters are NULL and slash.
@@ -296 +280 @@
                 ucode_chars =
                     udf_uncompress_unicode(len, (uint8_t *) id, raw_name, MAX_BUF);
-                ucode_chars = min(ucode_chars, utf16_length(raw_name));
+                ucode_chars = min(ucode_chars, utf16_wsize(raw_name));
                 nice_uchars =
                     udf_translate_name(unix_name, raw_name, ucode_chars);