mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-16 19:40:07 +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.
79 lines
1.4 KiB
C
79 lines
1.4 KiB
C
#include <wchar.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <reent.h>
|
|
#include <errno.h>
|
|
|
|
size_t
|
|
_DEFUN (_wcsrtombs_r, (r, dst, src, len, ps),
|
|
struct _reent *r _AND
|
|
char *dst _AND
|
|
const wchar_t **src _AND
|
|
size_t len _AND
|
|
mbstate_t *ps)
|
|
{
|
|
char *ptr = dst;
|
|
char buff[10];
|
|
int i, n;
|
|
int count;
|
|
wint_t wch;
|
|
|
|
#ifdef MB_CAPABLE
|
|
if (ps == NULL)
|
|
{
|
|
_REENT_CHECK_MISC(r);
|
|
ps = &(_REENT_WCSRTOMBS_STATE(r));
|
|
}
|
|
#endif
|
|
|
|
n = (int)len;
|
|
|
|
while (n > 0)
|
|
{
|
|
wchar_t *pwcs = (wchar_t *)(*src);
|
|
int count = ps->__count;
|
|
wint_t wch = ps->__value.__wch;
|
|
int bytes = _wctomb_r (r, buff, *pwcs, ps);
|
|
if (bytes == -1)
|
|
{
|
|
r->_errno = EILSEQ;
|
|
ps->__count = 0;
|
|
return (size_t)-1;
|
|
}
|
|
if (bytes <= n)
|
|
{
|
|
for (i = 0; i < bytes; ++i)
|
|
*ptr++ = buff[i];
|
|
|
|
if (*pwcs == 0x00)
|
|
{
|
|
*src = NULL;
|
|
ps->__count = 0;
|
|
return (size_t)(ptr - dst - 1);
|
|
}
|
|
++(*src);
|
|
}
|
|
else
|
|
{
|
|
/* not enough room, we must back up state to before _wctomb_r call */
|
|
ps->__count = count;
|
|
ps->__value.__wch = wch;
|
|
}
|
|
n -= bytes;
|
|
}
|
|
|
|
return (size_t)(ptr - dst);
|
|
}
|
|
|
|
#ifndef _REENT_ONLY
|
|
size_t
|
|
_DEFUN (wcsrtombs, (dst, src, len, ps),
|
|
char *dst _AND
|
|
const wchar_t **src _AND
|
|
size_t len _AND
|
|
mbstate_t *ps)
|
|
{
|
|
return _wcsrtombs_r (_REENT, dst, src, len, ps);
|
|
}
|
|
#endif /* !_REENT_ONLY */
|