Changeset 29e7cc7 in mainline for common/stdc/wchar.c

Timestamp:

2025-04-18T15:14:10Z (8 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e77c3ed

Parents:

800d188 (diff), 25fdb2d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'upstream/master' into helenraid

File:

• common/stdc/wchar.c (moved) (moved from kernel/generic/include/putchar.h ) (2 diffs)

common/stdc/wchar.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2025 Jiří Zárevúcky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kernel_generic
- * @{
- */
-/** @file
- */
+#include <uchar.h>
+#include <wchar.h>
 
-#ifndef KERN_PUTCHAR_H_
-#define KERN_PUTCHAR_H_
-
-#include <uchar.h>
-
-extern void putuchar(char32_t);
-
+#if __STDC_HOSTED__
+#include <fibril.h>
 #endif
 
-/** @}
- */
+wint_t btowc(int c)
+{
+        return (c < 0x80) ? c : WEOF;
+}
+
+int wctob(wint_t c)
+{
+        return c;
+}
+
+int mbsinit(const mbstate_t *ps)
+{
+        return ps == NULL || ps->state == 0;
+}
+
+size_t mbrlen(const char *s, size_t n, mbstate_t *ps)
+{
+#if __STDC_HOSTED__
+        static fibril_local mbstate_t global_state;
+        if (!ps)
+                ps = &global_state;
+#endif
+
+        return mbrtowc(NULL, s, n, ps);
+}
+
+_Static_assert(sizeof(wchar_t) == sizeof(char16_t) || sizeof(wchar_t) == sizeof(char32_t));
+
+size_t mbrtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
+{
+#if __STDC_HOSTED__
+        static fibril_local mbstate_t global_state;
+        if (!ps)
+                ps = &global_state;
+#endif
+
+        if (sizeof(wchar_t) == sizeof(char16_t))
+                return mbrtoc16((char16_t *) pwc, s, n, ps);
+        else
+                return mbrtoc32((char32_t *) pwc, s, n, ps);
+}
+
+size_t wcrtomb(char *s, wchar_t wc, mbstate_t * ps)
+{
+#if __STDC_HOSTED__
+        static fibril_local mbstate_t global_state;
+        if (!ps)
+                ps = &global_state;
+#endif
+
+        if (sizeof(wchar_t) == sizeof(char16_t))
+                return c16rtomb(s, (char16_t) wc, ps);
+        else
+                return c32rtomb(s, (char32_t) wc, ps);
+}