From 4d97f2274463a02bffcfd07471f1edabf6b31e34 Mon Sep 17 00:00:00 2001 From: corinna Date: Wed, 18 Nov 2009 18:49:56 +0000 Subject: [PATCH] * libc/stdio/vfprintf.c: Include ../stdlib/local.h. Replace call to _mbtowc_r with direct call to __mbtowc. * libc/stdio/vfscanf.c: Ditto. * libc/stdlib/btowc.c: Include local.h. Replace call to _mbtowc_r with direct call to __mbtowc. * libc/stdlib/mblen.c: Ditto. * libc/stdlib/mblen_r.c: Ditto. * libc/stdlib/mbrtowc.c: Ditto. * libc/stdlib/mbstowcs_r.c: Ditto. * libc/stdlib/mbtowc.c: Ditto. * libc/stdlib/wcrtomb.c: Include local.h. Replace call to _wctomb_r with direct call to __wctomb. * libc/stdlib/wcsnrtombs.c: Ditto. (_wcsnrtombs_r): Ditto. * libc/stdlib/wcstombs_r.c: Ditto. * libc/stdlib/wctob.c: Ditto. * libc/stdlib/wctomb.c: Ditto. * libc/stdlib/mbrtowc.c (mbrtowc): Implement independently from _mbrtowc_r, unless PREFER_SIZE_OVER_SPEED or __OPTIMIZE_SIZE__ are defined. * libc/stdlib/wcrtomb.c (wcrtomb): Implement independently from _wcrtomb_r, unless PREFER_SIZE_OVER_SPEED or __OPTIMIZE_SIZE__ are defined. * libc/stdlib/mbtowc_r.c (__utf8_mbtowc): Drop unnecessary test for ch >= 0. --- newlib/ChangeLog | 30 ++++++++++++++++++++++++++++++ newlib/libc/stdio/vfprintf.c | 9 ++++++--- newlib/libc/stdio/vfscanf.c | 4 +++- newlib/libc/stdlib/btowc.c | 3 ++- newlib/libc/stdlib/mblen.c | 3 ++- newlib/libc/stdlib/mblen_r.c | 3 ++- newlib/libc/stdlib/mbrtowc.c | 31 +++++++++++++++++++++++++++++-- newlib/libc/stdlib/mbstowcs_r.c | 3 ++- newlib/libc/stdlib/mbtowc.c | 3 ++- newlib/libc/stdlib/mbtowc_r.c | 2 +- newlib/libc/stdlib/wcrtomb.c | 32 ++++++++++++++++++++++++++++++-- newlib/libc/stdlib/wcsnrtombs.c | 5 +++-- newlib/libc/stdlib/wcstombs_r.c | 5 +++-- newlib/libc/stdlib/wctob.c | 3 ++- newlib/libc/stdlib/wctomb.c | 4 +++- 15 files changed, 120 insertions(+), 20 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 8e8244328b..74495ad2cf 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,33 @@ +2009-11-18 Corinna Vinschen + + * libc/stdio/vfprintf.c: Include ../stdlib/local.h. Replace call to + _mbtowc_r with direct call to __mbtowc. + * libc/stdio/vfscanf.c: Ditto. + * libc/stdlib/btowc.c: Include local.h. Replace call to _mbtowc_r + with direct call to __mbtowc. + * libc/stdlib/mblen.c: Ditto. + * libc/stdlib/mblen_r.c: Ditto. + * libc/stdlib/mbrtowc.c: Ditto. + * libc/stdlib/mbstowcs_r.c: Ditto. + * libc/stdlib/mbtowc.c: Ditto. + * libc/stdlib/wcrtomb.c: Include local.h. Replace call to _wctomb_r + with direct call to __wctomb. + * libc/stdlib/wcsnrtombs.c: Ditto. + (_wcsnrtombs_r): Ditto. + * libc/stdlib/wcstombs_r.c: Ditto. + * libc/stdlib/wctob.c: Ditto. + * libc/stdlib/wctomb.c: Ditto. + + * libc/stdlib/mbrtowc.c (mbrtowc): Implement independently from + _mbrtowc_r, unless PREFER_SIZE_OVER_SPEED or __OPTIMIZE_SIZE__ are + defined. + * libc/stdlib/wcrtomb.c (wcrtomb): Implement independently from + _wcrtomb_r, unless PREFER_SIZE_OVER_SPEED or __OPTIMIZE_SIZE__ are + defined. + + * libc/stdlib/mbtowc_r.c (__utf8_mbtowc): Drop unnecessary test for + ch >= 0. + 2009-11-17 Yaakov Selkowitz * libm/common/fdlibm.h (logb, logbf): Move decls from here... diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c index 1d3119b4d9..4176fd40cd 100644 --- a/newlib/libc/stdio/vfprintf.c +++ b/newlib/libc/stdio/vfprintf.c @@ -114,7 +114,7 @@ Supporting OS subroutines required: <>, <>, <>, #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)vfprintf.c 5.50 (Berkeley) 12/16/92";*/ -static char *rcsid = "$Id$"; +static char *rcsid = "$Id: vfprintf.c,v 1.43 2002/08/13 02:40:06 fitzsim Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -159,6 +159,7 @@ static char *rcsid = "$Id$"; #include #include #include "local.h" +#include "../stdlib/local.h" #include "fvwrite.h" #include "vfieeefp.h" @@ -722,7 +723,8 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap), for (;;) { cp = fmt; #ifdef _MB_CAPABLE - while ((n = _mbtowc_r (data, &wc, fmt, MB_CUR_MAX, &state)) > 0) { + while ((n = __mbtowc (data, &wc, fmt, MB_CUR_MAX, + __locale_charset (), &state)) > 0) { if (wc == '%') break; fmt += n; @@ -1794,7 +1796,8 @@ _DEFUN(get_arg, (data, n, fmt, ap, numargs_p, args, arg_type, last_fmt), while (*fmt && n >= numargs) { # ifdef _MB_CAPABLE - while ((nbytes = _mbtowc_r (data, &wc, fmt, MB_CUR_MAX, &wc_state)) > 0) + while ((nbytes = __mbtowc (data, &wc, fmt, MB_CUR_MAX, + __locale_charset (), &wc_state)) > 0) { fmt += nbytes; if (wc == '%') diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c index b24c9fb844..065dc3e899 100644 --- a/newlib/libc/stdio/vfscanf.c +++ b/newlib/libc/stdio/vfscanf.c @@ -122,6 +122,7 @@ Supporting OS subroutines required: #include #include #include "local.h" +#include "../stdlib/local.h" #ifdef INTEGER_ONLY #define VFSCANF vfiscanf @@ -506,7 +507,8 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap), wc = *fmt; #else memset (&state, '\0', sizeof (state)); - nbytes = _mbtowc_r (rptr, &wc, fmt, MB_CUR_MAX, &state); + nbytes = __mbtowc (rptr, &wc, fmt, MB_CUR_MAX, __locale_charset (), + &state); #endif fmt += nbytes; if (wc == 0) diff --git a/newlib/libc/stdlib/btowc.c b/newlib/libc/stdlib/btowc.c index 847d7ce1aa..f5ef4624a4 100644 --- a/newlib/libc/stdlib/btowc.c +++ b/newlib/libc/stdlib/btowc.c @@ -3,6 +3,7 @@ #include #include #include +#include "local.h" wint_t btowc (int c) @@ -19,7 +20,7 @@ btowc (int c) _REENT_CHECK_MISC(_REENT); - retval = _mbtowc_r (_REENT, &pwc, &b, 1, &mbs); + retval = __mbtowc (_REENT, &pwc, &b, 1, __locale_charset (), &mbs); if (c == EOF || retval != 1) return WEOF; diff --git a/newlib/libc/stdlib/mblen.c b/newlib/libc/stdlib/mblen.c index 6df27b93a0..ace23889b1 100644 --- a/newlib/libc/stdlib/mblen.c +++ b/newlib/libc/stdlib/mblen.c @@ -46,6 +46,7 @@ effects vary with the locale. #include #include #include +#include "local.h" int _DEFUN (mblen, (s, n), @@ -58,7 +59,7 @@ _DEFUN (mblen, (s, n), _REENT_CHECK_MISC(_REENT); state = &(_REENT_MBLEN_STATE(_REENT)); - retval = _mbtowc_r (_REENT, NULL, s, n, state); + retval = __mbtowc (_REENT, NULL, s, n, __locale_charset (), state); if (retval < 0) { state->__count = 0; diff --git a/newlib/libc/stdlib/mblen_r.c b/newlib/libc/stdlib/mblen_r.c index 9361f65733..c3b5964438 100644 --- a/newlib/libc/stdlib/mblen_r.c +++ b/newlib/libc/stdlib/mblen_r.c @@ -46,6 +46,7 @@ effects vary with the locale. #include #include #include +#include "local.h" int _DEFUN (_mblen_r, (r, s, n, state), @@ -56,7 +57,7 @@ _DEFUN (_mblen_r, (r, s, n, state), { #ifdef _MB_CAPABLE int retval; - retval = _mbtowc_r (r, NULL, s, n, state); + retval = __mbtowc (r, NULL, s, n, __locale_charset (), state); if (retval < 0) { diff --git a/newlib/libc/stdlib/mbrtowc.c b/newlib/libc/stdlib/mbrtowc.c index c5e700dc99..e191e1158c 100644 --- a/newlib/libc/stdlib/mbrtowc.c +++ b/newlib/libc/stdlib/mbrtowc.c @@ -5,6 +5,7 @@ #include #include #include +#include "local.h" size_t _DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps), @@ -25,9 +26,9 @@ _DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps), #endif if (s == NULL) - retval = _mbtowc_r (ptr, NULL, "", 1, ps); + retval = __mbtowc (ptr, NULL, "", 1, __locale_charset (), ps); else - retval = _mbtowc_r (ptr, pwc, s, n, ps); + retval = __mbtowc (ptr, pwc, s, n, __locale_charset (), ps); if (retval == -1) { @@ -47,6 +48,32 @@ _DEFUN (mbrtowc, (pwc, s, n, ps), size_t n _AND mbstate_t *ps) { +#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) return _mbrtowc_r (_REENT, pwc, s, n, ps); +#else + int retval = 0; + +#ifdef _MB_CAPABLE + if (ps == NULL) + { + _REENT_CHECK_MISC(_REENT); + ps = &(_REENT_MBRTOWC_STATE(_REENT)); + } +#endif + + if (s == NULL) + retval = __mbtowc (_REENT, NULL, "", 1, __locale_charset (), ps); + else + retval = __mbtowc (_REENT, pwc, s, n, __locale_charset (), 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 */ diff --git a/newlib/libc/stdlib/mbstowcs_r.c b/newlib/libc/stdlib/mbstowcs_r.c index 3dd73e42c9..3ba8677112 100644 --- a/newlib/libc/stdlib/mbstowcs_r.c +++ b/newlib/libc/stdlib/mbstowcs_r.c @@ -1,5 +1,6 @@ #include #include +#include "local.h" size_t _DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state), @@ -17,7 +18,7 @@ _DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state), n = (size_t) 1; /* Value doesn't matter as long as it's not 0. */ while (n > 0) { - bytes = _mbtowc_r (r, pwcs, t, MB_CUR_MAX, state); + bytes = __mbtowc (r, pwcs, t, MB_CUR_MAX, __locale_charset (), state); if (bytes < 0) { state->__count = 0; diff --git a/newlib/libc/stdlib/mbtowc.c b/newlib/libc/stdlib/mbtowc.c index 3f34b8a28d..83b6a0edac 100644 --- a/newlib/libc/stdlib/mbtowc.c +++ b/newlib/libc/stdlib/mbtowc.c @@ -54,6 +54,7 @@ effects vary with the locale. #include #include #include +#include "local.h" int _DEFUN (mbtowc, (pwc, s, n), @@ -68,7 +69,7 @@ _DEFUN (mbtowc, (pwc, s, n), _REENT_CHECK_MISC(_REENT); ps = &(_REENT_MBTOWC_STATE(_REENT)); - retval = _mbtowc_r (_REENT, pwc, s, n, ps); + retval = __mbtowc (_REENT, pwc, s, n, __locale_charset (), ps); if (retval < 0) { diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c index 0fa57fafdf..863404fcb5 100644 --- a/newlib/libc/stdlib/mbtowc_r.c +++ b/newlib/libc/stdlib/mbtowc_r.c @@ -221,7 +221,7 @@ _DEFUN (__utf8_mbtowc, (r, pwc, s, n, charset, state), return 0; /* s points to the null character */ } - if (ch >= 0x0 && ch <= 0x7f) + if (ch <= 0x7f) { /* single-byte sequence */ state->__count = 0; diff --git a/newlib/libc/stdlib/wcrtomb.c b/newlib/libc/stdlib/wcrtomb.c index 06e487471c..60e0d89c8b 100644 --- a/newlib/libc/stdlib/wcrtomb.c +++ b/newlib/libc/stdlib/wcrtomb.c @@ -4,6 +4,7 @@ #include #include #include +#include "local.h" size_t _DEFUN (_wcrtomb_r, (ptr, s, wc, ps), @@ -24,9 +25,9 @@ _DEFUN (_wcrtomb_r, (ptr, s, wc, ps), #endif if (s == NULL) - retval = _wctomb_r (ptr, buf, L'\0', ps); + retval = __wctomb (ptr, buf, L'\0', __locale_charset (), ps); else - retval = _wctomb_r (ptr, s, wc, ps); + retval = __wctomb (ptr, s, wc, __locale_charset (), ps); if (retval == -1) { @@ -45,6 +46,33 @@ _DEFUN (wcrtomb, (s, wc, ps), wchar_t wc _AND mbstate_t *ps) { +#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) return _wcrtomb_r (_REENT, s, wc, ps); +#else + int retval = 0; + char buf[10]; + +#ifdef _MB_CAPABLE + if (ps == NULL) + { + _REENT_CHECK_MISC(_REENT); + ps = &(_REENT_WCRTOMB_STATE(_REENT)); + } +#endif + + if (s == NULL) + retval = __wctomb (_REENT, buf, L'\0', __locale_charset (), ps); + else + retval = __wctomb (_REENT, s, wc, __locale_charset (), 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 */ diff --git a/newlib/libc/stdlib/wcsnrtombs.c b/newlib/libc/stdlib/wcsnrtombs.c index a8e6901a3d..5f885a454c 100644 --- a/newlib/libc/stdlib/wcsnrtombs.c +++ b/newlib/libc/stdlib/wcsnrtombs.c @@ -99,6 +99,7 @@ PORTABILITY #include #include #include +#include "local.h" size_t _DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps), @@ -134,7 +135,7 @@ _DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps), { int count = ps->__count; wint_t wch = ps->__value.__wch; - int bytes = _wcrtomb_r (r, buff, *pwcs, ps); + int bytes = __wctomb (r, buff, *pwcs, __locale_charset (), ps); if (bytes == -1) { r->_errno = EILSEQ; @@ -160,7 +161,7 @@ _DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps), } else { - /* not enough room, we must back up state to before _wctomb_r call */ + /* not enough room, we must back up state to before __wctomb call */ ps->__count = count; ps->__value.__wch = wch; len = 0; diff --git a/newlib/libc/stdlib/wcstombs_r.c b/newlib/libc/stdlib/wcstombs_r.c index dd82bd3835..7017a10b1d 100644 --- a/newlib/libc/stdlib/wcstombs_r.c +++ b/newlib/libc/stdlib/wcstombs_r.c @@ -1,5 +1,6 @@ #include #include +#include "local.h" size_t _DEFUN (_wcstombs_r, (reent, s, pwcs, n, state), @@ -18,14 +19,14 @@ _DEFUN (_wcstombs_r, (reent, s, pwcs, n, state), { size_t num_bytes = 0; while (*pwcs != 0) - num_bytes += _wctomb_r (r, buff, *pwcs++, state); + num_bytes += __wctomb (r, buff, *pwcs++, __locale_charset (), state); return num_bytes; } else { while (n > 0) { - int bytes = _wctomb_r (r, buff, *pwcs, state); + int bytes = __wctomb (r, buff, *pwcs, __locale_charset (), state); if (bytes == -1) return -1; num_to_copy = (n > bytes ? bytes : (int)n); diff --git a/newlib/libc/stdlib/wctob.c b/newlib/libc/stdlib/wctob.c index 37f7f953f9..927c1a7a83 100644 --- a/newlib/libc/stdlib/wctob.c +++ b/newlib/libc/stdlib/wctob.c @@ -3,6 +3,7 @@ #include #include #include +#include "local.h" int wctob (wint_t c) @@ -16,7 +17,7 @@ wctob (wint_t c) _REENT_CHECK_MISC(_REENT); - retval = _wctomb_r (_REENT, &pwc, c, &mbs); + retval = __wctomb (_REENT, &pwc, c, __locale_charset (), &mbs); if (c == EOF || retval != 1) return WEOF; diff --git a/newlib/libc/stdlib/wctomb.c b/newlib/libc/stdlib/wctomb.c index 2ab7b03398..9e82eaaba0 100644 --- a/newlib/libc/stdlib/wctomb.c +++ b/newlib/libc/stdlib/wctomb.c @@ -49,6 +49,7 @@ effects vary with the locale. #include #include #include +#include "local.h" int _DEFUN (wctomb, (s, wchar), @@ -58,7 +59,8 @@ _DEFUN (wctomb, (s, wchar), #ifdef _MB_CAPABLE _REENT_CHECK_MISC(_REENT); - return _wctomb_r (_REENT, s, wchar, &(_REENT_WCTOMB_STATE(_REENT))); + return __wctomb (_REENT, s, wchar, __locale_charset (), + &(_REENT_WCTOMB_STATE(_REENT))); #else /* not _MB_CAPABLE */ if (s == NULL) return 0; -- 2.11.0