JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2002-09-09 Jeff Johnston <jjohnstn@redhat.com>

Browse Source 
* 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.
This commit is contained in:
Jeff Johnston
2002-09-09 21:42:14 +00:00
parent b0591c89af
commit 9c64d2a7ba
17 changed files with 665 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
newlib/libc/stdlib/mblen.c
View File

@ -52,21 +52,26 @@ _DEFUN (mblen, (s, n),
size_t n)
{
#ifdef MB_CAPABLE
int retval = 0;
_REENT_CHECK_MISC(_REENT);
retval = _mbtowc_r (_REENT, NULL, s, n, &(_REENT_MBLEN_STATE(_REENT)));
if (retval < 0)
return -1;
else
return retval;
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;
if (s == NULL || *s == '\0')
return 0;
if (n == 0)
return -1;
return 1;
#endif /* not MB_CAPABLE */
}