mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-27 05:00:15 +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.
113 lines
3.3 KiB
C
113 lines
3.3 KiB
C
/* Copyright (C) 1996,1997,1998,2000,2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 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 <wchar.h>
|
|
#include <wcsmbsload.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#ifndef EILSEQ
|
|
# define EILSEQ EINVAL
|
|
#endif
|
|
|
|
|
|
/* This is the private state used if PS is NULL. */
|
|
static mbstate_t state;
|
|
|
|
size_t
|
|
__wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
|
|
{
|
|
char buf[MB_CUR_MAX];
|
|
struct __gconv_step_data data;
|
|
int status;
|
|
size_t result;
|
|
size_t dummy;
|
|
const struct gconv_fcts *fcts;
|
|
|
|
/* Set information for this step. */
|
|
data.__invocation_counter = 0;
|
|
data.__internal_use = 1;
|
|
data.__flags = __GCONV_IS_LAST;
|
|
data.__statep = ps ?: &state;
|
|
data.__trans = NULL;
|
|
|
|
/* A first special case is if S is NULL. This means put PS in the
|
|
initial state. */
|
|
if (s == NULL)
|
|
{
|
|
s = buf;
|
|
wc = L'\0';
|
|
}
|
|
|
|
/* Tell where we want to have the result. */
|
|
data.__outbuf = s;
|
|
data.__outbufend = s + MB_CUR_MAX;
|
|
|
|
/* Get the conversion functions. */
|
|
fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
|
|
|
|
/* If WC is the NUL character we write into the output buffer the byte
|
|
sequence necessary for PS to get into the initial state, followed
|
|
by a NUL byte. */
|
|
if (wc == L'\0')
|
|
{
|
|
status = DL_CALL_FCT (fcts->tomb->__fct,
|
|
(fcts->tomb, &data, NULL, NULL,
|
|
NULL, &dummy, 1, 1));
|
|
|
|
if (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
|
|
*data.__outbuf++ = '\0';
|
|
}
|
|
else
|
|
{
|
|
/* Do a normal conversion. */
|
|
const unsigned char *inbuf = (const unsigned char *) &wc;
|
|
|
|
status = DL_CALL_FCT (fcts->tomb->__fct,
|
|
(fcts->tomb, &data, &inbuf,
|
|
inbuf + sizeof (wchar_t), NULL, &dummy, 0, 1));
|
|
}
|
|
|
|
/* There must not be any problems with the conversion but illegal input
|
|
characters. The output buffer must be large enough, otherwise the
|
|
definition of MB_CUR_MAX is not correct. All the other possible
|
|
errors also must not happen. */
|
|
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_EMPTY_INPUT
|
|
|| status == __GCONV_FULL_OUTPUT)
|
|
result = data.__outbuf - (unsigned char *) s;
|
|
else
|
|
{
|
|
result = (size_t) -1;
|
|
__set_errno (EILSEQ);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
weak_alias (__wcrtomb, wcrtomb)
|
|
libc_hidden_weak (wcrtomb)
|