Changeset a78d001 in mainline

Timestamp:

2009-04-06T14:56:52Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5b7f418

Parents:

482c86f

Message:

ignore leading byte-order mark while printing wide strings
(GCC sometimes generates constant UTF-32 strings with BOM)

Location:

kernel/generic

Files:

• include/string.h (modified) (1 diff)
• src/printf/printf_core.c (modified) (4 diffs)

kernel/generic/include/string.h

@@ -58 +58 @@
 #define U_CURSOR       0x2588
 
+#define U_BOM          0xfeff
+
 /**< No size limit constant */
 #define STR_NO_LIMIT  ((size_t) -1)

kernel/generic/src/printf/printf_core.c

@@ -250 +250 @@
  */
 static int print_str(char *str, int width, unsigned int precision,
-        uint32_t flags, printf_spec_t *ps)
+    uint32_t flags, printf_spec_t *ps)
 {
         if (str == NULL)
@@ -298 +298 @@
  */
 static int print_wstr(wchar_t *str, int width, unsigned int precision,
-        uint32_t flags, printf_spec_t *ps)
+    uint32_t flags, printf_spec_t *ps)
 {
         if (str == NULL)
                 return printf_putstr(nullstr, ps);
-
+        
+        if (*str == U_BOM)
+                str++;
+        
         /* Print leading spaces. */
         size_t strw = wstr_length(str);
         if (precision == 0)
                 precision = strw;
-
+        
         /* Left padding */
         count_t counter = 0;
@@ -317 +320 @@
                 }
         }
-
+        
         /* Part of @a wstr fitting into the alloted space. */
         int retval;
@@ -323 +326 @@
         if ((retval = printf_wputnchars(str, size, ps)) < 0)
                 return -counter;
-
+        
         counter += retval;
-
+        
         /* Right padding */
         while (width-- > 0) {