diff options
Diffstat (limited to 'newlib/libc/stdlib/mblen.c')
| -rw-r--r-- | newlib/libc/stdlib/mblen.c | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/newlib/libc/stdlib/mblen.c b/newlib/libc/stdlib/mblen.c index 6df27b93a..d9b774e45 100644 --- a/newlib/libc/stdlib/mblen.c +++ b/newlib/libc/stdlib/mblen.c @@ -16,20 +16,20 @@ TRAD_SYNOPSIS size_t <[n]>; DESCRIPTION -When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming +When MB_CAPABLE is not defined, this is a minimal ANSI-conforming implementation of <<mblen>>. In this case, the only ``multi-byte character sequences'' recognized are single bytes, and thus <<1>> is returned unless <[s]> is the null pointer or has a length of 0 or is the empty string. -When _MB_CAPABLE is defined, this routine calls <<_mbtowc_r>> to perform +When MB_CAPABLE is defined, this routine calls <<_mbtowc_r>> to perform the conversion, passing a state variable to allow state dependent decoding. The result is based on the locale setting which may be restricted to a defined set of locales. RETURNS This implementation of <<mblen>> returns <<0>> if -<[s]> is <<NULL>> or the empty string; it returns <<1>> if not _MB_CAPABLE or +<[s]> is <<NULL>> or the empty string; it returns <<1>> if not MB_CAPABLE or the character is a single-byte character; it returns <<-1>> if the multi-byte character is invalid; otherwise it returns the number of bytes in the multibyte character. @@ -43,37 +43,24 @@ effects vary with the locale. #ifndef _REENT_ONLY -#include <newlib.h> #include <stdlib.h> -#include <wchar.h> int _DEFUN (mblen, (s, n), const char *s _AND size_t n) { -#ifdef _MB_CAPABLE - int retval = 0; - mbstate_t *state; - - _REENT_CHECK_MISC(_REENT); - state = &(_REENT_MBLEN_STATE(_REENT)); - retval = _mbtowc_r (_REENT, NULL, s, n, state); - if (retval < 0) - { - state->__count = 0; - return -1; - } - else - return retval; - -#else /* not _MB_CAPABLE */ - if (s == NULL || *s == '\0') - return 0; - if (n == 0) - return -1; - return 1; -#endif /* not _MB_CAPABLE */ +#ifdef MB_CAPABLE + static int state; + + return _mbtowc_r (_REENT, NULL, s, n, &state); +#else /* not MB_CAPABLE */ + if (s == NULL || *s == '\0') + return 0; + if (n == 0) + return -1; + return 1; +#endif /* not MB_CAPABLE */ } #endif /* !_REENT_ONLY */ |