mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-18 12:29:32 +08:00
d16a56306d
- Remove charset parameter from low level __foo_wctomb/__foo_mbtowc calls. - Instead, create array of function for ISO and Windows codepages to point to function which does not require to evaluate the charset string on each call. Create matching helper functions. I.e., __iso_wctomb, __iso_mbtowc, __cp_wctomb and __cp_mbtowc are functions returning the right function pointer now. - Create __WCTOMB/__MBTOWC macros utilizing per-reent locale and replace calls to __wctomb/__mbtowc with calls to __WCTOMB/__MBTOWC. - Drop global __wctomb/__mbtowc vars. - Utilize aforementioned changes in Cygwin to get rid of charset in other, calling functions and simplify the code. - In Cygwin restrict global cygheap locale info to the job performed by internal_setlocale. Use UTF-8 instead of ASCII on the fly in internal conversion functions. - In Cygwin dll_entry, make sure to initialize a TLS area with a NULL _REENT->_locale pointer. Add comment to explain why. Signed-off by: Corinna Vinschen <corinna@vinschen.de>
39 lines
722 B
C
39 lines
722 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 *__restrict pwcs _AND
|
|
const char *__restrict 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, state);
|
|
if (bytes < 0)
|
|
{
|
|
state->__count = 0;
|
|
return -1;
|
|
}
|
|
else if (bytes == 0)
|
|
break;
|
|
t += bytes;
|
|
++ret;
|
|
if (pwcs)
|
|
{
|
|
++pwcs;
|
|
--n;
|
|
}
|
|
}
|
|
return ret;
|
|
}
|