mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 11:00:04 +08:00
b4fee5273e
_mbtowc_r with direct call to __mbtowc. * libc/stdio/vfscanf.c: Ditto. * libc/stdlib/btowc.c: Include local.h. Replace call to _mbtowc_r with direct call to __mbtowc. * libc/stdlib/mblen.c: Ditto. * libc/stdlib/mblen_r.c: Ditto. * libc/stdlib/mbrtowc.c: Ditto. * libc/stdlib/mbstowcs_r.c: Ditto. * libc/stdlib/mbtowc.c: Ditto. * libc/stdlib/wcrtomb.c: Include local.h. Replace call to _wctomb_r with direct call to __wctomb. * libc/stdlib/wcsnrtombs.c: Ditto. (_wcsnrtombs_r): Ditto. * libc/stdlib/wcstombs_r.c: Ditto. * libc/stdlib/wctob.c: Ditto. * libc/stdlib/wctomb.c: Ditto. * libc/stdlib/mbrtowc.c (mbrtowc): Implement independently from _mbrtowc_r, unless PREFER_SIZE_OVER_SPEED or __OPTIMIZE_SIZE__ are defined. * libc/stdlib/wcrtomb.c (wcrtomb): Implement independently from _wcrtomb_r, unless PREFER_SIZE_OVER_SPEED or __OPTIMIZE_SIZE__ are defined. * libc/stdlib/mbtowc_r.c (__utf8_mbtowc): Drop unnecessary test for ch >= 0.
39 lines
721 B
C
39 lines
721 B
C
#include <stdlib.h>
|
|
#include <wchar.h>
|
|
#include "local.h"
|
|
|
|
size_t
|
|
_DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state),
|
|
struct _reent *r _AND
|
|
wchar_t *pwcs _AND
|
|
const char *s _AND
|
|
size_t n _AND
|
|
mbstate_t *state)
|
|
{
|
|
size_t ret = 0;
|
|
char *t = (char *)s;
|
|
int bytes;
|
|
|
|
if (!pwcs)
|
|
n = (size_t) 1; /* Value doesn't matter as long as it's not 0. */
|
|
while (n > 0)
|
|
{
|
|
bytes = __mbtowc (r, pwcs, t, MB_CUR_MAX, __locale_charset (), state);
|
|
if (bytes < 0)
|
|
{
|
|
state->__count = 0;
|
|
return -1;
|
|
}
|
|
else if (bytes == 0)
|
|
break;
|
|
t += bytes;
|
|
++ret;
|
|
if (pwcs)
|
|
{
|
|
++pwcs;
|
|
--n;
|
|
}
|
|
}
|
|
return ret;
|
|
}
|