diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-11-17 09:37:31 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-11-17 09:37:31 -0800 |
| commit | 7443244740724babd575943ee33c45da326afbe7 (patch) | |
| tree | 064d372e9b95c2ab3df5a7786e658cf3303f1ca7 | |
| parent | 4fb9241e4edbe238de8ba251f4448e31e8b1baf4 (diff) | |
| download | glibc-7443244740724babd575943ee33c45da326afbe7.tar.gz glibc-7443244740724babd575943ee33c45da326afbe7.tar.xz glibc-7443244740724babd575943ee33c45da326afbe7.zip | |
Handle LC_GLOBAL_LOCALE in duplocale.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | locale/Makefile | 2 | ||||
| -rw-r--r-- | locale/duplocale.c | 6 |
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 8dfb46e98c..b92fd42c9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-11-17 Ulrich Drepper <drepper@redhat.com> + [BZ #10969] + * locale/duplocale.c (__duplocale): Handle LC_GLOBAL_LOCALE special. + * locale/tst-duplocale.c: New file. + * locale/Makefile (tests): Add tst-duplocale. + [BZ #10968] * locale/langinfo.h (_NL_LOCALE_NAME): Correct definition. Patch by Bruno Haible <bruno@clisp.org>. diff --git a/locale/Makefile b/locale/Makefile index 2d645daa2f..2dbd8dc6a5 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -38,7 +38,7 @@ distribute = localeinfo.h categories.def iso-639.def iso-3166.def \ routines = setlocale findlocale loadlocale loadarchive \ localeconv nl_langinfo nl_langinfo_l mb_cur_max \ newlocale duplocale freelocale uselocale -tests = tst-C-locale tst-locname +tests = tst-C-locale tst-locname tst-duplocale categories = ctype messages monetary numeric time paper name \ address telephone measurement identification collate aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ diff --git a/locale/duplocale.c b/locale/duplocale.c index 61782590d7..63513c539c 100644 --- a/locale/duplocale.c +++ b/locale/duplocale.c @@ -1,5 +1,5 @@ /* Duplicate handle for selection of locales. - Copyright (C) 1997,2000,2001,2002,2005,2008 Free Software Foundation, Inc. + Copyright (C) 1997,2000-2002,2005,2008,2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -37,6 +37,10 @@ __duplocale (__locale_t dataset) if (dataset == _nl_C_locobj_ptr) return dataset; + /* Handle a special value. */ + if (dataset == LC_GLOBAL_LOCALE) + dataset = &_nl_global_locale; + __locale_t result; int cnt; size_t names_len = 0; |