mirror of
https://github.com/RGBCube/serenity
synced 2025-05-31 07:48:11 +00:00
LibC: Fix up mblen
This commit is contained in:
parent
8df6955838
commit
79bcfa967b
2 changed files with 50 additions and 3 deletions
|
@ -580,3 +580,36 @@ TEST_CASE(mbtowc)
|
||||||
ret = mbtowc(nullptr, "\xe2\x84\xa2\xe2\x84\xa2", 6);
|
ret = mbtowc(nullptr, "\xe2\x84\xa2\xe2\x84\xa2", 6);
|
||||||
EXPECT_EQ(ret, 3);
|
EXPECT_EQ(ret, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_CASE(mblen)
|
||||||
|
{
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
|
// Ensure that we can parse normal ASCII characters.
|
||||||
|
ret = mblen("Hello", 5);
|
||||||
|
EXPECT_EQ(ret, 1);
|
||||||
|
|
||||||
|
// Try two three-byte codepoints (™™), only one of which should be consumed.
|
||||||
|
ret = mblen("\xe2\x84\xa2\xe2\x84\xa2", 6);
|
||||||
|
EXPECT_EQ(ret, 3);
|
||||||
|
|
||||||
|
// Try a null character, which should return 0.
|
||||||
|
ret = mblen("\x00\x00", 2);
|
||||||
|
EXPECT_EQ(ret, 0);
|
||||||
|
|
||||||
|
// Try an incomplete multibyte character.
|
||||||
|
ret = mblen("\xe2\x84", 2);
|
||||||
|
EXPECT_EQ(ret, -1);
|
||||||
|
EXPECT_EQ(errno, EILSEQ);
|
||||||
|
|
||||||
|
// Ask if we support shift states and reset the internal state in the process.
|
||||||
|
ret = mblen(nullptr, 2);
|
||||||
|
EXPECT_EQ(ret, 0); // We don't support shift states.
|
||||||
|
ret = mblen("\x00", 1);
|
||||||
|
EXPECT_EQ(ret, 0); // No error likely means that the state is working again.
|
||||||
|
|
||||||
|
// Try an invalid multibyte sequence.
|
||||||
|
ret = mblen("\xff", 1);
|
||||||
|
EXPECT_EQ(ret, -1);
|
||||||
|
EXPECT_EQ(errno, EILSEQ);
|
||||||
|
}
|
||||||
|
|
|
@ -872,10 +872,24 @@ lldiv_t lldiv(long long numerator, long long denominator)
|
||||||
|
|
||||||
int mblen(char const* s, size_t n)
|
int mblen(char const* s, size_t n)
|
||||||
{
|
{
|
||||||
// FIXME: Implement locale support
|
// POSIX: Equivalent to mbtowc(NULL, s, n), but we mustn't change the state of mbtowc.
|
||||||
if (!s)
|
static mbstate_t internal_state = {};
|
||||||
|
|
||||||
|
// Reset the internal state and ask whether we have shift states.
|
||||||
|
if (s == nullptr) {
|
||||||
|
internal_state = {};
|
||||||
return 0;
|
return 0;
|
||||||
return (MB_CUR_MAX > n) ? n : MB_CUR_MAX;
|
}
|
||||||
|
|
||||||
|
size_t ret = mbrtowc(nullptr, s, n, &internal_state);
|
||||||
|
|
||||||
|
// Incomplete characters get returned as illegal sequence.
|
||||||
|
if (ret == -2ul) {
|
||||||
|
errno = EILSEQ;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t mbstowcs(wchar_t* pwcs, const char* s, size_t n)
|
size_t mbstowcs(wchar_t* pwcs, const char* s, size_t n)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue