Index: uspace/lib/c/include/async.h =================================================================== --- uspace/lib/c/include/async.h (revision de19d4adc0334d6906982d38962b3f8ec0050aba) +++ uspace/lib/c/include/async.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -275,12 +275,12 @@ extern async_sess_t *async_connect_me_to(async_exch_t *, iface_t, sysarg_t, - sysarg_t); + sysarg_t, errno_t *); extern async_sess_t *async_connect_me_to_blocking(async_exch_t *, iface_t, - sysarg_t, sysarg_t); -extern async_sess_t *async_connect_kbox(task_id_t); + sysarg_t, sysarg_t, errno_t *); +extern async_sess_t *async_connect_kbox(task_id_t, errno_t *); extern errno_t async_connect_to_me(async_exch_t *, iface_t, sysarg_t, sysarg_t); -extern errno_t async_hangup(async_sess_t *); +extern void async_hangup(async_sess_t *); extern async_exch_t *async_exchange_begin(async_sess_t *); Index: uspace/lib/c/include/io/charfield.h =================================================================== --- uspace/lib/c/include/io/charfield.h (revision de19d4adc0334d6906982d38962b3f8ec0050aba) +++ uspace/lib/c/include/io/charfield.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -38,5 +38,5 @@ #include -#include +#include #include #include @@ -77,5 +77,5 @@ typedef struct { - wchar_t ch; + char32_t ch; char_attrs_t attrs; char_flags_t flags; Index: uspace/lib/c/include/io/chargrid.h =================================================================== --- uspace/lib/c/include/io/chargrid.h (revision de19d4adc0334d6906982d38962b3f8ec0050aba) +++ uspace/lib/c/include/io/chargrid.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -79,5 +79,5 @@ extern sysarg_t chargrid_get_top_row(chargrid_t *); -extern sysarg_t chargrid_putwchar(chargrid_t *, wchar_t, bool); +extern sysarg_t chargrid_putuchar(chargrid_t *, char32_t, bool); extern sysarg_t chargrid_newline(chargrid_t *); extern sysarg_t chargrid_tabstop(chargrid_t *, sysarg_t); Index: uspace/lib/c/include/io/input.h =================================================================== --- uspace/lib/c/include/io/input.h (revision de19d4adc0334d6906982d38962b3f8ec0050aba) +++ uspace/lib/c/include/io/input.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -50,5 +50,5 @@ errno_t (*active)(input_t *); errno_t (*deactive)(input_t *); - errno_t (*key)(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t); + errno_t (*key)(input_t *, kbd_event_type_t, keycode_t, keymod_t, char32_t); errno_t (*move)(input_t *, int, int); errno_t (*abs_move)(input_t *, unsigned, unsigned, unsigned, unsigned); Index: uspace/lib/c/include/io/kbd_event.h =================================================================== --- uspace/lib/c/include/io/kbd_event.h (revision de19d4adc0334d6906982d38962b3f8ec0050aba) +++ uspace/lib/c/include/io/kbd_event.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -37,4 +37,5 @@ #include +#include #include @@ -59,5 +60,5 @@ /** The character that was generated or '\0' for none. */ - wchar_t c; + char32_t c; } kbd_event_t; Index: uspace/lib/c/include/io/printf_core.h =================================================================== --- uspace/lib/c/include/io/printf_core.h (revision de19d4adc0334d6906982d38962b3f8ec0050aba) +++ uspace/lib/c/include/io/printf_core.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -38,4 +38,5 @@ #include #include +#include /** Structure for specifying output methods for different printf clones. */ @@ -45,5 +46,5 @@ /* Wide string output function, returns number of printed characters or EOF */ - int (*wstr_write)(const wchar_t *, size_t, void *); + int (*wstr_write)(const char32_t *, size_t, void *); /* User data - output stream specification, state, locks, etc. */ Index: uspace/lib/c/include/loader/loader.h =================================================================== --- uspace/lib/c/include/loader/loader.h (revision de19d4adc0334d6906982d38962b3f8ec0050aba) +++ uspace/lib/c/include/loader/loader.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -44,5 +44,5 @@ extern errno_t loader_spawn(const char *); -extern loader_t *loader_connect(void); +extern loader_t *loader_connect(errno_t *); extern errno_t loader_get_task_id(loader_t *, task_id_t *); extern errno_t loader_set_cwd(loader_t *); Index: uspace/lib/c/include/ns.h =================================================================== --- uspace/lib/c/include/ns.h (revision de19d4adc0334d6906982d38962b3f8ec0050aba) +++ uspace/lib/c/include/ns.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -43,10 +43,11 @@ void *); extern errno_t service_register_broker(service_t, async_port_handler_t, void *); -extern async_sess_t *service_connect(service_t, iface_t, sysarg_t); -extern async_sess_t *service_connect_blocking(service_t, iface_t, sysarg_t); +extern async_sess_t *service_connect(service_t, iface_t, sysarg_t, errno_t *); +extern async_sess_t *service_connect_blocking(service_t, iface_t, sysarg_t, + errno_t *); extern errno_t ns_ping(void); extern errno_t ns_intro(task_id_t); -extern async_sess_t *ns_session_get(void); +extern async_sess_t *ns_session_get(errno_t *); #endif Index: uspace/lib/c/include/stats.h =================================================================== --- uspace/lib/c/include/stats.h (revision de19d4adc0334d6906982d38962b3f8ec0050aba) +++ uspace/lib/c/include/stats.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -52,4 +52,5 @@ extern stats_thread_t *stats_get_threads(size_t *); +extern stats_ipcc_t *stats_get_ipccs(size_t *); extern stats_exc_t *stats_get_exceptions(size_t *); Index: uspace/lib/c/include/stdio.h =================================================================== --- uspace/lib/c/include/stdio.h (revision de19d4adc0334d6906982d38962b3f8ec0050aba) +++ uspace/lib/c/include/stdio.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -42,4 +42,5 @@ #include <_bits/size_t.h> #include <_bits/wchar_t.h> +#include <_bits/uchar.h> #include <_bits/wint_t.h> #include <_bits/decls.h> @@ -123,4 +124,7 @@ extern wint_t fputwc(wchar_t, FILE *); extern wint_t putwchar(wchar_t); + +extern wint_t fputuc(char32_t, FILE *); +extern wint_t putuchar(char32_t); /* Formatted string output functions */ Index: uspace/lib/c/include/stdlib.h =================================================================== --- uspace/lib/c/include/stdlib.h (revision de19d4adc0334d6906982d38962b3f8ec0050aba) +++ uspace/lib/c/include/stdlib.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -38,4 +38,5 @@ #include <_bits/size_t.h> #include <_bits/wchar_t.h> +#include <_bits/uchar.h> #include <_bits/decls.h> #include Index: uspace/lib/c/include/str.h =================================================================== --- uspace/lib/c/include/str.h (revision de19d4adc0334d6906982d38962b3f8ec0050aba) +++ uspace/lib/c/include/str.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -67,28 +67,28 @@ __HELENOS_DECLS_BEGIN; -extern wchar_t str_decode(const char *str, size_t *offset, size_t sz); -extern wchar_t str_decode_reverse(const char *str, size_t *offset, size_t sz); -extern errno_t chr_encode(wchar_t ch, char *str, size_t *offset, size_t sz); +extern char32_t str_decode(const char *str, size_t *offset, size_t sz); +extern char32_t str_decode_reverse(const char *str, size_t *offset, size_t sz); +extern errno_t chr_encode(char32_t ch, char *str, size_t *offset, size_t sz); extern size_t str_size(const char *str); -extern size_t wstr_size(const wchar_t *str); +extern size_t wstr_size(const char32_t *str); extern size_t str_nsize(const char *str, size_t max_size); -extern size_t wstr_nsize(const wchar_t *str, size_t max_size); +extern size_t wstr_nsize(const char32_t *str, size_t max_size); extern size_t str_lsize(const char *str, size_t max_len); -extern size_t wstr_lsize(const wchar_t *str, size_t max_len); +extern size_t wstr_lsize(const char32_t *str, size_t max_len); extern size_t str_length(const char *str); -extern size_t wstr_length(const wchar_t *wstr); +extern size_t wstr_length(const char32_t *wstr); extern size_t str_nlength(const char *str, size_t size); -extern size_t wstr_nlength(const wchar_t *str, size_t size); +extern size_t wstr_nlength(const char32_t *str, size_t size); -extern size_t chr_width(wchar_t ch); +extern size_t chr_width(char32_t ch); extern size_t str_width(const char *str); -extern bool ascii_check(wchar_t ch); -extern bool chr_check(wchar_t ch); +extern bool ascii_check(char32_t ch); +extern bool chr_check(char32_t ch); extern int str_cmp(const char *s1, const char *s2); @@ -98,4 +98,5 @@ extern bool str_test_prefix(const char *s, const char *p); +extern const char *str_suffix(const char *s, size_t prefix_length); extern void str_cpy(char *dest, size_t size, const char *src); @@ -104,21 +105,21 @@ extern errno_t spascii_to_str(char *dest, size_t size, const uint8_t *src, size_t n); -extern void wstr_to_str(char *dest, size_t size, const wchar_t *src); -extern char *wstr_to_astr(const wchar_t *src); -extern void str_to_wstr(wchar_t *dest, size_t dlen, const char *src); -extern wchar_t *str_to_awstr(const char *src); +extern void wstr_to_str(char *dest, size_t size, const char32_t *src); +extern char *wstr_to_astr(const char32_t *src); +extern void str_to_wstr(char32_t *dest, size_t dlen, const char *src); +extern char32_t *str_to_awstr(const char *src); extern errno_t utf16_to_str(char *dest, size_t size, const uint16_t *src); extern errno_t str_to_utf16(uint16_t *dest, size_t dlen, const char *src); extern size_t utf16_wsize(const uint16_t *ustr); -extern char *str_chr(const char *str, wchar_t ch); -extern char *str_rchr(const char *str, wchar_t ch); +extern char *str_chr(const char *str, char32_t ch); +extern char *str_rchr(const char *str, char32_t ch); extern char *str_str(const char *hs, const char *n); -extern void str_rtrim(char *str, wchar_t ch); -extern void str_ltrim(char *str, wchar_t ch); +extern void str_rtrim(char *str, char32_t ch); +extern void str_ltrim(char *str, char32_t ch); -extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos); -extern bool wstr_remove(wchar_t *str, size_t pos); +extern bool wstr_linsert(char32_t *str, char32_t ch, size_t pos, size_t max_pos); +extern bool wstr_remove(char32_t *str, size_t pos); extern char *str_dup(const char *src); Index: uspace/lib/c/include/uchar.h =================================================================== --- uspace/lib/c/include/uchar.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) +++ uspace/lib/c/include/uchar.h (revision 277168dd81e5ef47dbe4bab5b6fc21ef9db257b5) @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2020 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef _LIBC_UCHAR_H_ +#define _LIBC_UCHAR_H_ + +#include <_bits/uchar.h> + +#endif + +/** @} + */