system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 10:36:24 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibC: Implement mbrtowc closer to POSIX

Browse source
This commit is contained in:
Tim Schumacher 2021-09-21 21:28:53 +02:00 committed by Brian Gianforcaro
parent e7f99edefa
commit 4ef3ed4ba3
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibC/wchar.cpp
View file

@ -209,16 +209,11 @@ size_t mbrtowc(wchar_t* pwc, const char* s, size_t n, mbstate_t* state)
state = &_anonymous_state; state = &_anonymous_state;
} }
// If s is nullptr, check if the state contains a complete multibyte character // s being a null pointer is a shorthand for reading a single null byte.
if (s == nullptr) { if (s == nullptr) {
if (mbstate_expected_bytes(state) == mbstate->stored_bytes) { pwc = nullptr;
*state = {}; s = "";
return 0; n = 1;
} else {
*state = {};
errno = EILSEQ;
return -1;
}
} }
// Stop early if we can't read anything // Stop early if we can't read anything
@ -284,6 +279,7 @@ size_t mbrtowc(wchar_t* pwc, const char* s, size_t n, mbstate_t* state)
state->stored_bytes = 0; state->stored_bytes = 0;
if (codepoint == 0) { if (codepoint == 0) {
*state = {};
return 0; return 0;
} }