Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-30 21:36:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files
libs/libc/wchar/lib_mbrtowc.c
+8 -4
View File
@@ -57,15 +57,19 @@
size_t mbrtowc(FAR wchar_t *pwc, FAR const char *s, size_t mbrtowc(FAR wchar_t *pwc, FAR const char *s,
size_t n, FAR mbstate_t *ps) size_t n, FAR mbstate_t *ps)
{ {
int retval = 0; FAR const char *e = s;
size_t retval = 0;
if (s == NULL) 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; return retval;