Changeset 28a5ebd in mainline for uspace/app/bdsh/cmds


Ignore:
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.

Location:
uspace/app/bdsh/cmds/modules
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r4f663f3e r28a5ebd  
    154154}
    155155
    156 static void paged_char(wchar_t c)
     156static void paged_char(char32_t c)
    157157{
    158158        if (last_char_was_newline && number) {
    … …  
    160160                printf("%6u  ", lineno);
    161161        }
    162         putwchar(c);
     162        putuchar(c);
    163163        last_char_was_newline = c == '\n';
    164164        if (paging_enabled) {
    … …  
    269269                                        paged_char(((count + i + 1) & 0xf) == 0 ? '\n' : ' ');
    270270                                } else {
    271                                         wchar_t c = str_decode(buff, &offset, bytes);
     271                                        char32_t c = str_decode(buff, &offset, bytes);
    272272                                        if (c == 0) {
    273273                                                /* Reached end of string */

  • uspace/app/bdsh/cmds/modules/mkdir/mkdir.c

    r4f663f3e r28a5ebd  
    108108                while (true) {
    109109                        size_t prev_off = off;
    110                         wchar_t cur_char = str_decode(path, &off, STR_NO_LIMIT);
     110                        char32_t cur_char = str_decode(path, &off, STR_NO_LIMIT);
    111111                        if ((cur_char == 0) || (cur_char == U_SPECIAL)) {
    112112                                break;

  • uspace/app/bdsh/cmds/modules/printf/printf.c

    r4f663f3e r28a5ebd  
    6868 * @param arg string with data to print.
    6969 */
    70 static int print_arg(wchar_t ch, const char *arg)
     70static int print_arg(char32_t ch, const char *arg)
    7171{
    7272        switch (ch) {
    … …  
    9393 * @param ch  Control character.
    9494 */
    95 static int process_ctl(wchar_t ch)
     95static int process_ctl(char32_t ch)
    9696{
    9797        switch (ch) {
    … …  
    120120        char *fmt;
    121121        size_t pos, fmt_sz;
    122         wchar_t ch;
     122        char32_t ch;
    123123        bool esc_flag = false;
    124124        unsigned int carg;     // Current argument
    … …  
    170170                                break;
    171171                        }
    172                         putwchar(ch);
     172                        putuchar(ch);
    173173                        break;
    174174
    175175                emit:
    176                         putwchar(ch);
     176                        putuchar(ch);
    177177                        esc_flag = false;
    178178                }
Note: See TracChangeset for help on using the changeset viewer.