Changeset 28a5ebd in mainline for uspace/lib/c/generic/io/io.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/lib/c/generic/io/io.c (modified) (2 diffs)

uspace/lib/c/generic/io/io.c

@@ -48 +48 @@
 #include <adt/list.h>
 #include <wchar.h>
+#include <uchar.h>
 #include "../private/io.h"
 #include "../private/stdio.h"
@@ -749 +750 @@
 }
 
+wint_t fputuc(char32_t wc, FILE *stream)
+{
+        char buf[STR_BOUNDS(1)];
+        size_t sz = 0;
+
+        if (chr_encode(wc, buf, &sz, STR_BOUNDS(1)) != EOK) {
+                errno = EILSEQ;
+                return WEOF;
+        }
+
+        size_t wr = fwrite(buf, 1, sz, stream);
+        if (wr < sz)
+                return WEOF;
+
+        return wc;
+}
+
 wint_t putwchar(wchar_t wc)
 {
         return fputwc(wc, stdout);
+}
+
+wint_t putuchar(char32_t wc)
+{
+        return fputuc(wc, stdout);
 }