mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
Use Gnulib's `duplocale' module.
* libguile/i18n.c (scm_make_locale): Simplify global locale handling, using duplocale(3) for all kinds of locales. (scm_init_i18n): Comment on why we don't just use `LC_GLOBAL_LOCALE' for `global_locale_smob'. * m4/gnulib-cache.m4: Add `duplocale'.
This commit is contained in:
parent
414e44412c
commit
c3b16a5d8e
6 changed files with 194 additions and 21 deletions
|
@ -9,7 +9,7 @@
|
|||
# the same distribution terms as the rest of that program.
|
||||
#
|
||||
# Generated by gnulib-tool.
|
||||
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3 --libtool --macro-prefix=gl --no-vc-files alignof alloca-opt announce-gen autobuild byteswap canonicalize-lgpl environ extensions flock fpieee full-read full-write gendocs gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton lib-symbol-versions lib-symbol-visibility libunistring locale maintainer-makefile putenv stdlib strcase strftime striconveh string verify version-etc-fsf vsnprintf warnings
|
||||
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3 --libtool --macro-prefix=gl --no-vc-files alignof alloca-opt announce-gen autobuild byteswap canonicalize-lgpl duplocale environ extensions flock fpieee full-read full-write gendocs gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton lib-symbol-versions lib-symbol-visibility libunistring locale maintainer-makefile putenv stdlib strcase strftime striconveh string verify version-etc-fsf vsnprintf warnings
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
|
||||
|
||||
|
@ -205,6 +205,15 @@ CLEANFILES += configmake.h configmake.h-t
|
|||
|
||||
## end gnulib module configmake
|
||||
|
||||
## begin gnulib module duplocale
|
||||
|
||||
|
||||
EXTRA_DIST += duplocale.c
|
||||
|
||||
EXTRA_libgnu_la_SOURCES += duplocale.c
|
||||
|
||||
## end gnulib module duplocale
|
||||
|
||||
## begin gnulib module errno
|
||||
|
||||
BUILT_SOURCES += $(ERRNO_H)
|
||||
|
|
115
lib/duplocale.c
Normal file
115
lib/duplocale.c
Normal file
|
@ -0,0 +1,115 @@
|
|||
/* Duplicate a locale object.
|
||||
Copyright (C) 2009 Free Software Foundation, Inc.
|
||||
|
||||
This program 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 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
/* Written by Bruno Haible <bruno@clisp.org>, 2007. */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
/* Specification. */
|
||||
#include <locale.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <langinfo.h>
|
||||
#include <string.h>
|
||||
|
||||
/* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
|
||||
glibc < 2.12.
|
||||
See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
|
||||
#undef _NL_LOCALE_NAME
|
||||
#define _NL_LOCALE_NAME(category) _NL_ITEM ((category), _NL_ITEM_INDEX (-1))
|
||||
|
||||
#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
|
||||
|
||||
#undef duplocale
|
||||
|
||||
locale_t
|
||||
rpl_duplocale (locale_t locale)
|
||||
{
|
||||
/* Work around crash in the duplocale function in glibc < 2.12.
|
||||
See <http://sourceware.org/bugzilla/show_bug.cgi?id=10969>. */
|
||||
if (locale == LC_GLOBAL_LOCALE)
|
||||
{
|
||||
/* Create a copy of the locale by fetching the name of each locale
|
||||
category, starting with LC_CTYPE. */
|
||||
static struct { int cat; int mask; } categories[] =
|
||||
{
|
||||
{ LC_NUMERIC, LC_NUMERIC_MASK },
|
||||
{ LC_TIME, LC_TIME_MASK },
|
||||
{ LC_COLLATE, LC_COLLATE_MASK },
|
||||
{ LC_MONETARY, LC_MONETARY_MASK },
|
||||
{ LC_MESSAGES, LC_MESSAGES_MASK }
|
||||
#ifdef LC_PAPER
|
||||
, { LC_PAPER, LC_PAPER_MASK }
|
||||
#endif
|
||||
#ifdef LC_NAME
|
||||
, { LC_NAME, LC_NAME_MASK }
|
||||
#endif
|
||||
#ifdef LC_ADDRESS
|
||||
, { LC_ADDRESS, LC_ADDRESS_MASK }
|
||||
#endif
|
||||
#ifdef LC_TELEPHONE
|
||||
, { LC_TELEPHONE, LC_TELEPHONE_MASK }
|
||||
#endif
|
||||
#ifdef LC_MEASUREMENT
|
||||
, { LC_MEASUREMENT, LC_MEASUREMENT_MASK }
|
||||
#endif
|
||||
#ifdef LC_IDENTIFICATION
|
||||
, { LC_IDENTIFICATION, LC_IDENTIFICATION_MASK }
|
||||
#endif
|
||||
};
|
||||
const char *base_name;
|
||||
locale_t base_copy;
|
||||
unsigned int i;
|
||||
|
||||
base_name = nl_langinfo (_NL_LOCALE_NAME (LC_CTYPE));
|
||||
if (base_name[0] == '\0')
|
||||
/* Fallback code for glibc < 2.4, which did not implement
|
||||
nl_langinfo (_NL_LOCALE_NAME (category)). */
|
||||
base_name = setlocale (LC_CTYPE, NULL);
|
||||
base_copy = newlocale (LC_ALL_MASK, base_name, NULL);
|
||||
if (base_copy == NULL)
|
||||
return NULL;
|
||||
|
||||
for (i = 0; i < SIZEOF (categories); i++)
|
||||
{
|
||||
int category = categories[i].cat;
|
||||
int category_mask = categories[i].mask;
|
||||
const char *name = nl_langinfo (_NL_LOCALE_NAME (category));
|
||||
if (name[0] == '\0')
|
||||
/* Fallback code for glibc < 2.4, which did not implement
|
||||
nl_langinfo (_NL_LOCALE_NAME (category)). */
|
||||
name = setlocale (category, NULL);
|
||||
if (strcmp (name, base_name) != 0)
|
||||
{
|
||||
locale_t copy = newlocale (category_mask, name, base_copy);
|
||||
if (copy == NULL)
|
||||
{
|
||||
int saved_errno = errno;
|
||||
freelocale (base_copy);
|
||||
errno = saved_errno;
|
||||
return NULL;
|
||||
}
|
||||
/* No need to call freelocale (base_copy) if copy != base_copy;
|
||||
the newlocale function already takes care of doing it. */
|
||||
base_copy = copy;
|
||||
}
|
||||
}
|
||||
|
||||
return base_copy;
|
||||
}
|
||||
|
||||
return duplocale (locale);
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue