mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-16 19:40:07 +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>
49 lines
1.0 KiB
C
49 lines
1.0 KiB
C
#include <stdlib.h>
|
|
#include <wchar.h>
|
|
#include "local.h"
|
|
|
|
size_t
|
|
_DEFUN (_wcstombs_r, (reent, s, pwcs, n, state),
|
|
struct _reent *r _AND
|
|
char *__restrict s _AND
|
|
const wchar_t *__restrict pwcs _AND
|
|
size_t n _AND
|
|
mbstate_t *state)
|
|
{
|
|
char *ptr = s;
|
|
size_t max = n;
|
|
char buff[8];
|
|
int i, bytes, num_to_copy;
|
|
|
|
if (s == NULL)
|
|
{
|
|
size_t num_bytes = 0;
|
|
while (*pwcs != 0)
|
|
{
|
|
bytes = __WCTOMB (r, buff, *pwcs++, state);
|
|
if (bytes == -1)
|
|
return -1;
|
|
num_bytes += bytes;
|
|
}
|
|
return num_bytes;
|
|
}
|
|
else
|
|
{
|
|
while (n > 0)
|
|
{
|
|
bytes = __WCTOMB (r, buff, *pwcs, state);
|
|
if (bytes == -1)
|
|
return -1;
|
|
num_to_copy = (n > bytes ? bytes : (int)n);
|
|
for (i = 0; i < num_to_copy; ++i)
|
|
*ptr++ = buff[i];
|
|
|
|
if (*pwcs == 0x00)
|
|
return ptr - s - (n >= bytes);
|
|
++pwcs;
|
|
n -= num_to_copy;
|
|
}
|
|
return max;
|
|
}
|
|
}
|