Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LibC: Fix mbstowcs and add wcstombs

This commit is contained in:
Bananymous 2025-06-16 15:08:49 +03:00
parent f9451915b9
commit cdcd226b1a
1 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
userspace/libraries/LibC/stdlib.cpp
View File

@ -572,20 +572,21 @@ int mblen(const char* s, size_t n)
size_t mbstowcs(wchar_t* __restrict pwcs, const char* __restrict s, size_t n) size_t mbstowcs(wchar_t* __restrict pwcs, const char* __restrict s, size_t n)
{ {
auto* us = reinterpret_cast<const unsigned char*>(s); size_t written = 0;
size_t len = 0;
switch (__getlocale(LC_CTYPE)) switch (__getlocale(LC_CTYPE))
{ {
case LOCALE_INVALID: case LOCALE_INVALID:
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
case LOCALE_POSIX: case LOCALE_POSIX:
while (*us && len < n) if (pwcs == nullptr)
pwcs[len++] = *us++; written = strlen(s);
else for (; s[written] && written < n; written++)
pwcs[written] = s[written];
break; break;
case LOCALE_UTF8: case LOCALE_UTF8:
while (*us && len < n) const auto* us = reinterpret_cast<const unsigned char*>(s);
for (; *us && (pwcs == nullptr || written < n); written++)
{ {
auto wch = BAN::UTF8::to_codepoint(us); auto wch = BAN::UTF8::to_codepoint(us);
if (wch == BAN::UTF8::invalid) if (wch == BAN::UTF8::invalid)
@ -593,16 +594,57 @@ size_t mbstowcs(wchar_t* __restrict pwcs, const char* __restrict s, size_t n)
errno = EILSEQ; errno = EILSEQ;
return -1; return -1;
} }
pwcs[len++] = wch; if (pwcs != nullptr)
pwcs[written] = wch;
us += BAN::UTF8::byte_length(*us); us += BAN::UTF8::byte_length(*us);
} }
break; break;
} }
if (len < n) if (pwcs != nullptr && written < n)
pwcs[len] = 0; pwcs[written] = L'\0';
return written;
}
return len; size_t wcstombs(char* __restrict s, const wchar_t* __restrict pwcs, size_t n)
{
size_t written = 0;
switch (__getlocale(LC_CTYPE))
{
case locale_t::LOCALE_INVALID:
ASSERT_NOT_REACHED();
case locale_t::LOCALE_POSIX:
for (size_t i = 0; pwcs[i] && (s == nullptr || written < n); i++)
{
if (pwcs[i] > 0xFF)
return -1;
if (s != nullptr)
s[written] = pwcs[i];
written++;
}
break;
case locale_t::LOCALE_UTF8:
for (size_t i = 0; pwcs[i] && (s == nullptr || written < n); i++)
{
char buffer[5];
if (!BAN::UTF8::from_codepoints(pwcs + i, 1, buffer))
return -1;
const size_t len = strlen(buffer);
if (written + len > n)
return len;
if (s != nullptr)
memcpy(s + written, buffer, len);
written += len;
}
break;
}
if (s && written < n)
s[written] = '\0';
return written;
} }
void* bsearch(const void* key, const void* base, size_t nel, size_t width, int (*compar)(const void*, const void*)) void* bsearch(const void* key, const void* base, size_t nel, size_t width, int (*compar)(const void*, const void*))