mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 00:19:57 +00:00
963102971d
* wcsmbs/wcsmbsload.h (__wcsmbs_gconv_fcts, __wcsmbs_last_locale, __wcsmbs_to_wc, update_conversion_ptrs): Removed. (__wcsmbs_gconv_fcts_c, _nl_C_LC_CTYPE): New externs. (__wcsmbs_load_conv): Remove const from argument. (_nl_cleanup_ctype): New proto. (get_gconv_fcts): New function. * wcsmbs/wcsmbsload.c (__wcsmbs_last_locale): Removed. (__wcsmbs_to_wc): Rename back to... (to_wc): ... this. (__wcsmbs_gconv_fcts): Rename to... (__wcsmbs_gconv_fcts_c): ... this. Make const. Use to_wc. (lock): Removed. (__libc_setlocale_lock): New extern. (__wcsmbs_load_conv): Remove const from argument. Initialize new_category->private.ctype instead of a global variable. (__wcsmbs_clone_conv): Use get_gconv_fcts instead of update_function_ptrs. No locking is necessary. (_nl_cleanup_ctype): New function. * wcsmbs/btowc.c (__btowc): Use get_gconv_fcts instead of update_function_ptrs and a global __wcsmbs_gconv_fcts variable. * wcsmbs/mbrtowc.c (__mbrtowc): Likewise. * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise. * wcsmbs/wcrtomb.c (__wcrtomb): Likewise. * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise. * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise. * wcsmbs/wctob.c (wctob): Likewise. * stdlib/mblen.c (mblen): Likewise. * stdlib/mbtowc.c (mbtowc): Likewise. * stdlib/wctomb.c (wctomb): Likewise. * wcsmbs/mbsrtowcs.c (__mbsrtowcs): Likewise. Remove calls to wcsmbs_get_towc_func and wcsmbs_free_funcs. * wcsmbs/mbsrtowcs_l.c (wcsmbs_get_towc_func, wcsmbs_free_funcs): Removed.
70 lines
2.1 KiB
C
70 lines
2.1 KiB
C
/* Copyright (C) 1991,1997,1998,1999,2000,2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
#include <gconv.h>
|
|
#include <wcsmbs/wcsmbsload.h>
|
|
|
|
|
|
/* Internal state. */
|
|
static mbstate_t state;
|
|
|
|
/* Return the length of the multibyte character (if there is one)
|
|
at S which is no longer than N characters.
|
|
The ISO C standard says that the `mblen' function must not change
|
|
the state of the `mbtowc' function. */
|
|
int
|
|
mblen (const char *s, size_t n)
|
|
{
|
|
int result;
|
|
|
|
/* If S is NULL the function has to return null or not null
|
|
depending on the encoding having a state depending encoding or
|
|
not. */
|
|
if (s == NULL)
|
|
{
|
|
const struct gconv_fcts *fcts;
|
|
|
|
/* Get the conversion functions. */
|
|
fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
|
|
|
|
/* Reset the state. */
|
|
memset (&state, '\0', sizeof state);
|
|
|
|
result = fcts->towc->__stateful;
|
|
}
|
|
else if (*s == '\0')
|
|
/* According to the ISO C 89 standard this is the expected behaviour. */
|
|
result = 0;
|
|
else
|
|
{
|
|
memset (&state, '\0', sizeof state);
|
|
|
|
result = __mbrtowc (NULL, s, n, &state);
|
|
|
|
/* The `mbrtowc' functions tell us more than we need. Fold the -1
|
|
and -2 result into -1. */
|
|
if (result < 0)
|
|
result = -1;
|
|
}
|
|
|
|
return result;
|
|
}
|