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>
81 lines
1.5 KiB
C
81 lines
1.5 KiB
C
#include <reent.h>
|
|
#include <newlib.h>
|
|
#include <wchar.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include "local.h"
|
|
|
|
size_t
|
|
_DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps),
|
|
struct _reent *ptr _AND
|
|
wchar_t *pwc _AND
|
|
const char *s _AND
|
|
size_t n _AND
|
|
mbstate_t *ps)
|
|
{
|
|
int retval = 0;
|
|
|
|
#ifdef _MB_CAPABLE
|
|
if (ps == NULL)
|
|
{
|
|
_REENT_CHECK_MISC(ptr);
|
|
ps = &(_REENT_MBRTOWC_STATE(ptr));
|
|
}
|
|
#endif
|
|
|
|
if (s == NULL)
|
|
retval = __MBTOWC (ptr, NULL, "", 1, ps);
|
|
else
|
|
retval = __MBTOWC (ptr, pwc, s, n, ps);
|
|
|
|
if (retval == -1)
|
|
{
|
|
ps->__count = 0;
|
|
ptr->_errno = EILSEQ;
|
|
return (size_t)(-1);
|
|
}
|
|
else
|
|
return (size_t)retval;
|
|
}
|
|
|
|
#ifndef _REENT_ONLY
|
|
size_t
|
|
_DEFUN (mbrtowc, (pwc, s, n, ps),
|
|
wchar_t *__restrict pwc _AND
|
|
const char *__restrict s _AND
|
|
size_t n _AND
|
|
mbstate_t *__restrict ps)
|
|
{
|
|
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
|
|
return _mbrtowc_r (_REENT, pwc, s, n, ps);
|
|
#else
|
|
int retval = 0;
|
|
struct _reent *reent = _REENT;
|
|
|
|
#ifdef _MB_CAPABLE
|
|
if (ps == NULL)
|
|
{
|
|
_REENT_CHECK_MISC(reent);
|
|
ps = &(_REENT_MBRTOWC_STATE(reent));
|
|
}
|
|
#endif
|
|
|
|
if (s == NULL)
|
|
retval = __MBTOWC (reent, NULL, "", 1, ps);
|
|
else
|
|
retval = __MBTOWC (reent, pwc, s, n, ps);
|
|
|
|
if (retval == -1)
|
|
{
|
|
ps->__count = 0;
|
|
reent->_errno = EILSEQ;
|
|
return (size_t)(-1);
|
|
}
|
|
else
|
|
return (size_t)retval;
|
|
#endif /* not PREFER_SIZE_OVER_SPEED */
|
|
}
|
|
#endif /* !_REENT_ONLY */
|