mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 19:09:58 +08:00
9c64d2a7ba
* libc/include/sys/_types.h (_mbstate_t): Changed to use
unsigned char internally.
* libc/sys/linux/sys/_types.h: Ditto.
* libc/include/sys/reent.h
* libc/stdlib/mblen.c (mblen): Use function-specific state
value from default reentrancy structure.
* libc/stdlib/mblen_r.c (_mblen_r): If return code from
_mbtowc_r is less than 0, reset state __count value and
return -1.
* libc/stdlib/mbrlen.c (mbrlen): If the input state pointer
is NULL, use the function-specific pointer provided in the
default reentrancy structure.
* libc/stdlib/mbrtowc.c: Add reentrant form of function.
If input state pointer is NULL, use function-specific area
provided in reentrancy structure.
* libc/stdlib/mbsrtowcs.c: Ditto.
* libc/stdlib/wcrtomb.c: Ditto.
* libc/stdlib/wcsrtombs.c: Ditto.
* libc/stdlib/mbstowcs.c: Reformat.
* libc/stdlib/wcstombs.c: Ditto.
* libc/stdlib/mbstowcs_r.c (_mbstowcs_r): If an error occurs,
reset the state's __count value and return -1.
* libc/stdlib/mbtowc.c: Ditto.
* libc/stdlib/mbtowc_r.c (_mbtowc_r): Add restartable functionality.
If number of bytes is used up before completing a valid multibyte
character, return -2 and save the state.
* libc/stdlib/wctomb_r.c (_wctomb_r): Define __state as __count
and change some __count references to __state for clarity.
52 lines
878 B
C
52 lines
878 B
C
#include <wchar.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <reent.h>
|
|
#include <errno.h>
|
|
#include <string.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_r (ptr, pwc, "", 1, ps);
|
|
else
|
|
retval = _mbtowc_r (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 *pwc _AND
|
|
const char *s _AND
|
|
size_t n _AND
|
|
mbstate_t *ps)
|
|
{
|
|
return _mbrtowc_r (_REENT, pwc, s, n, ps);
|
|
}
|
|
#endif /* !_REENT_ONLY */
|