mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 01:00:07 +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.
168 lines
4.5 KiB
C
168 lines
4.5 KiB
C
/* Copyright (C) 1996,1997,1998,1999,2000,2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
|
|
|
|
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 <dlfcn.h>
|
|
#include <errno.h>
|
|
#include <gconv.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
#include <wcsmbsload.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#ifndef EILSEQ
|
|
# define EILSEQ EINVAL
|
|
#endif
|
|
|
|
|
|
#ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
|
size_t
|
|
attribute_hidden
|
|
__mbsrtowcs_l (dst, src, len, ps, l)
|
|
wchar_t *dst;
|
|
const char **src;
|
|
size_t len;
|
|
mbstate_t *ps;
|
|
__locale_t l;
|
|
#else
|
|
/* This is the private state used if PS is NULL. */
|
|
static mbstate_t state;
|
|
|
|
size_t
|
|
__mbsrtowcs (dst, src, len, ps)
|
|
wchar_t *dst;
|
|
const char **src;
|
|
size_t len;
|
|
mbstate_t *ps;
|
|
#endif
|
|
{
|
|
struct __gconv_step_data data;
|
|
size_t result;
|
|
int status;
|
|
struct __gconv_step *towc;
|
|
size_t non_reversible;
|
|
const struct gconv_fcts *fcts;
|
|
|
|
/* Tell where we want the result. */
|
|
data.__invocation_counter = 0;
|
|
data.__internal_use = 1;
|
|
data.__flags = __GCONV_IS_LAST;
|
|
#ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
|
data.__statep = ps;
|
|
#else
|
|
data.__statep = ps ?: &state;
|
|
#endif
|
|
data.__trans = NULL;
|
|
|
|
/* Get the conversion functions. */
|
|
#ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
|
fcts = get_gconv_fcts (l->__locales[LC_CTYPE]);
|
|
#else
|
|
fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
|
|
#endif
|
|
|
|
/* Get the structure with the function pointers. */
|
|
towc = fcts->towc;
|
|
|
|
/* We have to handle DST == NULL special. */
|
|
if (dst == NULL)
|
|
{
|
|
mbstate_t temp_state;
|
|
wchar_t buf[64]; /* Just an arbitrary size. */
|
|
const unsigned char *inbuf = (const unsigned char *) *src;
|
|
const unsigned char *srcend = inbuf + strlen (inbuf) + 1;
|
|
|
|
temp_state = *data.__statep;
|
|
data.__statep = &temp_state;
|
|
|
|
result = 0;
|
|
data.__outbufend = (char *) buf + sizeof (buf);
|
|
do
|
|
{
|
|
data.__outbuf = (char *) buf;
|
|
|
|
status = DL_CALL_FCT (towc->__fct,
|
|
(towc, &data, &inbuf, srcend, NULL,
|
|
&non_reversible, 0, 1));
|
|
|
|
result += (wchar_t *) data.__outbuf - buf;
|
|
}
|
|
while (status == __GCONV_FULL_OUTPUT);
|
|
|
|
if (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
|
|
{
|
|
/* There better should be a NUL wide char at the end. */
|
|
assert (((wchar_t *) data.__outbuf)[-1] == L'\0');
|
|
/* Don't count the NUL character in. */
|
|
--result;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* This code is based on the safe assumption that all internal
|
|
multi-byte encodings use the NUL byte only to mark the end
|
|
of the string. */
|
|
const unsigned char *srcend;
|
|
|
|
srcend = (const unsigned char *) (*src
|
|
+ __strnlen (*src, len * MB_CUR_MAX)
|
|
+ 1);
|
|
|
|
data.__outbuf = (unsigned char *) dst;
|
|
data.__outbufend = data.__outbuf + len * sizeof (wchar_t);
|
|
|
|
status = DL_CALL_FCT (towc->__fct,
|
|
(towc, &data, (const unsigned char **) src, srcend,
|
|
NULL, &non_reversible, 0, 1));
|
|
|
|
result = (wchar_t *) data.__outbuf - dst;
|
|
|
|
/* We have to determine whether the last character converted
|
|
is the NUL character. */
|
|
if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
|
|
&& ((wchar_t *) dst)[result - 1] == L'\0')
|
|
{
|
|
assert (result > 0);
|
|
assert (__mbsinit (data.__statep));
|
|
*src = NULL;
|
|
--result;
|
|
}
|
|
}
|
|
|
|
/* There must not be any problems with the conversion but illegal input
|
|
characters. */
|
|
assert (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT
|
|
|| status == __GCONV_ILLEGAL_INPUT
|
|
|| status == __GCONV_INCOMPLETE_INPUT
|
|
|| status == __GCONV_FULL_OUTPUT);
|
|
|
|
if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
|
|
&& status != __GCONV_EMPTY_INPUT && status != __GCONV_INCOMPLETE_INPUT)
|
|
{
|
|
result = (size_t) -1;
|
|
__set_errno (EILSEQ);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
#ifndef USE_IN_EXTENDED_LOCALE_MODEL
|
|
weak_alias (__mbsrtowcs, mbsrtowcs)
|
|
#endif
|