Changes in boot/generic/src/str.c [28a5ebd:d066259] in mainline

File:

• boot/generic/src/str.c (modified) (13 diffs)

boot/generic/src/str.c

@@ -38 +38 @@
  * strings, called just strings are encoded in UTF-8. Wide strings (encoded
  * in UTF-32) are supported to a limited degree. A single character is
- * represented as char32_t.@n
+ * represented as wchar_t.@n
  *
  * Overview of the terminology:@n
@@ -46 +46 @@
  *  byte                  8 bits stored in uint8_t (unsigned 8 bit integer)
  *
- *  character             UTF-32 encoded Unicode character, stored in char32_t
- *                        (unsigned 32 bit integer), code points 0 .. 1114111
+ *  character             UTF-32 encoded Unicode character, stored in wchar_t
+ *                        (signed 32 bit integer), code points 0 .. 1114111
  *                        are valid
  *
@@ -57 +57 @@
  *
  *  wide string           UTF-32 encoded NULL-terminated Unicode string,
- *                        char32_t *
+ *                        wchar_t *
  *
  *  [wide] string size    number of BYTES in a [wide] string (excluding
@@ -96 +96 @@
  * A specific character inside a [wide] string can be referred to by:@n
  *
- *  pointer (char *, char32_t *)
+ *  pointer (char *, wchar_t *)
  *  byte offset (size_t)
  *  character index (size_t)
@@ -109 +109 @@
 #include <stdint.h>
 
+/** Check the condition if wchar_t is signed */
+#ifdef __WCHAR_UNSIGNED__
+#define WCHAR_SIGNED_CHECK(cond)  (true)
+#else
+#define WCHAR_SIGNED_CHECK(cond)  (cond)
+#endif
+
 /** Byte mask consisting of lowest @n bits (out of 8) */
 #define LO_MASK_8(n)  ((uint8_t) ((1 << (n)) - 1))
@@ -136 +143 @@
  *
  */
-char32_t str_decode(const char *str, size_t *offset, size_t size)
+wchar_t str_decode(const char *str, size_t *offset, size_t size)
 {
         if (*offset + 1 > size)
@@ -173 +180 @@
                 return U_SPECIAL;
 
-        char32_t ch = b0 & LO_MASK_8(b0_bits);
+        wchar_t ch = b0 & LO_MASK_8(b0_bits);
 
         /* Decode continuation bytes */
@@ -184 +191 @@
 
                 /* Shift data bits to ch */
-                ch = (ch << CONT_BITS) | (char32_t) (b & LO_MASK_8(CONT_BITS));
+                ch = (ch << CONT_BITS) | (wchar_t) (b & LO_MASK_8(CONT_BITS));
                 cbytes--;
         }
@@ -206 +213 @@
  *         code was invalid.
  */
-errno_t chr_encode(const char32_t ch, char *str, size_t *offset, size_t size)
+errno_t chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size)
 {
         if (*offset >= size)
@@ -333 +340 @@
  *
  */
-bool ascii_check(char32_t ch)
-{
-        if (ch <= 127)
+bool ascii_check(wchar_t ch)
+{
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127))
                 return true;
 
@@ -346 +353 @@
  *
  */
-bool chr_check(char32_t ch)
-{
-        if (ch <= 1114111)
+bool chr_check(wchar_t ch)
+{
+        if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111))
                 return true;
 
@@ -374 +381 @@
 int str_cmp(const char *s1, const char *s2)
 {
-        char32_t c1 = 0;
-        char32_t c2 = 0;
+        wchar_t c1 = 0;
+        wchar_t c2 = 0;
 
         size_t off1 = 0;
@@ -414 +421 @@
         size_t dest_off = 0;
 
-        char32_t ch;
+        wchar_t ch;
         while ((ch = str_decode(src, &src_off, STR_NO_LIMIT)) != 0) {
                 if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)