Changeset 28a5ebd in mainline for uspace/app/bdsh/cmds/modules/cat/cat.c

Timestamp:

2020-06-18T15:39:50Z (4 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ce52c333

Parents:

4f663f3e

Message:

Use char32_t instead of wchat_t to represent UTF-32 strings

The intention of the native HelenOS string API has been always to
support Unicode in the UTF-8 and UTF-32 encodings as the sole character
representations and ignore the obsolete mess of older single-byte and
multibyte character encodings. Before C11, the wchar_t type has been
slightly misused for the purpose of the UTF-32 strings. The newer
char32_t type is obviously a much more suitable option. The standard
defines char32_t as uint_least32_t, thus we can take the liberty to fix
it to uint32_t.

To maintain compatilibity with the C Standard, the putwchar(wchar_t)
functions has been replaced by our custom putuchar(char32_t) functions
where appropriate.

File:

• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (3 diffs)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -154 +154 @@
 }
 
-static void paged_char(wchar_t c)
+static void paged_char(char32_t c)
 {
         if (last_char_was_newline && number) {
@@ -160 +160 @@
                 printf("%6u  ", lineno);
         }
-        putwchar(c);
+        putuchar(c);
         last_char_was_newline = c == '\n';
         if (paging_enabled) {
@@ -269 +269 @@
                                         paged_char(((count + i + 1) & 0xf) == 0 ? '\n' : ' ');
                                 } else {
-                                        wchar_t c = str_decode(buff, &offset, bytes);
+                                        char32_t c = str_decode(buff, &offset, bytes);
                                         if (c == 0) {
                                                 /* Reached end of string */