diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-08-29 06:50:10 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-08-29 06:50:10 +0000 |
| commit | 01beb5b9ff8fb38f6517837b42eea8f5ff7060d9 (patch) | |
| tree | 5c1b871d23c7d13cf5f6cdcbccb13c1ca281e09c /wcsmbs/mbsrtowcs.c | |
| parent | 653e58951271cf55a3b2d778ea02107b9ea44d78 (diff) | |
| download | glibc-01beb5b9ff8fb38f6517837b42eea8f5ff7060d9.tar.gz | |
Update.
2002-08-28 Ulrich Drepper <drepper@redhat.com>
* include/wchar.h: Declare __mbsrtowcs_l.
* wcsmbs/Makefile (routines): Add mbsrtowcs_l.
* wcsmbs/mbsrtowcs.c: Add support for compilation with
USE_IN_EXTENDED_LOCALE_MODEL.
* wcsmbs/mbsrtowcs_l: New file.
* wcsmbs/wcsmbsload.c (__wcsmbs_to_wc): Renamed from to_wc. Don't
define as static. Change all uses.
(__wcsmbs_getfct): Renamed from getfct. Don't define as static.
Change all callers.
* wcsmbs/wcsmbsload.h: Declare __wcsmbs_to_wc and __wcsmbs_getfct.
* time/strftime.c: When translating for the extended locale model
use the _l functions.
* time/Makefile (tests): Add tst-ftime_l.
* time/tst-ftime_l.c: New file.
Diffstat (limited to 'wcsmbs/mbsrtowcs.c')
| -rw-r--r-- | wcsmbs/mbsrtowcs.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c index aa93426a5c..097e462110 100644 --- a/wcsmbs/mbsrtowcs.c +++ b/wcsmbs/mbsrtowcs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +/* 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. @@ -32,6 +32,16 @@ #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; @@ -41,6 +51,7 @@ __mbsrtowcs (dst, src, len, ps) const char **src; size_t len; mbstate_t *ps; +#endif { struct __gconv_step_data data; size_t result; @@ -52,14 +63,23 @@ __mbsrtowcs (dst, src, len, ps) 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; +#ifdef USE_IN_EXTENDED_LOCALE_MODEL + /* Get the conversion function matching the locale. */ + towc = wcsmbs_get_towc_func (l); +#else /* Make sure we use the correct function. */ update_conversion_ptrs (); /* Get the structure with the function pointers. */ towc = __wcsmbs_gconv_fcts.towc; +#endif /* We have to handle DST == NULL special. */ if (dst == NULL) @@ -140,6 +160,13 @@ __mbsrtowcs (dst, src, len, ps) __set_errno (EILSEQ); } +#ifdef USE_IN_EXTENDED_LOCALE_MODEL + /* Free the conversion function data structures. */ + wcsmbs_free_funcs (towc); +#endif + return result; } +#ifndef USE_IN_EXTENDED_LOCALE_MODEL weak_alias (__mbsrtowcs, mbsrtowcs) +#endif |