luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libc/wchar: Call mbsnrtowcs in mbrtowc to handle the partial sequence correctly

Browse source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-06-01 01:14:56 +08:00 • committed by Petro Karashchenko
parent 4c34075d10
commit c19d37adf0
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libs/libc/wchar/lib_mbrtowc.c
View file

@ -57,15 +57,19 @@
size_t mbrtowc(FAR wchar_t *pwc, FAR const char *s,
size_t n, FAR mbstate_t *ps)
{
int retval = 0;
FAR const char *e = s;
size_t retval = 0;
if (s == NULL)
{
retval = mbtowc(NULL, "", 1);
s = e = "";
n = 1;
}
else
retval = mbsnrtowcs(pwc, &e, 1, n, ps);
if (retval == 1)
{
retval = mbtowc(pwc, s, n);
retval = e - s;
}
return retval;