2000-01-22 13:50:49 +08:00
|
|
|
/* Implementation of the internal dcigettext function.
|
2016-01-05 00:05:18 +08:00
|
|
|
Copyright (C) 1995-2016 Free Software Foundation, Inc.
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
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 2.1 of the License, or
|
|
|
|
(at your option) any later version.
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
This program is distributed in the hope that it will be useful,
|
2000-01-22 13:50:49 +08:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2014-12-10 20:03:53 +08:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU Lesser General Public License for more details.
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
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/>. */
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2000-04-28 13:12:30 +08:00
|
|
|
/* Tell glibc's <string.h> to provide a prototype for mempcpy().
|
|
|
|
This must come before <config.h> because <config.h> may include
|
|
|
|
<features.h>, and once <features.h> has been included, it's too late. */
|
|
|
|
#ifndef _GNU_SOURCE
|
|
|
|
# define _GNU_SOURCE 1
|
|
|
|
#endif
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include <config.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
Update.
2001-03-04 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (DCIGETTEXT): Increment path_max proportionally.
2001-10-31 Bruno Haible <bruno@clisp.org>
* intl/plural.y: Include <stddef.h>, needed for NULL with SunOS 4 cc.
2001-03-21 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (_nl_state_lock): Mark as #ifdef _LIBC. AIX 3 xlc
chokes on empty macro arguments.
* intl/plural.y: Add #pragma for alloca on AIX 3.
2001-11-27 Ulrich Drepper <drepper@redhat.com>
* intl/dcigettext.c (guess_category_value): Only implement for
glibc. Otherwise rely on function _nl_locale_name which isn't
present in the glibc sources.
2001-09-24 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (_nl_init_domain_conv): Also enable
transliteration when building on a glibc system but outside glibc.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-eval.c: New file, extracted from dcigettext.c.
* intl/dcigettext.c (plural_eval): Remove function, moved to
intl/plural-eval.c.
(plural_lookup): Call PLURAL_EVAL instead of plural_eval.
Include plural-eval.c.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.c (EXTRACT_PLURAL_EXPRESSION): Reject numbers that
don't start with a digit; nplurals must be positive.
2001-09-02 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.h: New file, extracted from gettextP.h.
* intl/plural-exp.c: New file, extracted from loadmsgcat.c.
* intl/gettextP.h (struct expression, struct parse_args,
__gettext_free_exp, __gettextparse): Move to plural-exp.h.
* intl/loadmsgcat.c: Include plural-exp.h.
(PLURAL_PARSE): Move macro to plural-exp.h.
(plvar, plone, germanic_plural, INIT_GERMANIC_PLURAL): Move to
plural-exp.c.
(_nl_load_domain): Move plural handling code to plural-exp.c. Call
EXTRACT_PLURAL_EXPRESSION.
(_nl_unload_domain): Update.
* intl/dcigettext.c: Include plural-exp.h.
* intl/plural.y: Include plural-exp.h, not gettextP.h.
(FREE_EXPRESSION): Move macro to plural-exp.h.
* intl/Makefile (routines): Add plural-exp.
(distribute): Add plural-exp.h.
2001-07-28 Bruno Haible <bruno@clisp.org>
* intl/l10nflist.c (_nl_normalize_codeset): Cast isalnum, isalpha,
isdigit, tolower argument to 'unsigned char'.
* intl/loadmsgcat.c (_nl_load_domain): Cast isspace argument to
'unsigned char'.
* intl/localealias.c (read_alias_file): Cast isspace argument to
'unsigned char'.
2001-10-20 Bruno Haible <bruno@clisp.org>
Assume strchr() exists. (Without it, intl/explodename.c wouldn't link
anyway.)
* intl/dcigettext.c (strchr): Remove fallback definition; it conflicts
with the variable 'index' in plural_lookup.
* intl/l10nflist.c (strchr): Likewise.
* intl/localealias.c (strchr): Likewise.
Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
* intl/bindtextdom.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dgettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/explodename.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/gettext.c: Likewise.
* intl/l10nflist.c: Likewise.
* intl/loadmsgcat.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/gettext.h: Assume <limits.h> exists.
2001-11-28 08:09:26 +08:00
|
|
|
#ifdef __GNUC__
|
2000-01-22 13:50:49 +08:00
|
|
|
# define alloca __builtin_alloca
|
|
|
|
# define HAVE_ALLOCA 1
|
|
|
|
#else
|
2014-12-10 20:03:53 +08:00
|
|
|
# ifdef _MSC_VER
|
|
|
|
# include <malloc.h>
|
|
|
|
# define alloca _alloca
|
2000-01-22 13:50:49 +08:00
|
|
|
# else
|
2014-12-10 20:03:53 +08:00
|
|
|
# if defined HAVE_ALLOCA_H || defined _LIBC
|
|
|
|
# include <alloca.h>
|
2000-01-22 13:50:49 +08:00
|
|
|
# else
|
2014-12-10 20:03:53 +08:00
|
|
|
# ifdef _AIX
|
|
|
|
#pragma alloca
|
|
|
|
# else
|
|
|
|
# ifndef alloca
|
2000-01-22 13:50:49 +08:00
|
|
|
char *alloca ();
|
2014-12-10 20:03:53 +08:00
|
|
|
# endif
|
2000-01-22 13:50:49 +08:00
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#ifndef errno
|
|
|
|
extern int errno;
|
|
|
|
#endif
|
|
|
|
#ifndef __set_errno
|
|
|
|
# define __set_errno(val) errno = (val)
|
|
|
|
#endif
|
|
|
|
|
Update.
2001-03-04 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (DCIGETTEXT): Increment path_max proportionally.
2001-10-31 Bruno Haible <bruno@clisp.org>
* intl/plural.y: Include <stddef.h>, needed for NULL with SunOS 4 cc.
2001-03-21 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (_nl_state_lock): Mark as #ifdef _LIBC. AIX 3 xlc
chokes on empty macro arguments.
* intl/plural.y: Add #pragma for alloca on AIX 3.
2001-11-27 Ulrich Drepper <drepper@redhat.com>
* intl/dcigettext.c (guess_category_value): Only implement for
glibc. Otherwise rely on function _nl_locale_name which isn't
present in the glibc sources.
2001-09-24 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (_nl_init_domain_conv): Also enable
transliteration when building on a glibc system but outside glibc.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-eval.c: New file, extracted from dcigettext.c.
* intl/dcigettext.c (plural_eval): Remove function, moved to
intl/plural-eval.c.
(plural_lookup): Call PLURAL_EVAL instead of plural_eval.
Include plural-eval.c.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.c (EXTRACT_PLURAL_EXPRESSION): Reject numbers that
don't start with a digit; nplurals must be positive.
2001-09-02 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.h: New file, extracted from gettextP.h.
* intl/plural-exp.c: New file, extracted from loadmsgcat.c.
* intl/gettextP.h (struct expression, struct parse_args,
__gettext_free_exp, __gettextparse): Move to plural-exp.h.
* intl/loadmsgcat.c: Include plural-exp.h.
(PLURAL_PARSE): Move macro to plural-exp.h.
(plvar, plone, germanic_plural, INIT_GERMANIC_PLURAL): Move to
plural-exp.c.
(_nl_load_domain): Move plural handling code to plural-exp.c. Call
EXTRACT_PLURAL_EXPRESSION.
(_nl_unload_domain): Update.
* intl/dcigettext.c: Include plural-exp.h.
* intl/plural.y: Include plural-exp.h, not gettextP.h.
(FREE_EXPRESSION): Move macro to plural-exp.h.
* intl/Makefile (routines): Add plural-exp.
(distribute): Add plural-exp.h.
2001-07-28 Bruno Haible <bruno@clisp.org>
* intl/l10nflist.c (_nl_normalize_codeset): Cast isalnum, isalpha,
isdigit, tolower argument to 'unsigned char'.
* intl/loadmsgcat.c (_nl_load_domain): Cast isspace argument to
'unsigned char'.
* intl/localealias.c (read_alias_file): Cast isspace argument to
'unsigned char'.
2001-10-20 Bruno Haible <bruno@clisp.org>
Assume strchr() exists. (Without it, intl/explodename.c wouldn't link
anyway.)
* intl/dcigettext.c (strchr): Remove fallback definition; it conflicts
with the variable 'index' in plural_lookup.
* intl/l10nflist.c (strchr): Likewise.
* intl/localealias.c (strchr): Likewise.
Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
* intl/bindtextdom.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dgettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/explodename.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/gettext.c: Likewise.
* intl/l10nflist.c: Likewise.
* intl/loadmsgcat.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/gettext.h: Assume <limits.h> exists.
2001-11-28 08:09:26 +08:00
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
#if defined HAVE_UNISTD_H || defined _LIBC
|
|
|
|
# include <unistd.h>
|
|
|
|
#endif
|
|
|
|
|
Update.
2001-03-04 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (DCIGETTEXT): Increment path_max proportionally.
2001-10-31 Bruno Haible <bruno@clisp.org>
* intl/plural.y: Include <stddef.h>, needed for NULL with SunOS 4 cc.
2001-03-21 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (_nl_state_lock): Mark as #ifdef _LIBC. AIX 3 xlc
chokes on empty macro arguments.
* intl/plural.y: Add #pragma for alloca on AIX 3.
2001-11-27 Ulrich Drepper <drepper@redhat.com>
* intl/dcigettext.c (guess_category_value): Only implement for
glibc. Otherwise rely on function _nl_locale_name which isn't
present in the glibc sources.
2001-09-24 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (_nl_init_domain_conv): Also enable
transliteration when building on a glibc system but outside glibc.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-eval.c: New file, extracted from dcigettext.c.
* intl/dcigettext.c (plural_eval): Remove function, moved to
intl/plural-eval.c.
(plural_lookup): Call PLURAL_EVAL instead of plural_eval.
Include plural-eval.c.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.c (EXTRACT_PLURAL_EXPRESSION): Reject numbers that
don't start with a digit; nplurals must be positive.
2001-09-02 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.h: New file, extracted from gettextP.h.
* intl/plural-exp.c: New file, extracted from loadmsgcat.c.
* intl/gettextP.h (struct expression, struct parse_args,
__gettext_free_exp, __gettextparse): Move to plural-exp.h.
* intl/loadmsgcat.c: Include plural-exp.h.
(PLURAL_PARSE): Move macro to plural-exp.h.
(plvar, plone, germanic_plural, INIT_GERMANIC_PLURAL): Move to
plural-exp.c.
(_nl_load_domain): Move plural handling code to plural-exp.c. Call
EXTRACT_PLURAL_EXPRESSION.
(_nl_unload_domain): Update.
* intl/dcigettext.c: Include plural-exp.h.
* intl/plural.y: Include plural-exp.h, not gettextP.h.
(FREE_EXPRESSION): Move macro to plural-exp.h.
* intl/Makefile (routines): Add plural-exp.
(distribute): Add plural-exp.h.
2001-07-28 Bruno Haible <bruno@clisp.org>
* intl/l10nflist.c (_nl_normalize_codeset): Cast isalnum, isalpha,
isdigit, tolower argument to 'unsigned char'.
* intl/loadmsgcat.c (_nl_load_domain): Cast isspace argument to
'unsigned char'.
* intl/localealias.c (read_alias_file): Cast isspace argument to
'unsigned char'.
2001-10-20 Bruno Haible <bruno@clisp.org>
Assume strchr() exists. (Without it, intl/explodename.c wouldn't link
anyway.)
* intl/dcigettext.c (strchr): Remove fallback definition; it conflicts
with the variable 'index' in plural_lookup.
* intl/l10nflist.c (strchr): Likewise.
* intl/localealias.c (strchr): Likewise.
Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
* intl/bindtextdom.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dgettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/explodename.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/gettext.c: Likewise.
* intl/l10nflist.c: Likewise.
* intl/loadmsgcat.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/gettext.h: Assume <limits.h> exists.
2001-11-28 08:09:26 +08:00
|
|
|
#include <locale.h>
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifdef _LIBC
|
|
|
|
/* Guess whether integer division by zero raises signal SIGFPE.
|
|
|
|
Set to 1 only if you know for sure. In case of doubt, set to 0. */
|
|
|
|
# if defined __alpha__ || defined __arm__ || defined __i386__ \
|
|
|
|
|| defined __m68k__ || defined __s390__
|
|
|
|
# define INTDIV0_RAISES_SIGFPE 1
|
|
|
|
# else
|
|
|
|
# define INTDIV0_RAISES_SIGFPE 0
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
#if !INTDIV0_RAISES_SIGFPE
|
|
|
|
# include <signal.h>
|
|
|
|
#endif
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
#if defined HAVE_SYS_PARAM_H || defined _LIBC
|
|
|
|
# include <sys/param.h>
|
|
|
|
#endif
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
#if !defined _LIBC
|
|
|
|
# include "localcharset.h"
|
|
|
|
#endif
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
#include "gettextP.h"
|
Update.
2001-03-04 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (DCIGETTEXT): Increment path_max proportionally.
2001-10-31 Bruno Haible <bruno@clisp.org>
* intl/plural.y: Include <stddef.h>, needed for NULL with SunOS 4 cc.
2001-03-21 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (_nl_state_lock): Mark as #ifdef _LIBC. AIX 3 xlc
chokes on empty macro arguments.
* intl/plural.y: Add #pragma for alloca on AIX 3.
2001-11-27 Ulrich Drepper <drepper@redhat.com>
* intl/dcigettext.c (guess_category_value): Only implement for
glibc. Otherwise rely on function _nl_locale_name which isn't
present in the glibc sources.
2001-09-24 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (_nl_init_domain_conv): Also enable
transliteration when building on a glibc system but outside glibc.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-eval.c: New file, extracted from dcigettext.c.
* intl/dcigettext.c (plural_eval): Remove function, moved to
intl/plural-eval.c.
(plural_lookup): Call PLURAL_EVAL instead of plural_eval.
Include plural-eval.c.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.c (EXTRACT_PLURAL_EXPRESSION): Reject numbers that
don't start with a digit; nplurals must be positive.
2001-09-02 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.h: New file, extracted from gettextP.h.
* intl/plural-exp.c: New file, extracted from loadmsgcat.c.
* intl/gettextP.h (struct expression, struct parse_args,
__gettext_free_exp, __gettextparse): Move to plural-exp.h.
* intl/loadmsgcat.c: Include plural-exp.h.
(PLURAL_PARSE): Move macro to plural-exp.h.
(plvar, plone, germanic_plural, INIT_GERMANIC_PLURAL): Move to
plural-exp.c.
(_nl_load_domain): Move plural handling code to plural-exp.c. Call
EXTRACT_PLURAL_EXPRESSION.
(_nl_unload_domain): Update.
* intl/dcigettext.c: Include plural-exp.h.
* intl/plural.y: Include plural-exp.h, not gettextP.h.
(FREE_EXPRESSION): Move macro to plural-exp.h.
* intl/Makefile (routines): Add plural-exp.
(distribute): Add plural-exp.h.
2001-07-28 Bruno Haible <bruno@clisp.org>
* intl/l10nflist.c (_nl_normalize_codeset): Cast isalnum, isalpha,
isdigit, tolower argument to 'unsigned char'.
* intl/loadmsgcat.c (_nl_load_domain): Cast isspace argument to
'unsigned char'.
* intl/localealias.c (read_alias_file): Cast isspace argument to
'unsigned char'.
2001-10-20 Bruno Haible <bruno@clisp.org>
Assume strchr() exists. (Without it, intl/explodename.c wouldn't link
anyway.)
* intl/dcigettext.c (strchr): Remove fallback definition; it conflicts
with the variable 'index' in plural_lookup.
* intl/l10nflist.c (strchr): Likewise.
* intl/localealias.c (strchr): Likewise.
Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
* intl/bindtextdom.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dgettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/explodename.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/gettext.c: Likewise.
* intl/l10nflist.c: Likewise.
* intl/loadmsgcat.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/gettext.h: Assume <limits.h> exists.
2001-11-28 08:09:26 +08:00
|
|
|
#include "plural-exp.h"
|
2000-01-22 13:50:49 +08:00
|
|
|
#ifdef _LIBC
|
|
|
|
# include <libintl.h>
|
|
|
|
#else
|
2014-12-10 20:03:53 +08:00
|
|
|
# ifdef IN_LIBGLOCALE
|
|
|
|
# include <libintl.h>
|
|
|
|
# endif
|
Update.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain) [!_LIBC]: Use fstat, not fstat64.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (struct expression): Add operators lnot, less_than,
greater_than, less_or_equal, greater_or_equal. Replace args2/args3
union by a 'nargs' counter and an 'args[]' array.
* intl/plural.y: Don't include stdarg.h.
(new_exp): Take an array of arguments instead of varargs.
(new_exp_0, new_exp_1, new_exp_2, new_exp_3): New functions.
('?' ':'): Make right-associative.
(EQUOP2): New token, replaces '=' and '!'.
(CMPOP2): New token.
(ADDOP2): New token, replaces '+' and '-'.
(MULOP2): New token, replaces '*', '/' and '%'.
('!'): New token.
(exp): Add rules for CMPOP2 and '!'. Don't call YYABORT.
(start): Call YYABORT here.
(FREE_EXPRESSION): Update.
(yylex): Don't skip "\\n". Recognize comparison and '!' operators.
Update for new token symbols.
* intl/loadmsgcat.c (plvar, plone, germanic_plural,
init_germanic_plural): Update.
* intl/dcigettext.c (_nl_find_msg): Optimize for space.
(plural_eval): Recognize comparison and '!' operators. Optimize for
space.
2001-03-10 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain): locale_charset() doesn't return
NULL any more.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c: Include headers needed for alloca().
(freea): New macro.
(_nl_load_domain): Add fallback code for platforms lacking alloca.
* intl/localealias.c: (ADD_BLOCK, FREE_BLOCK): Remove macros.
(freea): New macro.
(read_alias_file): Simplify fallback code for platforms lacking
alloca.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (__gettextdebug): Remove declaration.
(__gettext_free_exp, __gettextparse): Convert prototype to K&R C
syntax.
(gettext_free_exp__, gettextparse__): New non-libc declarations.
* intl/plural.y [!_LIBC]: Define gettextparse__, gettext_free_exp__,
not __gettextparse, __gettext_free_exp.
* intl/loadmsgcat.c [!_LIBC]: Use gettextparse__, not __gettextparse.
2001-02-24 Bruno Haible <haible@clisp.cons.org>
* intl/dcigettext.c: Update comment about HAVE_LOCALE_NULL.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain): Add fallback code for platforms
lacking strtoul, like SunOS4.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/l10nflist.c (_nl_normalize_codeset): Use tolower, not _tolower.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/bindtextdom.c (set_binding_values): Convert prototype to K&R C
syntax.
* intl/dcigettext.c (transcmp): Convert to K&R C syntax.
* intl/explodename.c (_nl_find_language): Convert to K&R C syntax.
* intl/plural.y (__gettext_free_exp, yylex, yyerror): Convert to K&R C
syntax.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (gettext__, dgettext__, dcgettext__, textdomain__,
bindtextdomain__, bind_textdomain_codeset__): New declarations, from
old libgettext.h.
* intl/bindtextdom.c: Include libgnuintl.h instead of libgettext.h.
* intl/dcgettext.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dcngettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/dgettext.c: Include libgnuintl.h instead of libgettext.h.
Include gettextP.h.
* intl/gettext.c: Likewise. Don't include locale.h.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (ZERO): New macro.
(struct binding): Always use ZERO.
* intl/bindtextdom.c (offsetof): Provide fallback for platforms that
lack it, like SunOS4.
(set_binding_values): Use offsetof, not sizeof.
* intl/dcigettext.c (offsetof): Provide fallback for platforms that
lack it, like SunOS4.
(ZERO): Remove macro.
(struct transmem_list): Use ZERO.
(DCIGETTEXT): Use offsetof, not sizeof.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h: Include <stddef.h>. Include gettext.h, for
nls_uint32.
* intl/bindtextdom.c: Don't include gettext.h.
* intl/dcgettext.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dcngettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/plural.y: Likewise.
* intl/textdomain.c: Likewise.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettext.h: Don't include <stdio.h>.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/Makefile (CPPFLAGS): Set LOCALEDIR instead of GNULOCALEDIR.
* intl/dcigettext.c (_nl_default_dirname): Initialize with LOCALEDIR.
2001-03-20 09:00:20 +08:00
|
|
|
# include "libgnuintl.h"
|
2000-01-22 13:50:49 +08:00
|
|
|
#endif
|
|
|
|
#include "hash-string.h"
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* Handle multi-threaded applications. */
|
2000-01-22 13:50:49 +08:00
|
|
|
#ifdef _LIBC
|
2015-09-09 05:11:03 +08:00
|
|
|
# include <libc-lock.h>
|
2014-12-10 20:03:53 +08:00
|
|
|
# define gl_rwlock_define_initialized __libc_rwlock_define_initialized
|
|
|
|
# define gl_rwlock_rdlock __libc_rwlock_rdlock
|
|
|
|
# define gl_rwlock_wrlock __libc_rwlock_wrlock
|
|
|
|
# define gl_rwlock_unlock __libc_rwlock_unlock
|
Update.
2000-02-27 Ulrich Drepper <drepper@redhat.com>
* conform/conformtest.pl (@headers): Add wordexp.h, wctype.h, wchar.h,
varargs.h, utmpx.h, utime.h, unistd.h, ulimit.h, ucontext.h, time.h,
termios.h, tar.h, sys/wait.h, sys/uio.h, sys/types.h, sys/times.h,
sys/timeb.h, sys/time.h, sys/statvfs.h, sys/stat.h, sys/shm.h,
sys/sem.h, and sys/resource.h.
Implement handling of allow-header.
* conform/data/fcntl.h-data: Correct various bugs.
* conform/data/fnmatch.h-data: Likewise.
* conform/data/math.h-data: Likewise.
* conform/data/ndbm.h-data: Likewise.
* conform/data/nl_types.h-data: Likewise.
* conform/data/poll.h-data: Likewise.
* conform/data/pthread.h-data: Likewise.
* conform/data/semaphore.h-data: Likewise.
* conform/data/setjmp.h-data: Likewise.
* conform/data/signal.h-data: Likewise.
* conform/data/stdarg.h-data: Likewise.
* conform/data/stddef.h-data: Likewise.
* conform/data/stdio.h-data: Likewise.
* conform/data/stdlib.h-data: Likewise.
* conform/data/string.h-data: Likewise.
* conform/data/strings.h-data: Likewise.
* conform/data/stropts.h-data: Likewise.
* conform/data/syslog.h-data: Likewise.
* conform/data/sys/ipc.h-data: Likewise.
* conform/data/sys/mman.h-data: Likewise.
* conform/data/sys/msg.h-data: Likewise.
* conform/data/tar.h-data: New file.
* conform/data/termios.h-data: New file.
* conform/data/time.h-data: New file.
* conform/data/ucontext.h-data: New file.
* conform/data/ulimit.h-data: New file.
* conform/data/unistd.h-data: New file.
* conform/data/utime.h-data: New file.
* conform/data/utmpx.h-data: New file.
* conform/data/varargs.h-data: New file.
* conform/data/wchar.h-data: New file.
* conform/data/wctype.h-data: New file.
* conform/data/wordexp.h-data: New file.
* conform/data/sys/resource.h-data: New file.
* conform/data/sys/sem.h-data: New file.
* conform/data/sys/shm.h-data: New file.
* conform/data/sys/stat.h-data: New file.
* conform/data/sys/statvfs.h-data: New file.
* conform/data/sys/time.h-data: New file.
* conform/data/sys/timeb.h-data: New file.
* conform/data/sys/times.h-data: New file.
* conform/data/sys/types.h-data: New file.
* conform/data/sys/uio.h-data: New file.
* conform/data/sys/wait.h-data: New file.
* grp/grp.h (getgrent_r): Declare only if __USE_GNU.
* include/sys/time.h (__itimes): Fix type of second parameter.
* io/sys/stat.h (S_IFLNK): Define also if __USE_XOPEN.
(S_ISVTX): Likewise.
* io/sys/statvfs.h: Define fsblkcnt_t and fsfilcnt_t.
* locale/langindo.h: Make ERA_YEAR, INT_CURR_SYMBOL, CURRENCY_SYMBOL,
MON_DECIMAL_POINT, MON_THOUSANDS_SEP, MON_GROUPING, POSITIVE_SIGN,
NEGATIVE_SIGN, INT_FRAC_DIGITS, FRAC_DIGITS, P_CS_PRECEDES,
P_SEP_BY_SPACE, N_CS_PRECEDES, N_SEP_BY_SPACE, P_SIGN_POSN,
N_SIGN_POSN, DECIMAL_POINT, THOUSANDS_SEP, GROUPING, YESEXPR,
NOEXPR, YESSTR, and NOSTR only available if __USE_GNU.
* math/bits/mathcalls.h: Don't declare tgamma and scalbn if only
__USE_XOPEN.
* posix/unistd.h: Don't define ptrdiff_t.
(sbrk): Correct type of parameter.
* sysdeps/generic/sbrk.c: Likewise.
* sysdeps/mach/hurd/sbrk.c: Likewise.
* posix/sys/types.h: Allow id_t, suseconds_t, fsblkcnt_t, and
fsfilcnt_t being defined elsewhere.
* resource/sys/resource.h: Define id_t.
If __USE_XOPEN use int for type of first parameter if getrlimit,
getrlimit64, setrlimit, setrlimit64, getrusage, getpriority, and
setpriority.
* sysdeps/generic/getpriority.c: Fix type of second parameter.
* sysdeps/generic/setpriority.c: Likewise.
* sysdeps/mach/hurd/getpriority.c: Likewise.
* sysdeps/mach/hurd/setpriority.c: Likewise.
* sysdeps/unix/sysv/irix4/getpriority.c: Likewise.
* sysdeps/unix/sysv/irix4/setpriority.c: Likewise.
* sysdeps/unix/sysv/linux/getpriority.c: Likewise.
* sysdeps/generic/utimes.c: Fix parameter of third parameter.
* sysdeps/mach/hurd/utimes.c: Likewise.
* sysdeps/posix/utimes.c: Likewise.
* sysdeps/generic/bits/shm.h: Define shmatt_t type and use it in
struct shmid_ds definition.
* sysdeps/gnu/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
* sysvipc/sys/shm.h: Define time_t.
* sysvipc/sys/sem.h (struct sembuf): Make sem_num field unsigned.
* sysdeps/gnu/bits/sem.h: Rename anonymous type struct sem_queue and
struct sem_undo to struct __sem_queue and struct __sem_undo resp.
* time/time.h: Define suseconds_t if not already done.
* sysdeps/unix/sysv/linux/bits/statvfs.h: Rename f_spare to __f_spare.
* sysdeps/unix/sysv/linux/fstatvfs64.c: Likewise.
* sysdeps/unix/sysv/linux/statvfs64.c: Likewise.
* sysdeps/unix/sysv/linux/internal_statvfs.c: Likewise.
* intl/bindtextdom.c: Use rwlock to avoid surprising results in
multithreaded applications.
* intl/dcigettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/*.c: Update copyright.
* sysdeps/generic/bits/libc-lock.h: Define __libc_rwlock_* stubs.
2000-02-27 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/configure.in: Treat also "/usr/" as
prefix especially.
2000-02-27 Ulrich Drepper <drepper@redhat.com>
* po/de.po: Update from translation team.
* po/ko.po: Likewise.
2000-02-28 13:08:01 +08:00
|
|
|
#else
|
2014-12-10 20:03:53 +08:00
|
|
|
# include "lock.h"
|
2000-01-22 13:50:49 +08:00
|
|
|
#endif
|
|
|
|
|
2000-05-08 05:23:56 +08:00
|
|
|
/* Alignment of types. */
|
|
|
|
#if defined __GNUC__ && __GNUC__ >= 2
|
|
|
|
# define alignof(TYPE) __alignof__ (TYPE)
|
|
|
|
#else
|
|
|
|
# define alignof(TYPE) \
|
|
|
|
((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
|
|
|
|
#endif
|
|
|
|
|
Update.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain) [!_LIBC]: Use fstat, not fstat64.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (struct expression): Add operators lnot, less_than,
greater_than, less_or_equal, greater_or_equal. Replace args2/args3
union by a 'nargs' counter and an 'args[]' array.
* intl/plural.y: Don't include stdarg.h.
(new_exp): Take an array of arguments instead of varargs.
(new_exp_0, new_exp_1, new_exp_2, new_exp_3): New functions.
('?' ':'): Make right-associative.
(EQUOP2): New token, replaces '=' and '!'.
(CMPOP2): New token.
(ADDOP2): New token, replaces '+' and '-'.
(MULOP2): New token, replaces '*', '/' and '%'.
('!'): New token.
(exp): Add rules for CMPOP2 and '!'. Don't call YYABORT.
(start): Call YYABORT here.
(FREE_EXPRESSION): Update.
(yylex): Don't skip "\\n". Recognize comparison and '!' operators.
Update for new token symbols.
* intl/loadmsgcat.c (plvar, plone, germanic_plural,
init_germanic_plural): Update.
* intl/dcigettext.c (_nl_find_msg): Optimize for space.
(plural_eval): Recognize comparison and '!' operators. Optimize for
space.
2001-03-10 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain): locale_charset() doesn't return
NULL any more.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c: Include headers needed for alloca().
(freea): New macro.
(_nl_load_domain): Add fallback code for platforms lacking alloca.
* intl/localealias.c: (ADD_BLOCK, FREE_BLOCK): Remove macros.
(freea): New macro.
(read_alias_file): Simplify fallback code for platforms lacking
alloca.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (__gettextdebug): Remove declaration.
(__gettext_free_exp, __gettextparse): Convert prototype to K&R C
syntax.
(gettext_free_exp__, gettextparse__): New non-libc declarations.
* intl/plural.y [!_LIBC]: Define gettextparse__, gettext_free_exp__,
not __gettextparse, __gettext_free_exp.
* intl/loadmsgcat.c [!_LIBC]: Use gettextparse__, not __gettextparse.
2001-02-24 Bruno Haible <haible@clisp.cons.org>
* intl/dcigettext.c: Update comment about HAVE_LOCALE_NULL.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain): Add fallback code for platforms
lacking strtoul, like SunOS4.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/l10nflist.c (_nl_normalize_codeset): Use tolower, not _tolower.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/bindtextdom.c (set_binding_values): Convert prototype to K&R C
syntax.
* intl/dcigettext.c (transcmp): Convert to K&R C syntax.
* intl/explodename.c (_nl_find_language): Convert to K&R C syntax.
* intl/plural.y (__gettext_free_exp, yylex, yyerror): Convert to K&R C
syntax.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (gettext__, dgettext__, dcgettext__, textdomain__,
bindtextdomain__, bind_textdomain_codeset__): New declarations, from
old libgettext.h.
* intl/bindtextdom.c: Include libgnuintl.h instead of libgettext.h.
* intl/dcgettext.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dcngettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/dgettext.c: Include libgnuintl.h instead of libgettext.h.
Include gettextP.h.
* intl/gettext.c: Likewise. Don't include locale.h.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (ZERO): New macro.
(struct binding): Always use ZERO.
* intl/bindtextdom.c (offsetof): Provide fallback for platforms that
lack it, like SunOS4.
(set_binding_values): Use offsetof, not sizeof.
* intl/dcigettext.c (offsetof): Provide fallback for platforms that
lack it, like SunOS4.
(ZERO): Remove macro.
(struct transmem_list): Use ZERO.
(DCIGETTEXT): Use offsetof, not sizeof.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h: Include <stddef.h>. Include gettext.h, for
nls_uint32.
* intl/bindtextdom.c: Don't include gettext.h.
* intl/dcgettext.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dcngettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/plural.y: Likewise.
* intl/textdomain.c: Likewise.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettext.h: Don't include <stdio.h>.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/Makefile (CPPFLAGS): Set LOCALEDIR instead of GNULOCALEDIR.
* intl/dcigettext.c (_nl_default_dirname): Initialize with LOCALEDIR.
2001-03-20 09:00:20 +08:00
|
|
|
/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
|
|
|
|
#ifndef offsetof
|
|
|
|
# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
|
|
|
|
#endif
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
/* @@ end of prolog @@ */
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
/* Rename the non ANSI C functions. This is required by the standard
|
|
|
|
because some ANSI C functions will require linking with this object
|
|
|
|
file and the name space must not be polluted. */
|
|
|
|
# define getcwd __getcwd
|
|
|
|
# ifndef stpcpy
|
|
|
|
# define stpcpy __stpcpy
|
|
|
|
# endif
|
2000-08-21 12:18:25 +08:00
|
|
|
# define tfind __tfind
|
2000-01-22 13:50:49 +08:00
|
|
|
#else
|
|
|
|
# if !defined HAVE_GETCWD
|
|
|
|
char *getwd ();
|
|
|
|
# define getcwd(buf, max) getwd (buf)
|
|
|
|
# else
|
2014-12-10 20:03:53 +08:00
|
|
|
# if VMS
|
|
|
|
# define getcwd(buf, max) (getcwd) (buf, max, 0)
|
|
|
|
# else
|
2000-01-22 13:50:49 +08:00
|
|
|
char *getcwd ();
|
2014-12-10 20:03:53 +08:00
|
|
|
# endif
|
2000-01-22 13:50:49 +08:00
|
|
|
# endif
|
|
|
|
# ifndef HAVE_STPCPY
|
2014-12-10 20:03:53 +08:00
|
|
|
static char *stpcpy (char *dest, const char *src);
|
2000-01-22 13:50:49 +08:00
|
|
|
# endif
|
|
|
|
# ifndef HAVE_MEMPCPY
|
2014-12-10 20:03:53 +08:00
|
|
|
static void *mempcpy (void *dest, const void *src, size_t n);
|
2000-01-22 13:50:49 +08:00
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* Use a replacement if the system does not provide the `tsearch' function
|
|
|
|
family. */
|
|
|
|
#if defined HAVE_TSEARCH || defined _LIBC
|
|
|
|
# include <search.h>
|
|
|
|
#else
|
|
|
|
# define tsearch libintl_tsearch
|
|
|
|
# define tfind libintl_tfind
|
|
|
|
# define tdelete libintl_tdelete
|
|
|
|
# define twalk libintl_twalk
|
|
|
|
# include "tsearch.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
# define tsearch __tsearch
|
|
|
|
#endif
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
/* Amount to increase buffer size by in each try. */
|
|
|
|
#define PATH_INCR 32
|
|
|
|
|
|
|
|
/* The following is from pathmax.h. */
|
|
|
|
/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
|
|
|
|
PATH_MAX but might cause redefinition warnings when sys/param.h is
|
|
|
|
later included (as on MORE/BSD 4.3). */
|
|
|
|
#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
|
|
|
|
# include <limits.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef _POSIX_PATH_MAX
|
|
|
|
# define _POSIX_PATH_MAX 255
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !defined PATH_MAX && defined _PC_PATH_MAX
|
2016-09-19 05:45:12 +08:00
|
|
|
# define PATH_MAX (__pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : __pathconf ("/", _PC_PATH_MAX))
|
2000-01-22 13:50:49 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Don't include sys/param.h if it already has been. */
|
|
|
|
#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
|
|
|
|
# include <sys/param.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !defined PATH_MAX && defined MAXPATHLEN
|
|
|
|
# define PATH_MAX MAXPATHLEN
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef PATH_MAX
|
|
|
|
# define PATH_MAX _POSIX_PATH_MAX
|
|
|
|
#endif
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* Pathname support.
|
|
|
|
ISSLASH(C) tests whether C is a directory separator character.
|
|
|
|
IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
|
|
|
|
it may be concatenated to a directory pathname.
|
|
|
|
IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
|
|
|
|
*/
|
|
|
|
#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
|
|
|
|
/* Win32, Cygwin, OS/2, DOS */
|
|
|
|
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
|
|
|
|
# define HAS_DEVICE(P) \
|
|
|
|
((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
|
|
|
|
&& (P)[1] == ':')
|
|
|
|
# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
|
|
|
|
# define IS_PATH_WITH_DIR(P) \
|
|
|
|
(strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
|
|
|
|
#else
|
|
|
|
/* Unix */
|
|
|
|
# define ISSLASH(C) ((C) == '/')
|
|
|
|
# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
|
|
|
|
# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
|
|
|
|
#endif
|
|
|
|
|
2005-04-29 02:21:03 +08:00
|
|
|
/* Whether to support different locales in different threads. */
|
2014-12-10 20:03:53 +08:00
|
|
|
#if defined _LIBC || HAVE_USELOCALE || defined IN_LIBGLOCALE
|
2005-04-29 02:21:03 +08:00
|
|
|
# define HAVE_PER_THREAD_LOCALE
|
|
|
|
#endif
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
/* This is the type used for the search tree where known translations
|
|
|
|
are stored. */
|
|
|
|
struct known_translation_t
|
|
|
|
{
|
|
|
|
/* Domain in which to search. */
|
2005-03-30 07:41:03 +08:00
|
|
|
const char *domainname;
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
/* The category. */
|
|
|
|
int category;
|
|
|
|
|
2005-04-29 02:21:03 +08:00
|
|
|
#ifdef HAVE_PER_THREAD_LOCALE
|
|
|
|
/* Name of the relevant locale category, or "" for the global locale. */
|
|
|
|
const char *localename;
|
|
|
|
#endif
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifdef IN_LIBGLOCALE
|
|
|
|
/* The character encoding. */
|
|
|
|
const char *encoding;
|
|
|
|
#endif
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
/* State of the catalog counter at the point the string was found. */
|
|
|
|
int counter;
|
|
|
|
|
2001-01-05 14:43:17 +08:00
|
|
|
/* Catalog where the string was found. */
|
|
|
|
struct loaded_l10nfile *domain;
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
/* And finally the translation. */
|
|
|
|
const char *translation;
|
2001-01-05 14:43:17 +08:00
|
|
|
size_t translation_length;
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
/* Pointer to the string in question. */
|
2007-11-17 15:37:30 +08:00
|
|
|
union
|
|
|
|
{
|
|
|
|
char appended[ZERO]; /* used if domain != NULL */
|
|
|
|
const char *ptr; /* used if domain == NULL */
|
|
|
|
}
|
|
|
|
msgid;
|
2000-01-22 13:50:49 +08:00
|
|
|
};
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_define_initialized (static, tree_lock)
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* Root of the search tree with known translations. */
|
2000-01-22 13:50:49 +08:00
|
|
|
static void *root;
|
|
|
|
|
|
|
|
/* Function to compare two entries in the table of known translations. */
|
|
|
|
static int
|
2014-12-10 20:03:53 +08:00
|
|
|
transcmp (const void *p1, const void *p2)
|
2000-01-22 13:50:49 +08:00
|
|
|
{
|
2000-11-20 18:08:52 +08:00
|
|
|
const struct known_translation_t *s1;
|
|
|
|
const struct known_translation_t *s2;
|
2000-01-22 13:50:49 +08:00
|
|
|
int result;
|
|
|
|
|
2000-11-20 18:08:52 +08:00
|
|
|
s1 = (const struct known_translation_t *) p1;
|
|
|
|
s2 = (const struct known_translation_t *) p2;
|
|
|
|
|
2007-11-17 15:37:30 +08:00
|
|
|
result = strcmp (s1->domain != NULL ? s1->msgid.appended : s1->msgid.ptr,
|
|
|
|
s2->domain != NULL ? s2->msgid.appended : s2->msgid.ptr);
|
2000-01-22 13:50:49 +08:00
|
|
|
if (result == 0)
|
|
|
|
{
|
2001-01-05 14:43:17 +08:00
|
|
|
result = strcmp (s1->domainname, s2->domainname);
|
2000-01-22 13:50:49 +08:00
|
|
|
if (result == 0)
|
2005-04-29 02:21:03 +08:00
|
|
|
{
|
|
|
|
#ifdef HAVE_PER_THREAD_LOCALE
|
|
|
|
result = strcmp (s1->localename, s2->localename);
|
|
|
|
if (result == 0)
|
|
|
|
#endif
|
2014-12-10 20:03:53 +08:00
|
|
|
{
|
|
|
|
#ifdef IN_LIBGLOCALE
|
|
|
|
result = strcmp (s1->encoding, s2->encoding);
|
|
|
|
if (result == 0)
|
|
|
|
#endif
|
|
|
|
/* We compare the category last (though this is the cheapest
|
|
|
|
operation) since it is hopefully always the same (namely
|
|
|
|
LC_MESSAGES). */
|
|
|
|
result = s1->category - s2->category;
|
|
|
|
}
|
2005-04-29 02:21:03 +08:00
|
|
|
}
|
2000-01-22 13:50:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Name of the default domain used for gettext(3) prior any call to
|
|
|
|
textdomain(3). The default value for this is "messages". */
|
2002-03-12 18:25:36 +08:00
|
|
|
const char _nl_default_default_domain[] attribute_hidden = "messages";
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifndef IN_LIBGLOCALE
|
2000-01-22 13:50:49 +08:00
|
|
|
/* Value used as the default domain for gettext(3). */
|
2002-03-12 18:25:36 +08:00
|
|
|
const char *_nl_current_default_domain attribute_hidden
|
|
|
|
= _nl_default_default_domain;
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
/* Contains the default location of the message catalogs. */
|
2014-12-10 20:03:53 +08:00
|
|
|
#if defined __EMX__
|
|
|
|
extern const char _nl_default_dirname[];
|
|
|
|
#else
|
|
|
|
# ifdef _LIBC
|
[BZ #284, BZ #721]
* intl/dcigettext.c (_nl_find_msg): Add a cast.
* nis/nis_clone_dir.c (nis_clone_directory): Use char * for ADDR.
* nis/nis_clone_obj.c (nis_clone_object): Likewise.
* nis/nis_clone_res.c (nis_clone_result): Likewise.
* resolv/nss_dns/dns-network.c (getanswer_r): Use const unsigned char *
for END_OF_MESSAGE and CP.
* resolv/res_send.c (send_dg): Add else branch for case impossible
unless `poll' is buggy.
* crypt/crypt_util.c (__setkey_r): Add a cast.
* locale/programs/linereader.c (get_toplvl_escape): Use size_t for
NBYTES, and unsigned char * for BYTES.
* locale/programs/charmap.c (charmap_new_char): Use size_t and
unsighed char * for NBYTES, BYTES parameters.
* sysdeps/generic/dl-hash.h (_dl_elf_hash): Take const char * argument
and cast it.
* sysdeps/i386/i686/dl-hash.h (_dl_elf_hash): Likewise.
* sunrpc/create_xid.c (_create_xid): Don't use unsigned long for RES.
* sunrpc/svcauth_des.c (_svcauth_des): Fix cast type.
* sunrpc/auth_des.c (authdes_create): Don't use u_char for PKEY_DATA.
(authdes_marshal): Don't use unsigned int for LEN.
* sunrpc/xdr.c (xdr_hyper): Don't use unsigned long for T2.
(xdr_u_hyper): Likewise.
(xdr_u_short): Don't use u_long for L.
* sunrpc/xdr_intXX_t.c (xdr_int64_t): Don't use uint32_t for T2.
* inet/rexec.c (rexec_af): Use socklen_t.
* sunrpc/key_call.c (getkeyserv_handle): Likewise.
* sunrpc/rtime.c (rtime): Likewise.
* resolv/res_send.c (send_vc, send_dg): Likewise.
* nis/nis_callback.c (__nis_create_callback): Likewise.
* sysdeps/generic/libc-start.c: Use unsigned int for nthreads ptr.
* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local.
* libio/libio.h (_IO_BE): Add parenthesis around EXPR.
* intl/dcigettext.c (INTVARDEF, INTUSE): Macros removed.
(_nl_default_dirname): Use libc_hidden_data_def instead of INTVARDEF.
(libc_freeres_fn, DCIGETTEXT): Don't use INTUSE.
* intl/bindtextdom.c (INTUSE): Macro removed.
(_nl_default_dirname): Use libc_hidden_proto.
(set_binding_values): Don't use INTUSE.
* include/libintl.h (_libc_intl_domainname_internal): Decl removed.
(_libc_intl_domainname): Use libc_hidden_proto.
* posix/regex_internal.h (gettext): Remove INTUSE on it.
* locale/SYS_libc.c (_libc_intl_domainname): Use libc_hidden_data_def
rather than INTDEF.
* include/libintl.h (_): Don't use *_internal name.
* ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Use int32_t,
not uint32_t.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise for assignments.
* iconv/gconv_open.c (__gconv_open): Remove useless cast.
[BZ #721]
* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
of [RESOLVE_MAP].
* sysdeps/sh/dl-machine.h (ELF_MACHINE_NO_REL): Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
2005-02-03 Alexandre Oliva <aoliva@redhat.com>
[BZ #721]
* elf/dynamic-link.h: Don't declare nested auto functions that are
not going to be defined.
2004-07-23 Jakub Jelinek <jakub@redhat.com>
[BZ #284]
* include/features.h (_POSIX_SOURCE, _POSIX_C_SOURCE): Define
if _XOPEN_SOURCE >= 500 even if __STRICT_ANSI__ is defined.
2005-02-16 Roland McGrath <roland@redhat.com>
2005-02-17 09:19:55 +08:00
|
|
|
extern const char _nl_default_dirname[];
|
|
|
|
libc_hidden_proto (_nl_default_dirname)
|
2014-12-10 20:03:53 +08:00
|
|
|
# endif
|
Update.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain) [!_LIBC]: Use fstat, not fstat64.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (struct expression): Add operators lnot, less_than,
greater_than, less_or_equal, greater_or_equal. Replace args2/args3
union by a 'nargs' counter and an 'args[]' array.
* intl/plural.y: Don't include stdarg.h.
(new_exp): Take an array of arguments instead of varargs.
(new_exp_0, new_exp_1, new_exp_2, new_exp_3): New functions.
('?' ':'): Make right-associative.
(EQUOP2): New token, replaces '=' and '!'.
(CMPOP2): New token.
(ADDOP2): New token, replaces '+' and '-'.
(MULOP2): New token, replaces '*', '/' and '%'.
('!'): New token.
(exp): Add rules for CMPOP2 and '!'. Don't call YYABORT.
(start): Call YYABORT here.
(FREE_EXPRESSION): Update.
(yylex): Don't skip "\\n". Recognize comparison and '!' operators.
Update for new token symbols.
* intl/loadmsgcat.c (plvar, plone, germanic_plural,
init_germanic_plural): Update.
* intl/dcigettext.c (_nl_find_msg): Optimize for space.
(plural_eval): Recognize comparison and '!' operators. Optimize for
space.
2001-03-10 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain): locale_charset() doesn't return
NULL any more.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c: Include headers needed for alloca().
(freea): New macro.
(_nl_load_domain): Add fallback code for platforms lacking alloca.
* intl/localealias.c: (ADD_BLOCK, FREE_BLOCK): Remove macros.
(freea): New macro.
(read_alias_file): Simplify fallback code for platforms lacking
alloca.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (__gettextdebug): Remove declaration.
(__gettext_free_exp, __gettextparse): Convert prototype to K&R C
syntax.
(gettext_free_exp__, gettextparse__): New non-libc declarations.
* intl/plural.y [!_LIBC]: Define gettextparse__, gettext_free_exp__,
not __gettextparse, __gettext_free_exp.
* intl/loadmsgcat.c [!_LIBC]: Use gettextparse__, not __gettextparse.
2001-02-24 Bruno Haible <haible@clisp.cons.org>
* intl/dcigettext.c: Update comment about HAVE_LOCALE_NULL.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain): Add fallback code for platforms
lacking strtoul, like SunOS4.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/l10nflist.c (_nl_normalize_codeset): Use tolower, not _tolower.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/bindtextdom.c (set_binding_values): Convert prototype to K&R C
syntax.
* intl/dcigettext.c (transcmp): Convert to K&R C syntax.
* intl/explodename.c (_nl_find_language): Convert to K&R C syntax.
* intl/plural.y (__gettext_free_exp, yylex, yyerror): Convert to K&R C
syntax.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (gettext__, dgettext__, dcgettext__, textdomain__,
bindtextdomain__, bind_textdomain_codeset__): New declarations, from
old libgettext.h.
* intl/bindtextdom.c: Include libgnuintl.h instead of libgettext.h.
* intl/dcgettext.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dcngettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/dgettext.c: Include libgnuintl.h instead of libgettext.h.
Include gettextP.h.
* intl/gettext.c: Likewise. Don't include locale.h.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (ZERO): New macro.
(struct binding): Always use ZERO.
* intl/bindtextdom.c (offsetof): Provide fallback for platforms that
lack it, like SunOS4.
(set_binding_values): Use offsetof, not sizeof.
* intl/dcigettext.c (offsetof): Provide fallback for platforms that
lack it, like SunOS4.
(ZERO): Remove macro.
(struct transmem_list): Use ZERO.
(DCIGETTEXT): Use offsetof, not sizeof.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h: Include <stddef.h>. Include gettext.h, for
nls_uint32.
* intl/bindtextdom.c: Don't include gettext.h.
* intl/dcgettext.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dcngettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/plural.y: Likewise.
* intl/textdomain.c: Likewise.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettext.h: Don't include <stdio.h>.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/Makefile (CPPFLAGS): Set LOCALEDIR instead of GNULOCALEDIR.
* intl/dcigettext.c (_nl_default_dirname): Initialize with LOCALEDIR.
2001-03-20 09:00:20 +08:00
|
|
|
const char _nl_default_dirname[] = LOCALEDIR;
|
2014-12-10 20:03:53 +08:00
|
|
|
# ifdef _LIBC
|
[BZ #284, BZ #721]
* intl/dcigettext.c (_nl_find_msg): Add a cast.
* nis/nis_clone_dir.c (nis_clone_directory): Use char * for ADDR.
* nis/nis_clone_obj.c (nis_clone_object): Likewise.
* nis/nis_clone_res.c (nis_clone_result): Likewise.
* resolv/nss_dns/dns-network.c (getanswer_r): Use const unsigned char *
for END_OF_MESSAGE and CP.
* resolv/res_send.c (send_dg): Add else branch for case impossible
unless `poll' is buggy.
* crypt/crypt_util.c (__setkey_r): Add a cast.
* locale/programs/linereader.c (get_toplvl_escape): Use size_t for
NBYTES, and unsigned char * for BYTES.
* locale/programs/charmap.c (charmap_new_char): Use size_t and
unsighed char * for NBYTES, BYTES parameters.
* sysdeps/generic/dl-hash.h (_dl_elf_hash): Take const char * argument
and cast it.
* sysdeps/i386/i686/dl-hash.h (_dl_elf_hash): Likewise.
* sunrpc/create_xid.c (_create_xid): Don't use unsigned long for RES.
* sunrpc/svcauth_des.c (_svcauth_des): Fix cast type.
* sunrpc/auth_des.c (authdes_create): Don't use u_char for PKEY_DATA.
(authdes_marshal): Don't use unsigned int for LEN.
* sunrpc/xdr.c (xdr_hyper): Don't use unsigned long for T2.
(xdr_u_hyper): Likewise.
(xdr_u_short): Don't use u_long for L.
* sunrpc/xdr_intXX_t.c (xdr_int64_t): Don't use uint32_t for T2.
* inet/rexec.c (rexec_af): Use socklen_t.
* sunrpc/key_call.c (getkeyserv_handle): Likewise.
* sunrpc/rtime.c (rtime): Likewise.
* resolv/res_send.c (send_vc, send_dg): Likewise.
* nis/nis_callback.c (__nis_create_callback): Likewise.
* sysdeps/generic/libc-start.c: Use unsigned int for nthreads ptr.
* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local.
* libio/libio.h (_IO_BE): Add parenthesis around EXPR.
* intl/dcigettext.c (INTVARDEF, INTUSE): Macros removed.
(_nl_default_dirname): Use libc_hidden_data_def instead of INTVARDEF.
(libc_freeres_fn, DCIGETTEXT): Don't use INTUSE.
* intl/bindtextdom.c (INTUSE): Macro removed.
(_nl_default_dirname): Use libc_hidden_proto.
(set_binding_values): Don't use INTUSE.
* include/libintl.h (_libc_intl_domainname_internal): Decl removed.
(_libc_intl_domainname): Use libc_hidden_proto.
* posix/regex_internal.h (gettext): Remove INTUSE on it.
* locale/SYS_libc.c (_libc_intl_domainname): Use libc_hidden_data_def
rather than INTDEF.
* include/libintl.h (_): Don't use *_internal name.
* ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Use int32_t,
not uint32_t.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise for assignments.
* iconv/gconv_open.c (__gconv_open): Remove useless cast.
[BZ #721]
* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
of [RESOLVE_MAP].
* sysdeps/sh/dl-machine.h (ELF_MACHINE_NO_REL): Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
2005-02-03 Alexandre Oliva <aoliva@redhat.com>
[BZ #721]
* elf/dynamic-link.h: Don't declare nested auto functions that are
not going to be defined.
2004-07-23 Jakub Jelinek <jakub@redhat.com>
[BZ #284]
* include/features.h (_POSIX_SOURCE, _POSIX_C_SOURCE): Define
if _XOPEN_SOURCE >= 500 even if __STRICT_ANSI__ is defined.
2005-02-16 Roland McGrath <roland@redhat.com>
2005-02-17 09:19:55 +08:00
|
|
|
libc_hidden_data_def (_nl_default_dirname)
|
2014-12-10 20:03:53 +08:00
|
|
|
# endif
|
[BZ #284, BZ #721]
* intl/dcigettext.c (_nl_find_msg): Add a cast.
* nis/nis_clone_dir.c (nis_clone_directory): Use char * for ADDR.
* nis/nis_clone_obj.c (nis_clone_object): Likewise.
* nis/nis_clone_res.c (nis_clone_result): Likewise.
* resolv/nss_dns/dns-network.c (getanswer_r): Use const unsigned char *
for END_OF_MESSAGE and CP.
* resolv/res_send.c (send_dg): Add else branch for case impossible
unless `poll' is buggy.
* crypt/crypt_util.c (__setkey_r): Add a cast.
* locale/programs/linereader.c (get_toplvl_escape): Use size_t for
NBYTES, and unsigned char * for BYTES.
* locale/programs/charmap.c (charmap_new_char): Use size_t and
unsighed char * for NBYTES, BYTES parameters.
* sysdeps/generic/dl-hash.h (_dl_elf_hash): Take const char * argument
and cast it.
* sysdeps/i386/i686/dl-hash.h (_dl_elf_hash): Likewise.
* sunrpc/create_xid.c (_create_xid): Don't use unsigned long for RES.
* sunrpc/svcauth_des.c (_svcauth_des): Fix cast type.
* sunrpc/auth_des.c (authdes_create): Don't use u_char for PKEY_DATA.
(authdes_marshal): Don't use unsigned int for LEN.
* sunrpc/xdr.c (xdr_hyper): Don't use unsigned long for T2.
(xdr_u_hyper): Likewise.
(xdr_u_short): Don't use u_long for L.
* sunrpc/xdr_intXX_t.c (xdr_int64_t): Don't use uint32_t for T2.
* inet/rexec.c (rexec_af): Use socklen_t.
* sunrpc/key_call.c (getkeyserv_handle): Likewise.
* sunrpc/rtime.c (rtime): Likewise.
* resolv/res_send.c (send_vc, send_dg): Likewise.
* nis/nis_callback.c (__nis_create_callback): Likewise.
* sysdeps/generic/libc-start.c: Use unsigned int for nthreads ptr.
* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local.
* libio/libio.h (_IO_BE): Add parenthesis around EXPR.
* intl/dcigettext.c (INTVARDEF, INTUSE): Macros removed.
(_nl_default_dirname): Use libc_hidden_data_def instead of INTVARDEF.
(libc_freeres_fn, DCIGETTEXT): Don't use INTUSE.
* intl/bindtextdom.c (INTUSE): Macro removed.
(_nl_default_dirname): Use libc_hidden_proto.
(set_binding_values): Don't use INTUSE.
* include/libintl.h (_libc_intl_domainname_internal): Decl removed.
(_libc_intl_domainname): Use libc_hidden_proto.
* posix/regex_internal.h (gettext): Remove INTUSE on it.
* locale/SYS_libc.c (_libc_intl_domainname): Use libc_hidden_data_def
rather than INTDEF.
* include/libintl.h (_): Don't use *_internal name.
* ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Use int32_t,
not uint32_t.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise for assignments.
* iconv/gconv_open.c (__gconv_open): Remove useless cast.
[BZ #721]
* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
of [RESOLVE_MAP].
* sysdeps/sh/dl-machine.h (ELF_MACHINE_NO_REL): Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
2005-02-03 Alexandre Oliva <aoliva@redhat.com>
[BZ #721]
* elf/dynamic-link.h: Don't declare nested auto functions that are
not going to be defined.
2004-07-23 Jakub Jelinek <jakub@redhat.com>
[BZ #284]
* include/features.h (_POSIX_SOURCE, _POSIX_C_SOURCE): Define
if _XOPEN_SOURCE >= 500 even if __STRICT_ANSI__ is defined.
2005-02-16 Roland McGrath <roland@redhat.com>
2005-02-17 09:19:55 +08:00
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifndef IN_LIBGLOCALE
|
2000-01-22 13:50:49 +08:00
|
|
|
/* List with bindings of specific domains created by bindtextdomain()
|
|
|
|
calls. */
|
|
|
|
struct binding *_nl_domain_bindings;
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
/* Prototypes for local functions. */
|
2014-12-10 20:03:53 +08:00
|
|
|
static char *plural_lookup (struct loaded_l10nfile *domain,
|
|
|
|
unsigned long int n,
|
|
|
|
const char *translation, size_t translation_len)
|
|
|
|
internal_function;
|
|
|
|
|
|
|
|
#ifdef IN_LIBGLOCALE
|
|
|
|
static const char *guess_category_value (int category,
|
|
|
|
const char *categoryname,
|
|
|
|
const char *localename)
|
2001-01-05 14:43:17 +08:00
|
|
|
internal_function;
|
2014-12-10 20:03:53 +08:00
|
|
|
#else
|
|
|
|
static const char *guess_category_value (int category,
|
|
|
|
const char *categoryname)
|
2000-01-22 13:50:49 +08:00
|
|
|
internal_function;
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
|
|
|
|
2002-08-31 03:36:12 +08:00
|
|
|
#ifdef _LIBC
|
|
|
|
# include "../locale/localeinfo.h"
|
2006-05-16 02:36:28 +08:00
|
|
|
# define category_to_name(category) \
|
|
|
|
_nl_category_names.str + _nl_category_name_idxs[category]
|
2002-08-31 03:36:12 +08:00
|
|
|
#else
|
2014-12-10 20:03:53 +08:00
|
|
|
static const char *category_to_name (int category) internal_function;
|
|
|
|
#endif
|
|
|
|
#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE
|
|
|
|
static const char *get_output_charset (struct binding *domainbinding)
|
|
|
|
internal_function;
|
2002-08-31 03:36:12 +08:00
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* For those losing systems which don't have `alloca' we have to add
|
2000-01-22 13:50:49 +08:00
|
|
|
some additional code emulating it. */
|
|
|
|
#ifdef HAVE_ALLOCA
|
|
|
|
/* Nothing has to be done. */
|
2002-12-12 06:59:29 +08:00
|
|
|
# define freea(p) /* nothing */
|
2000-01-22 13:50:49 +08:00
|
|
|
# define ADD_BLOCK(list, address) /* nothing */
|
|
|
|
# define FREE_BLOCKS(list) /* nothing */
|
|
|
|
#else
|
|
|
|
struct block_list
|
|
|
|
{
|
|
|
|
void *address;
|
|
|
|
struct block_list *next;
|
|
|
|
};
|
|
|
|
# define ADD_BLOCK(list, addr) \
|
|
|
|
do { \
|
|
|
|
struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
|
|
|
|
/* If we cannot get a free block we cannot add the new element to \
|
|
|
|
the list. */ \
|
|
|
|
if (newp != NULL) { \
|
|
|
|
newp->address = (addr); \
|
|
|
|
newp->next = (list); \
|
|
|
|
(list) = newp; \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
# define FREE_BLOCKS(list) \
|
|
|
|
do { \
|
|
|
|
while (list != NULL) { \
|
|
|
|
struct block_list *old = list; \
|
|
|
|
list = list->next; \
|
2002-12-12 06:59:29 +08:00
|
|
|
free (old->address); \
|
2000-01-22 13:50:49 +08:00
|
|
|
free (old); \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
# undef alloca
|
|
|
|
# define alloca(size) (malloc (size))
|
2002-12-12 06:59:29 +08:00
|
|
|
# define freea(p) free (p)
|
2000-01-22 13:50:49 +08:00
|
|
|
#endif /* have alloca */
|
|
|
|
|
|
|
|
|
2001-01-05 14:43:17 +08:00
|
|
|
#ifdef _LIBC
|
2000-07-01 08:04:28 +08:00
|
|
|
/* List of blocks allocated for translations. */
|
2001-01-05 14:43:17 +08:00
|
|
|
typedef struct transmem_list
|
2000-07-01 08:04:28 +08:00
|
|
|
{
|
|
|
|
struct transmem_list *next;
|
Update.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain) [!_LIBC]: Use fstat, not fstat64.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (struct expression): Add operators lnot, less_than,
greater_than, less_or_equal, greater_or_equal. Replace args2/args3
union by a 'nargs' counter and an 'args[]' array.
* intl/plural.y: Don't include stdarg.h.
(new_exp): Take an array of arguments instead of varargs.
(new_exp_0, new_exp_1, new_exp_2, new_exp_3): New functions.
('?' ':'): Make right-associative.
(EQUOP2): New token, replaces '=' and '!'.
(CMPOP2): New token.
(ADDOP2): New token, replaces '+' and '-'.
(MULOP2): New token, replaces '*', '/' and '%'.
('!'): New token.
(exp): Add rules for CMPOP2 and '!'. Don't call YYABORT.
(start): Call YYABORT here.
(FREE_EXPRESSION): Update.
(yylex): Don't skip "\\n". Recognize comparison and '!' operators.
Update for new token symbols.
* intl/loadmsgcat.c (plvar, plone, germanic_plural,
init_germanic_plural): Update.
* intl/dcigettext.c (_nl_find_msg): Optimize for space.
(plural_eval): Recognize comparison and '!' operators. Optimize for
space.
2001-03-10 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain): locale_charset() doesn't return
NULL any more.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c: Include headers needed for alloca().
(freea): New macro.
(_nl_load_domain): Add fallback code for platforms lacking alloca.
* intl/localealias.c: (ADD_BLOCK, FREE_BLOCK): Remove macros.
(freea): New macro.
(read_alias_file): Simplify fallback code for platforms lacking
alloca.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (__gettextdebug): Remove declaration.
(__gettext_free_exp, __gettextparse): Convert prototype to K&R C
syntax.
(gettext_free_exp__, gettextparse__): New non-libc declarations.
* intl/plural.y [!_LIBC]: Define gettextparse__, gettext_free_exp__,
not __gettextparse, __gettext_free_exp.
* intl/loadmsgcat.c [!_LIBC]: Use gettextparse__, not __gettextparse.
2001-02-24 Bruno Haible <haible@clisp.cons.org>
* intl/dcigettext.c: Update comment about HAVE_LOCALE_NULL.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain): Add fallback code for platforms
lacking strtoul, like SunOS4.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/l10nflist.c (_nl_normalize_codeset): Use tolower, not _tolower.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/bindtextdom.c (set_binding_values): Convert prototype to K&R C
syntax.
* intl/dcigettext.c (transcmp): Convert to K&R C syntax.
* intl/explodename.c (_nl_find_language): Convert to K&R C syntax.
* intl/plural.y (__gettext_free_exp, yylex, yyerror): Convert to K&R C
syntax.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (gettext__, dgettext__, dcgettext__, textdomain__,
bindtextdomain__, bind_textdomain_codeset__): New declarations, from
old libgettext.h.
* intl/bindtextdom.c: Include libgnuintl.h instead of libgettext.h.
* intl/dcgettext.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dcngettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/dgettext.c: Include libgnuintl.h instead of libgettext.h.
Include gettextP.h.
* intl/gettext.c: Likewise. Don't include locale.h.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (ZERO): New macro.
(struct binding): Always use ZERO.
* intl/bindtextdom.c (offsetof): Provide fallback for platforms that
lack it, like SunOS4.
(set_binding_values): Use offsetof, not sizeof.
* intl/dcigettext.c (offsetof): Provide fallback for platforms that
lack it, like SunOS4.
(ZERO): Remove macro.
(struct transmem_list): Use ZERO.
(DCIGETTEXT): Use offsetof, not sizeof.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h: Include <stddef.h>. Include gettext.h, for
nls_uint32.
* intl/bindtextdom.c: Don't include gettext.h.
* intl/dcgettext.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dcngettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/plural.y: Likewise.
* intl/textdomain.c: Likewise.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettext.h: Don't include <stdio.h>.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/Makefile (CPPFLAGS): Set LOCALEDIR instead of GNULOCALEDIR.
* intl/dcigettext.c (_nl_default_dirname): Initialize with LOCALEDIR.
2001-03-20 09:00:20 +08:00
|
|
|
char data[ZERO];
|
2001-01-05 14:43:17 +08:00
|
|
|
} transmem_block_t;
|
|
|
|
static struct transmem_list *transmem_list;
|
|
|
|
#else
|
2001-03-22 04:22:51 +08:00
|
|
|
typedef unsigned char transmem_block_t;
|
2001-01-05 14:43:17 +08:00
|
|
|
#endif
|
2000-07-01 08:04:28 +08:00
|
|
|
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
/* Names for the libintl functions are a problem. They must not clash
|
|
|
|
with existing names and they should follow ANSI C. But this source
|
|
|
|
code is also used in GNU C Library where the names have a __
|
|
|
|
prefix. So we have to make a difference here. */
|
|
|
|
#ifdef _LIBC
|
|
|
|
# define DCIGETTEXT __dcigettext
|
|
|
|
#else
|
2002-12-12 06:59:29 +08:00
|
|
|
# define DCIGETTEXT libintl_dcigettext
|
2000-01-22 13:50:49 +08:00
|
|
|
#endif
|
|
|
|
|
Update.
2000-02-27 Ulrich Drepper <drepper@redhat.com>
* conform/conformtest.pl (@headers): Add wordexp.h, wctype.h, wchar.h,
varargs.h, utmpx.h, utime.h, unistd.h, ulimit.h, ucontext.h, time.h,
termios.h, tar.h, sys/wait.h, sys/uio.h, sys/types.h, sys/times.h,
sys/timeb.h, sys/time.h, sys/statvfs.h, sys/stat.h, sys/shm.h,
sys/sem.h, and sys/resource.h.
Implement handling of allow-header.
* conform/data/fcntl.h-data: Correct various bugs.
* conform/data/fnmatch.h-data: Likewise.
* conform/data/math.h-data: Likewise.
* conform/data/ndbm.h-data: Likewise.
* conform/data/nl_types.h-data: Likewise.
* conform/data/poll.h-data: Likewise.
* conform/data/pthread.h-data: Likewise.
* conform/data/semaphore.h-data: Likewise.
* conform/data/setjmp.h-data: Likewise.
* conform/data/signal.h-data: Likewise.
* conform/data/stdarg.h-data: Likewise.
* conform/data/stddef.h-data: Likewise.
* conform/data/stdio.h-data: Likewise.
* conform/data/stdlib.h-data: Likewise.
* conform/data/string.h-data: Likewise.
* conform/data/strings.h-data: Likewise.
* conform/data/stropts.h-data: Likewise.
* conform/data/syslog.h-data: Likewise.
* conform/data/sys/ipc.h-data: Likewise.
* conform/data/sys/mman.h-data: Likewise.
* conform/data/sys/msg.h-data: Likewise.
* conform/data/tar.h-data: New file.
* conform/data/termios.h-data: New file.
* conform/data/time.h-data: New file.
* conform/data/ucontext.h-data: New file.
* conform/data/ulimit.h-data: New file.
* conform/data/unistd.h-data: New file.
* conform/data/utime.h-data: New file.
* conform/data/utmpx.h-data: New file.
* conform/data/varargs.h-data: New file.
* conform/data/wchar.h-data: New file.
* conform/data/wctype.h-data: New file.
* conform/data/wordexp.h-data: New file.
* conform/data/sys/resource.h-data: New file.
* conform/data/sys/sem.h-data: New file.
* conform/data/sys/shm.h-data: New file.
* conform/data/sys/stat.h-data: New file.
* conform/data/sys/statvfs.h-data: New file.
* conform/data/sys/time.h-data: New file.
* conform/data/sys/timeb.h-data: New file.
* conform/data/sys/times.h-data: New file.
* conform/data/sys/types.h-data: New file.
* conform/data/sys/uio.h-data: New file.
* conform/data/sys/wait.h-data: New file.
* grp/grp.h (getgrent_r): Declare only if __USE_GNU.
* include/sys/time.h (__itimes): Fix type of second parameter.
* io/sys/stat.h (S_IFLNK): Define also if __USE_XOPEN.
(S_ISVTX): Likewise.
* io/sys/statvfs.h: Define fsblkcnt_t and fsfilcnt_t.
* locale/langindo.h: Make ERA_YEAR, INT_CURR_SYMBOL, CURRENCY_SYMBOL,
MON_DECIMAL_POINT, MON_THOUSANDS_SEP, MON_GROUPING, POSITIVE_SIGN,
NEGATIVE_SIGN, INT_FRAC_DIGITS, FRAC_DIGITS, P_CS_PRECEDES,
P_SEP_BY_SPACE, N_CS_PRECEDES, N_SEP_BY_SPACE, P_SIGN_POSN,
N_SIGN_POSN, DECIMAL_POINT, THOUSANDS_SEP, GROUPING, YESEXPR,
NOEXPR, YESSTR, and NOSTR only available if __USE_GNU.
* math/bits/mathcalls.h: Don't declare tgamma and scalbn if only
__USE_XOPEN.
* posix/unistd.h: Don't define ptrdiff_t.
(sbrk): Correct type of parameter.
* sysdeps/generic/sbrk.c: Likewise.
* sysdeps/mach/hurd/sbrk.c: Likewise.
* posix/sys/types.h: Allow id_t, suseconds_t, fsblkcnt_t, and
fsfilcnt_t being defined elsewhere.
* resource/sys/resource.h: Define id_t.
If __USE_XOPEN use int for type of first parameter if getrlimit,
getrlimit64, setrlimit, setrlimit64, getrusage, getpriority, and
setpriority.
* sysdeps/generic/getpriority.c: Fix type of second parameter.
* sysdeps/generic/setpriority.c: Likewise.
* sysdeps/mach/hurd/getpriority.c: Likewise.
* sysdeps/mach/hurd/setpriority.c: Likewise.
* sysdeps/unix/sysv/irix4/getpriority.c: Likewise.
* sysdeps/unix/sysv/irix4/setpriority.c: Likewise.
* sysdeps/unix/sysv/linux/getpriority.c: Likewise.
* sysdeps/generic/utimes.c: Fix parameter of third parameter.
* sysdeps/mach/hurd/utimes.c: Likewise.
* sysdeps/posix/utimes.c: Likewise.
* sysdeps/generic/bits/shm.h: Define shmatt_t type and use it in
struct shmid_ds definition.
* sysdeps/gnu/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
* sysvipc/sys/shm.h: Define time_t.
* sysvipc/sys/sem.h (struct sembuf): Make sem_num field unsigned.
* sysdeps/gnu/bits/sem.h: Rename anonymous type struct sem_queue and
struct sem_undo to struct __sem_queue and struct __sem_undo resp.
* time/time.h: Define suseconds_t if not already done.
* sysdeps/unix/sysv/linux/bits/statvfs.h: Rename f_spare to __f_spare.
* sysdeps/unix/sysv/linux/fstatvfs64.c: Likewise.
* sysdeps/unix/sysv/linux/statvfs64.c: Likewise.
* sysdeps/unix/sysv/linux/internal_statvfs.c: Likewise.
* intl/bindtextdom.c: Use rwlock to avoid surprising results in
multithreaded applications.
* intl/dcigettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/*.c: Update copyright.
* sysdeps/generic/bits/libc-lock.h: Define __libc_rwlock_* stubs.
2000-02-27 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/configure.in: Treat also "/usr/" as
prefix especially.
2000-02-27 Ulrich Drepper <drepper@redhat.com>
* po/de.po: Update from translation team.
* po/ko.po: Likewise.
2000-02-28 13:08:01 +08:00
|
|
|
/* Lock variable to protect the global data in the gettext implementation. */
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
|
Update.
2000-02-27 Ulrich Drepper <drepper@redhat.com>
* conform/conformtest.pl (@headers): Add wordexp.h, wctype.h, wchar.h,
varargs.h, utmpx.h, utime.h, unistd.h, ulimit.h, ucontext.h, time.h,
termios.h, tar.h, sys/wait.h, sys/uio.h, sys/types.h, sys/times.h,
sys/timeb.h, sys/time.h, sys/statvfs.h, sys/stat.h, sys/shm.h,
sys/sem.h, and sys/resource.h.
Implement handling of allow-header.
* conform/data/fcntl.h-data: Correct various bugs.
* conform/data/fnmatch.h-data: Likewise.
* conform/data/math.h-data: Likewise.
* conform/data/ndbm.h-data: Likewise.
* conform/data/nl_types.h-data: Likewise.
* conform/data/poll.h-data: Likewise.
* conform/data/pthread.h-data: Likewise.
* conform/data/semaphore.h-data: Likewise.
* conform/data/setjmp.h-data: Likewise.
* conform/data/signal.h-data: Likewise.
* conform/data/stdarg.h-data: Likewise.
* conform/data/stddef.h-data: Likewise.
* conform/data/stdio.h-data: Likewise.
* conform/data/stdlib.h-data: Likewise.
* conform/data/string.h-data: Likewise.
* conform/data/strings.h-data: Likewise.
* conform/data/stropts.h-data: Likewise.
* conform/data/syslog.h-data: Likewise.
* conform/data/sys/ipc.h-data: Likewise.
* conform/data/sys/mman.h-data: Likewise.
* conform/data/sys/msg.h-data: Likewise.
* conform/data/tar.h-data: New file.
* conform/data/termios.h-data: New file.
* conform/data/time.h-data: New file.
* conform/data/ucontext.h-data: New file.
* conform/data/ulimit.h-data: New file.
* conform/data/unistd.h-data: New file.
* conform/data/utime.h-data: New file.
* conform/data/utmpx.h-data: New file.
* conform/data/varargs.h-data: New file.
* conform/data/wchar.h-data: New file.
* conform/data/wctype.h-data: New file.
* conform/data/wordexp.h-data: New file.
* conform/data/sys/resource.h-data: New file.
* conform/data/sys/sem.h-data: New file.
* conform/data/sys/shm.h-data: New file.
* conform/data/sys/stat.h-data: New file.
* conform/data/sys/statvfs.h-data: New file.
* conform/data/sys/time.h-data: New file.
* conform/data/sys/timeb.h-data: New file.
* conform/data/sys/times.h-data: New file.
* conform/data/sys/types.h-data: New file.
* conform/data/sys/uio.h-data: New file.
* conform/data/sys/wait.h-data: New file.
* grp/grp.h (getgrent_r): Declare only if __USE_GNU.
* include/sys/time.h (__itimes): Fix type of second parameter.
* io/sys/stat.h (S_IFLNK): Define also if __USE_XOPEN.
(S_ISVTX): Likewise.
* io/sys/statvfs.h: Define fsblkcnt_t and fsfilcnt_t.
* locale/langindo.h: Make ERA_YEAR, INT_CURR_SYMBOL, CURRENCY_SYMBOL,
MON_DECIMAL_POINT, MON_THOUSANDS_SEP, MON_GROUPING, POSITIVE_SIGN,
NEGATIVE_SIGN, INT_FRAC_DIGITS, FRAC_DIGITS, P_CS_PRECEDES,
P_SEP_BY_SPACE, N_CS_PRECEDES, N_SEP_BY_SPACE, P_SIGN_POSN,
N_SIGN_POSN, DECIMAL_POINT, THOUSANDS_SEP, GROUPING, YESEXPR,
NOEXPR, YESSTR, and NOSTR only available if __USE_GNU.
* math/bits/mathcalls.h: Don't declare tgamma and scalbn if only
__USE_XOPEN.
* posix/unistd.h: Don't define ptrdiff_t.
(sbrk): Correct type of parameter.
* sysdeps/generic/sbrk.c: Likewise.
* sysdeps/mach/hurd/sbrk.c: Likewise.
* posix/sys/types.h: Allow id_t, suseconds_t, fsblkcnt_t, and
fsfilcnt_t being defined elsewhere.
* resource/sys/resource.h: Define id_t.
If __USE_XOPEN use int for type of first parameter if getrlimit,
getrlimit64, setrlimit, setrlimit64, getrusage, getpriority, and
setpriority.
* sysdeps/generic/getpriority.c: Fix type of second parameter.
* sysdeps/generic/setpriority.c: Likewise.
* sysdeps/mach/hurd/getpriority.c: Likewise.
* sysdeps/mach/hurd/setpriority.c: Likewise.
* sysdeps/unix/sysv/irix4/getpriority.c: Likewise.
* sysdeps/unix/sysv/irix4/setpriority.c: Likewise.
* sysdeps/unix/sysv/linux/getpriority.c: Likewise.
* sysdeps/generic/utimes.c: Fix parameter of third parameter.
* sysdeps/mach/hurd/utimes.c: Likewise.
* sysdeps/posix/utimes.c: Likewise.
* sysdeps/generic/bits/shm.h: Define shmatt_t type and use it in
struct shmid_ds definition.
* sysdeps/gnu/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
* sysvipc/sys/shm.h: Define time_t.
* sysvipc/sys/sem.h (struct sembuf): Make sem_num field unsigned.
* sysdeps/gnu/bits/sem.h: Rename anonymous type struct sem_queue and
struct sem_undo to struct __sem_queue and struct __sem_undo resp.
* time/time.h: Define suseconds_t if not already done.
* sysdeps/unix/sysv/linux/bits/statvfs.h: Rename f_spare to __f_spare.
* sysdeps/unix/sysv/linux/fstatvfs64.c: Likewise.
* sysdeps/unix/sysv/linux/statvfs64.c: Likewise.
* sysdeps/unix/sysv/linux/internal_statvfs.c: Likewise.
* intl/bindtextdom.c: Use rwlock to avoid surprising results in
multithreaded applications.
* intl/dcigettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/*.c: Update copyright.
* sysdeps/generic/bits/libc-lock.h: Define __libc_rwlock_* stubs.
2000-02-27 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/configure.in: Treat also "/usr/" as
prefix especially.
2000-02-27 Ulrich Drepper <drepper@redhat.com>
* po/de.po: Update from translation team.
* po/ko.po: Likewise.
2000-02-28 13:08:01 +08:00
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
/* Checking whether the binaries runs SUID must be done and glibc provides
|
|
|
|
easier methods therefore we make a difference here. */
|
|
|
|
#ifdef _LIBC
|
|
|
|
# define ENABLE_SECURE __libc_enable_secure
|
|
|
|
# define DETERMINE_SECURE
|
|
|
|
#else
|
2002-12-12 06:59:29 +08:00
|
|
|
# ifndef HAVE_GETUID
|
|
|
|
# define getuid() 0
|
|
|
|
# endif
|
|
|
|
# ifndef HAVE_GETGID
|
|
|
|
# define getgid() 0
|
|
|
|
# endif
|
|
|
|
# ifndef HAVE_GETEUID
|
|
|
|
# define geteuid() getuid()
|
|
|
|
# endif
|
|
|
|
# ifndef HAVE_GETEGID
|
|
|
|
# define getegid() getgid()
|
|
|
|
# endif
|
2000-01-22 13:50:49 +08:00
|
|
|
static int enable_secure;
|
|
|
|
# define ENABLE_SECURE (enable_secure == 1)
|
|
|
|
# define DETERMINE_SECURE \
|
|
|
|
if (enable_secure == 0) \
|
|
|
|
{ \
|
|
|
|
if (getuid () != geteuid () || getgid () != getegid ()) \
|
|
|
|
enable_secure = 1; \
|
|
|
|
else \
|
|
|
|
enable_secure = -1; \
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
Update.
2001-03-04 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (DCIGETTEXT): Increment path_max proportionally.
2001-10-31 Bruno Haible <bruno@clisp.org>
* intl/plural.y: Include <stddef.h>, needed for NULL with SunOS 4 cc.
2001-03-21 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (_nl_state_lock): Mark as #ifdef _LIBC. AIX 3 xlc
chokes on empty macro arguments.
* intl/plural.y: Add #pragma for alloca on AIX 3.
2001-11-27 Ulrich Drepper <drepper@redhat.com>
* intl/dcigettext.c (guess_category_value): Only implement for
glibc. Otherwise rely on function _nl_locale_name which isn't
present in the glibc sources.
2001-09-24 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (_nl_init_domain_conv): Also enable
transliteration when building on a glibc system but outside glibc.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-eval.c: New file, extracted from dcigettext.c.
* intl/dcigettext.c (plural_eval): Remove function, moved to
intl/plural-eval.c.
(plural_lookup): Call PLURAL_EVAL instead of plural_eval.
Include plural-eval.c.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.c (EXTRACT_PLURAL_EXPRESSION): Reject numbers that
don't start with a digit; nplurals must be positive.
2001-09-02 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.h: New file, extracted from gettextP.h.
* intl/plural-exp.c: New file, extracted from loadmsgcat.c.
* intl/gettextP.h (struct expression, struct parse_args,
__gettext_free_exp, __gettextparse): Move to plural-exp.h.
* intl/loadmsgcat.c: Include plural-exp.h.
(PLURAL_PARSE): Move macro to plural-exp.h.
(plvar, plone, germanic_plural, INIT_GERMANIC_PLURAL): Move to
plural-exp.c.
(_nl_load_domain): Move plural handling code to plural-exp.c. Call
EXTRACT_PLURAL_EXPRESSION.
(_nl_unload_domain): Update.
* intl/dcigettext.c: Include plural-exp.h.
* intl/plural.y: Include plural-exp.h, not gettextP.h.
(FREE_EXPRESSION): Move macro to plural-exp.h.
* intl/Makefile (routines): Add plural-exp.
(distribute): Add plural-exp.h.
2001-07-28 Bruno Haible <bruno@clisp.org>
* intl/l10nflist.c (_nl_normalize_codeset): Cast isalnum, isalpha,
isdigit, tolower argument to 'unsigned char'.
* intl/loadmsgcat.c (_nl_load_domain): Cast isspace argument to
'unsigned char'.
* intl/localealias.c (read_alias_file): Cast isspace argument to
'unsigned char'.
2001-10-20 Bruno Haible <bruno@clisp.org>
Assume strchr() exists. (Without it, intl/explodename.c wouldn't link
anyway.)
* intl/dcigettext.c (strchr): Remove fallback definition; it conflicts
with the variable 'index' in plural_lookup.
* intl/l10nflist.c (strchr): Likewise.
* intl/localealias.c (strchr): Likewise.
Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
* intl/bindtextdom.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dgettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/explodename.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/gettext.c: Likewise.
* intl/l10nflist.c: Likewise.
* intl/loadmsgcat.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/gettext.h: Assume <limits.h> exists.
2001-11-28 08:09:26 +08:00
|
|
|
/* Get the function to evaluate the plural expression. */
|
2014-12-10 20:03:53 +08:00
|
|
|
#include "eval-plural.h"
|
Update.
2001-03-04 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (DCIGETTEXT): Increment path_max proportionally.
2001-10-31 Bruno Haible <bruno@clisp.org>
* intl/plural.y: Include <stddef.h>, needed for NULL with SunOS 4 cc.
2001-03-21 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (_nl_state_lock): Mark as #ifdef _LIBC. AIX 3 xlc
chokes on empty macro arguments.
* intl/plural.y: Add #pragma for alloca on AIX 3.
2001-11-27 Ulrich Drepper <drepper@redhat.com>
* intl/dcigettext.c (guess_category_value): Only implement for
glibc. Otherwise rely on function _nl_locale_name which isn't
present in the glibc sources.
2001-09-24 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (_nl_init_domain_conv): Also enable
transliteration when building on a glibc system but outside glibc.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-eval.c: New file, extracted from dcigettext.c.
* intl/dcigettext.c (plural_eval): Remove function, moved to
intl/plural-eval.c.
(plural_lookup): Call PLURAL_EVAL instead of plural_eval.
Include plural-eval.c.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.c (EXTRACT_PLURAL_EXPRESSION): Reject numbers that
don't start with a digit; nplurals must be positive.
2001-09-02 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.h: New file, extracted from gettextP.h.
* intl/plural-exp.c: New file, extracted from loadmsgcat.c.
* intl/gettextP.h (struct expression, struct parse_args,
__gettext_free_exp, __gettextparse): Move to plural-exp.h.
* intl/loadmsgcat.c: Include plural-exp.h.
(PLURAL_PARSE): Move macro to plural-exp.h.
(plvar, plone, germanic_plural, INIT_GERMANIC_PLURAL): Move to
plural-exp.c.
(_nl_load_domain): Move plural handling code to plural-exp.c. Call
EXTRACT_PLURAL_EXPRESSION.
(_nl_unload_domain): Update.
* intl/dcigettext.c: Include plural-exp.h.
* intl/plural.y: Include plural-exp.h, not gettextP.h.
(FREE_EXPRESSION): Move macro to plural-exp.h.
* intl/Makefile (routines): Add plural-exp.
(distribute): Add plural-exp.h.
2001-07-28 Bruno Haible <bruno@clisp.org>
* intl/l10nflist.c (_nl_normalize_codeset): Cast isalnum, isalpha,
isdigit, tolower argument to 'unsigned char'.
* intl/loadmsgcat.c (_nl_load_domain): Cast isspace argument to
'unsigned char'.
* intl/localealias.c (read_alias_file): Cast isspace argument to
'unsigned char'.
2001-10-20 Bruno Haible <bruno@clisp.org>
Assume strchr() exists. (Without it, intl/explodename.c wouldn't link
anyway.)
* intl/dcigettext.c (strchr): Remove fallback definition; it conflicts
with the variable 'index' in plural_lookup.
* intl/l10nflist.c (strchr): Likewise.
* intl/localealias.c (strchr): Likewise.
Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
* intl/bindtextdom.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dgettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/explodename.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/gettext.c: Likewise.
* intl/l10nflist.c: Likewise.
* intl/loadmsgcat.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/gettext.h: Assume <limits.h> exists.
2001-11-28 08:09:26 +08:00
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
/* Look up MSGID in the DOMAINNAME message catalog for the current
|
|
|
|
CATEGORY locale and, if PLURAL is nonzero, search over string
|
|
|
|
depending on the plural form determined by N. */
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifdef IN_LIBGLOCALE
|
2000-01-22 13:50:49 +08:00
|
|
|
char *
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_dcigettext (const char *domainname,
|
|
|
|
const char *msgid1, const char *msgid2,
|
|
|
|
int plural, unsigned long int n,
|
|
|
|
int category,
|
|
|
|
const char *localename, const char *encoding)
|
|
|
|
#else
|
|
|
|
char *
|
|
|
|
DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
|
|
|
|
int plural, unsigned long int n, int category)
|
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
{
|
|
|
|
#ifndef HAVE_ALLOCA
|
|
|
|
struct block_list *block_list = NULL;
|
|
|
|
#endif
|
|
|
|
struct loaded_l10nfile *domain;
|
|
|
|
struct binding *binding;
|
|
|
|
const char *categoryname;
|
|
|
|
const char *categoryvalue;
|
2014-12-10 20:03:53 +08:00
|
|
|
const char *dirname;
|
|
|
|
char *xdomainname;
|
2000-01-22 13:50:49 +08:00
|
|
|
char *single_locale;
|
|
|
|
char *retval;
|
2001-01-05 14:43:17 +08:00
|
|
|
size_t retlen;
|
2000-01-22 13:50:49 +08:00
|
|
|
int saved_errno;
|
2007-11-17 15:37:30 +08:00
|
|
|
struct known_translation_t search;
|
2000-01-22 13:50:49 +08:00
|
|
|
struct known_translation_t **foundp = NULL;
|
2014-12-10 20:03:53 +08:00
|
|
|
#if defined HAVE_PER_THREAD_LOCALE && !defined IN_LIBGLOCALE
|
2005-04-29 02:21:03 +08:00
|
|
|
const char *localename;
|
2000-01-22 13:50:49 +08:00
|
|
|
#endif
|
|
|
|
size_t domainname_len;
|
|
|
|
|
|
|
|
/* If no real MSGID is given return NULL. */
|
|
|
|
if (msgid1 == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2002-08-31 03:36:12 +08:00
|
|
|
#ifdef _LIBC
|
|
|
|
if (category < 0 || category >= __LC_LAST || category == LC_ALL)
|
|
|
|
/* Bogus. */
|
|
|
|
return (plural == 0
|
|
|
|
? (char *) msgid1
|
|
|
|
/* Use the Germanic plural rule. */
|
|
|
|
: n == 1 ? (char *) msgid1 : (char *) msgid2);
|
|
|
|
#endif
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* Preserve the `errno' value. */
|
|
|
|
saved_errno = errno;
|
|
|
|
|
2008-03-31 08:38:06 +08:00
|
|
|
#ifdef _LIBC
|
|
|
|
__libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden)
|
|
|
|
__libc_rwlock_rdlock (__libc_setlocale_lock);
|
|
|
|
#endif
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_rdlock (_nl_state_lock);
|
Update.
2000-02-27 Ulrich Drepper <drepper@redhat.com>
* conform/conformtest.pl (@headers): Add wordexp.h, wctype.h, wchar.h,
varargs.h, utmpx.h, utime.h, unistd.h, ulimit.h, ucontext.h, time.h,
termios.h, tar.h, sys/wait.h, sys/uio.h, sys/types.h, sys/times.h,
sys/timeb.h, sys/time.h, sys/statvfs.h, sys/stat.h, sys/shm.h,
sys/sem.h, and sys/resource.h.
Implement handling of allow-header.
* conform/data/fcntl.h-data: Correct various bugs.
* conform/data/fnmatch.h-data: Likewise.
* conform/data/math.h-data: Likewise.
* conform/data/ndbm.h-data: Likewise.
* conform/data/nl_types.h-data: Likewise.
* conform/data/poll.h-data: Likewise.
* conform/data/pthread.h-data: Likewise.
* conform/data/semaphore.h-data: Likewise.
* conform/data/setjmp.h-data: Likewise.
* conform/data/signal.h-data: Likewise.
* conform/data/stdarg.h-data: Likewise.
* conform/data/stddef.h-data: Likewise.
* conform/data/stdio.h-data: Likewise.
* conform/data/stdlib.h-data: Likewise.
* conform/data/string.h-data: Likewise.
* conform/data/strings.h-data: Likewise.
* conform/data/stropts.h-data: Likewise.
* conform/data/syslog.h-data: Likewise.
* conform/data/sys/ipc.h-data: Likewise.
* conform/data/sys/mman.h-data: Likewise.
* conform/data/sys/msg.h-data: Likewise.
* conform/data/tar.h-data: New file.
* conform/data/termios.h-data: New file.
* conform/data/time.h-data: New file.
* conform/data/ucontext.h-data: New file.
* conform/data/ulimit.h-data: New file.
* conform/data/unistd.h-data: New file.
* conform/data/utime.h-data: New file.
* conform/data/utmpx.h-data: New file.
* conform/data/varargs.h-data: New file.
* conform/data/wchar.h-data: New file.
* conform/data/wctype.h-data: New file.
* conform/data/wordexp.h-data: New file.
* conform/data/sys/resource.h-data: New file.
* conform/data/sys/sem.h-data: New file.
* conform/data/sys/shm.h-data: New file.
* conform/data/sys/stat.h-data: New file.
* conform/data/sys/statvfs.h-data: New file.
* conform/data/sys/time.h-data: New file.
* conform/data/sys/timeb.h-data: New file.
* conform/data/sys/times.h-data: New file.
* conform/data/sys/types.h-data: New file.
* conform/data/sys/uio.h-data: New file.
* conform/data/sys/wait.h-data: New file.
* grp/grp.h (getgrent_r): Declare only if __USE_GNU.
* include/sys/time.h (__itimes): Fix type of second parameter.
* io/sys/stat.h (S_IFLNK): Define also if __USE_XOPEN.
(S_ISVTX): Likewise.
* io/sys/statvfs.h: Define fsblkcnt_t and fsfilcnt_t.
* locale/langindo.h: Make ERA_YEAR, INT_CURR_SYMBOL, CURRENCY_SYMBOL,
MON_DECIMAL_POINT, MON_THOUSANDS_SEP, MON_GROUPING, POSITIVE_SIGN,
NEGATIVE_SIGN, INT_FRAC_DIGITS, FRAC_DIGITS, P_CS_PRECEDES,
P_SEP_BY_SPACE, N_CS_PRECEDES, N_SEP_BY_SPACE, P_SIGN_POSN,
N_SIGN_POSN, DECIMAL_POINT, THOUSANDS_SEP, GROUPING, YESEXPR,
NOEXPR, YESSTR, and NOSTR only available if __USE_GNU.
* math/bits/mathcalls.h: Don't declare tgamma and scalbn if only
__USE_XOPEN.
* posix/unistd.h: Don't define ptrdiff_t.
(sbrk): Correct type of parameter.
* sysdeps/generic/sbrk.c: Likewise.
* sysdeps/mach/hurd/sbrk.c: Likewise.
* posix/sys/types.h: Allow id_t, suseconds_t, fsblkcnt_t, and
fsfilcnt_t being defined elsewhere.
* resource/sys/resource.h: Define id_t.
If __USE_XOPEN use int for type of first parameter if getrlimit,
getrlimit64, setrlimit, setrlimit64, getrusage, getpriority, and
setpriority.
* sysdeps/generic/getpriority.c: Fix type of second parameter.
* sysdeps/generic/setpriority.c: Likewise.
* sysdeps/mach/hurd/getpriority.c: Likewise.
* sysdeps/mach/hurd/setpriority.c: Likewise.
* sysdeps/unix/sysv/irix4/getpriority.c: Likewise.
* sysdeps/unix/sysv/irix4/setpriority.c: Likewise.
* sysdeps/unix/sysv/linux/getpriority.c: Likewise.
* sysdeps/generic/utimes.c: Fix parameter of third parameter.
* sysdeps/mach/hurd/utimes.c: Likewise.
* sysdeps/posix/utimes.c: Likewise.
* sysdeps/generic/bits/shm.h: Define shmatt_t type and use it in
struct shmid_ds definition.
* sysdeps/gnu/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
* sysvipc/sys/shm.h: Define time_t.
* sysvipc/sys/sem.h (struct sembuf): Make sem_num field unsigned.
* sysdeps/gnu/bits/sem.h: Rename anonymous type struct sem_queue and
struct sem_undo to struct __sem_queue and struct __sem_undo resp.
* time/time.h: Define suseconds_t if not already done.
* sysdeps/unix/sysv/linux/bits/statvfs.h: Rename f_spare to __f_spare.
* sysdeps/unix/sysv/linux/fstatvfs64.c: Likewise.
* sysdeps/unix/sysv/linux/statvfs64.c: Likewise.
* sysdeps/unix/sysv/linux/internal_statvfs.c: Likewise.
* intl/bindtextdom.c: Use rwlock to avoid surprising results in
multithreaded applications.
* intl/dcigettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/*.c: Update copyright.
* sysdeps/generic/bits/libc-lock.h: Define __libc_rwlock_* stubs.
2000-02-27 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/configure.in: Treat also "/usr/" as
prefix especially.
2000-02-27 Ulrich Drepper <drepper@redhat.com>
* po/de.po: Update from translation team.
* po/ko.po: Likewise.
2000-02-28 13:08:01 +08:00
|
|
|
|
2000-05-04 10:46:54 +08:00
|
|
|
/* If DOMAINNAME is NULL, we are interested in the default domain. If
|
|
|
|
CATEGORY is not LC_MESSAGES this might not make much sense but the
|
|
|
|
definition left this undefined. */
|
|
|
|
if (domainname == NULL)
|
|
|
|
domainname = _nl_current_default_domain;
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* OS/2 specific: backward compatibility with older libintl versions */
|
|
|
|
#ifdef LC_MESSAGES_COMPAT
|
|
|
|
if (category == LC_MESSAGES_COMPAT)
|
|
|
|
category = LC_MESSAGES;
|
|
|
|
#endif
|
|
|
|
|
2001-01-05 14:43:17 +08:00
|
|
|
/* Try to find the translation among those which we found at
|
|
|
|
some time. */
|
2007-11-17 15:37:30 +08:00
|
|
|
search.domain = NULL;
|
|
|
|
search.msgid.ptr = msgid1;
|
|
|
|
search.domainname = domainname;
|
|
|
|
search.category = category;
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifdef HAVE_PER_THREAD_LOCALE
|
|
|
|
# ifndef IN_LIBGLOCALE
|
2005-04-29 02:21:03 +08:00
|
|
|
# ifdef _LIBC
|
2008-03-31 08:38:06 +08:00
|
|
|
localename = strdupa (__current_locale_name (category));
|
2014-12-10 20:03:53 +08:00
|
|
|
# else
|
|
|
|
categoryname = category_to_name (category);
|
|
|
|
# define CATEGORYNAME_INITIALIZED
|
|
|
|
localename = _nl_locale_name_thread_unsafe (category, categoryname);
|
|
|
|
if (localename == NULL)
|
|
|
|
localename = "";
|
2005-04-29 02:21:03 +08:00
|
|
|
# endif
|
2014-12-10 20:03:53 +08:00
|
|
|
# endif
|
2007-11-17 15:37:30 +08:00
|
|
|
search.localename = localename;
|
2014-12-10 20:03:53 +08:00
|
|
|
# ifdef IN_LIBGLOCALE
|
|
|
|
search.encoding = encoding;
|
2005-04-29 02:21:03 +08:00
|
|
|
# endif
|
2001-01-05 14:43:17 +08:00
|
|
|
|
2004-09-26 12:45:24 +08:00
|
|
|
/* Since tfind/tsearch manage a balanced tree, concurrent tfind and
|
|
|
|
tsearch calls can be fatal. */
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_rdlock (tree_lock);
|
2004-09-26 12:45:24 +08:00
|
|
|
|
2007-11-17 15:37:30 +08:00
|
|
|
foundp = (struct known_translation_t **) tfind (&search, &root, transcmp);
|
2004-09-26 12:45:24 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_unlock (tree_lock);
|
2004-09-26 12:45:24 +08:00
|
|
|
|
2001-01-05 14:43:17 +08:00
|
|
|
if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
|
2000-01-22 13:50:49 +08:00
|
|
|
{
|
2001-01-05 14:43:17 +08:00
|
|
|
/* Now deal with plural. */
|
|
|
|
if (plural)
|
|
|
|
retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
|
|
|
|
(*foundp)->translation_length);
|
|
|
|
else
|
|
|
|
retval = (char *) (*foundp)->translation;
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_unlock (_nl_state_lock);
|
2008-03-31 08:38:06 +08:00
|
|
|
# ifdef _LIBC
|
|
|
|
__libc_rwlock_unlock (__libc_setlocale_lock);
|
|
|
|
# endif
|
2014-12-10 20:03:53 +08:00
|
|
|
__set_errno (saved_errno);
|
2001-01-05 14:43:17 +08:00
|
|
|
return retval;
|
2000-01-22 13:50:49 +08:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* See whether this is a SUID binary or not. */
|
|
|
|
DETERMINE_SECURE;
|
|
|
|
|
|
|
|
/* First find matching binding. */
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifdef IN_LIBGLOCALE
|
|
|
|
/* We can use a trivial binding, since _nl_find_msg will ignore it anyway,
|
|
|
|
and _nl_load_domain and _nl_find_domain just pass it through. */
|
|
|
|
binding = NULL;
|
|
|
|
dirname = bindtextdomain (domainname, NULL);
|
|
|
|
#else
|
2000-01-22 13:50:49 +08:00
|
|
|
for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
|
|
|
|
{
|
|
|
|
int compare = strcmp (domainname, binding->domainname);
|
|
|
|
if (compare == 0)
|
|
|
|
/* We found it! */
|
|
|
|
break;
|
|
|
|
if (compare < 0)
|
|
|
|
{
|
|
|
|
/* It is not in the list. */
|
|
|
|
binding = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (binding == NULL)
|
2014-12-10 20:03:53 +08:00
|
|
|
dirname = _nl_default_dirname;
|
2000-01-22 13:50:49 +08:00
|
|
|
else
|
|
|
|
{
|
2014-12-10 20:03:53 +08:00
|
|
|
dirname = binding->dirname;
|
|
|
|
#endif
|
|
|
|
if (!IS_ABSOLUTE_PATH (dirname))
|
|
|
|
{
|
|
|
|
/* We have a relative path. Make it absolute now. */
|
|
|
|
size_t dirname_len = strlen (dirname) + 1;
|
|
|
|
size_t path_max;
|
|
|
|
char *resolved_dirname;
|
|
|
|
char *ret;
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
path_max = (unsigned int) PATH_MAX;
|
|
|
|
path_max += 2; /* The getcwd docs say to do this. */
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
resolved_dirname = (char *) alloca (path_max + dirname_len);
|
|
|
|
ADD_BLOCK (block_list, tmp_dirname);
|
Update.
2001-03-04 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (DCIGETTEXT): Increment path_max proportionally.
2001-10-31 Bruno Haible <bruno@clisp.org>
* intl/plural.y: Include <stddef.h>, needed for NULL with SunOS 4 cc.
2001-03-21 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (_nl_state_lock): Mark as #ifdef _LIBC. AIX 3 xlc
chokes on empty macro arguments.
* intl/plural.y: Add #pragma for alloca on AIX 3.
2001-11-27 Ulrich Drepper <drepper@redhat.com>
* intl/dcigettext.c (guess_category_value): Only implement for
glibc. Otherwise rely on function _nl_locale_name which isn't
present in the glibc sources.
2001-09-24 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (_nl_init_domain_conv): Also enable
transliteration when building on a glibc system but outside glibc.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-eval.c: New file, extracted from dcigettext.c.
* intl/dcigettext.c (plural_eval): Remove function, moved to
intl/plural-eval.c.
(plural_lookup): Call PLURAL_EVAL instead of plural_eval.
Include plural-eval.c.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.c (EXTRACT_PLURAL_EXPRESSION): Reject numbers that
don't start with a digit; nplurals must be positive.
2001-09-02 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.h: New file, extracted from gettextP.h.
* intl/plural-exp.c: New file, extracted from loadmsgcat.c.
* intl/gettextP.h (struct expression, struct parse_args,
__gettext_free_exp, __gettextparse): Move to plural-exp.h.
* intl/loadmsgcat.c: Include plural-exp.h.
(PLURAL_PARSE): Move macro to plural-exp.h.
(plvar, plone, germanic_plural, INIT_GERMANIC_PLURAL): Move to
plural-exp.c.
(_nl_load_domain): Move plural handling code to plural-exp.c. Call
EXTRACT_PLURAL_EXPRESSION.
(_nl_unload_domain): Update.
* intl/dcigettext.c: Include plural-exp.h.
* intl/plural.y: Include plural-exp.h, not gettextP.h.
(FREE_EXPRESSION): Move macro to plural-exp.h.
* intl/Makefile (routines): Add plural-exp.
(distribute): Add plural-exp.h.
2001-07-28 Bruno Haible <bruno@clisp.org>
* intl/l10nflist.c (_nl_normalize_codeset): Cast isalnum, isalpha,
isdigit, tolower argument to 'unsigned char'.
* intl/loadmsgcat.c (_nl_load_domain): Cast isspace argument to
'unsigned char'.
* intl/localealias.c (read_alias_file): Cast isspace argument to
'unsigned char'.
2001-10-20 Bruno Haible <bruno@clisp.org>
Assume strchr() exists. (Without it, intl/explodename.c wouldn't link
anyway.)
* intl/dcigettext.c (strchr): Remove fallback definition; it conflicts
with the variable 'index' in plural_lookup.
* intl/l10nflist.c (strchr): Likewise.
* intl/localealias.c (strchr): Likewise.
Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
* intl/bindtextdom.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dgettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/explodename.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/gettext.c: Likewise.
* intl/l10nflist.c: Likewise.
* intl/loadmsgcat.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/gettext.h: Assume <limits.h> exists.
2001-11-28 08:09:26 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
__set_errno (0);
|
|
|
|
ret = getcwd (resolved_dirname, path_max);
|
|
|
|
if (ret != NULL || errno != ERANGE)
|
|
|
|
break;
|
Update.
2001-03-04 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (DCIGETTEXT): Increment path_max proportionally.
2001-10-31 Bruno Haible <bruno@clisp.org>
* intl/plural.y: Include <stddef.h>, needed for NULL with SunOS 4 cc.
2001-03-21 Bruno Haible <bruno@clisp.org>
* intl/dcigettext.c (_nl_state_lock): Mark as #ifdef _LIBC. AIX 3 xlc
chokes on empty macro arguments.
* intl/plural.y: Add #pragma for alloca on AIX 3.
2001-11-27 Ulrich Drepper <drepper@redhat.com>
* intl/dcigettext.c (guess_category_value): Only implement for
glibc. Otherwise rely on function _nl_locale_name which isn't
present in the glibc sources.
2001-09-24 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (_nl_init_domain_conv): Also enable
transliteration when building on a glibc system but outside glibc.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-eval.c: New file, extracted from dcigettext.c.
* intl/dcigettext.c (plural_eval): Remove function, moved to
intl/plural-eval.c.
(plural_lookup): Call PLURAL_EVAL instead of plural_eval.
Include plural-eval.c.
2001-09-22 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.c (EXTRACT_PLURAL_EXPRESSION): Reject numbers that
don't start with a digit; nplurals must be positive.
2001-09-02 Bruno Haible <bruno@clisp.org>
* intl/plural-exp.h: New file, extracted from gettextP.h.
* intl/plural-exp.c: New file, extracted from loadmsgcat.c.
* intl/gettextP.h (struct expression, struct parse_args,
__gettext_free_exp, __gettextparse): Move to plural-exp.h.
* intl/loadmsgcat.c: Include plural-exp.h.
(PLURAL_PARSE): Move macro to plural-exp.h.
(plvar, plone, germanic_plural, INIT_GERMANIC_PLURAL): Move to
plural-exp.c.
(_nl_load_domain): Move plural handling code to plural-exp.c. Call
EXTRACT_PLURAL_EXPRESSION.
(_nl_unload_domain): Update.
* intl/dcigettext.c: Include plural-exp.h.
* intl/plural.y: Include plural-exp.h, not gettextP.h.
(FREE_EXPRESSION): Move macro to plural-exp.h.
* intl/Makefile (routines): Add plural-exp.
(distribute): Add plural-exp.h.
2001-07-28 Bruno Haible <bruno@clisp.org>
* intl/l10nflist.c (_nl_normalize_codeset): Cast isalnum, isalpha,
isdigit, tolower argument to 'unsigned char'.
* intl/loadmsgcat.c (_nl_load_domain): Cast isspace argument to
'unsigned char'.
* intl/localealias.c (read_alias_file): Cast isspace argument to
'unsigned char'.
2001-10-20 Bruno Haible <bruno@clisp.org>
Assume strchr() exists. (Without it, intl/explodename.c wouldn't link
anyway.)
* intl/dcigettext.c (strchr): Remove fallback definition; it conflicts
with the variable 'index' in plural_lookup.
* intl/l10nflist.c (strchr): Likewise.
* intl/localealias.c (strchr): Likewise.
Assume <stddef.h>, <stdlib.h>, <string.h>, <locale.h> exist.
* intl/bindtextdom.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dgettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/explodename.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/gettext.c: Likewise.
* intl/l10nflist.c: Likewise.
* intl/loadmsgcat.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/gettext.h: Assume <limits.h> exists.
2001-11-28 08:09:26 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
path_max += path_max / 2;
|
|
|
|
path_max += PATH_INCR;
|
|
|
|
}
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
if (ret == NULL)
|
|
|
|
/* We cannot get the current working directory. Don't signal an
|
|
|
|
error but simply return the default string. */
|
|
|
|
goto return_untranslated;
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
stpcpy (stpcpy (strchr (resolved_dirname, '\0'), "/"), dirname);
|
|
|
|
dirname = resolved_dirname;
|
|
|
|
}
|
|
|
|
#ifndef IN_LIBGLOCALE
|
2000-01-22 13:50:49 +08:00
|
|
|
}
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
/* Now determine the symbolic name of CATEGORY and its value. */
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifndef CATEGORYNAME_INITIALIZED
|
2000-01-22 13:50:49 +08:00
|
|
|
categoryname = category_to_name (category);
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
|
|
|
#ifdef IN_LIBGLOCALE
|
|
|
|
categoryvalue = guess_category_value (category, categoryname, localename);
|
|
|
|
#else
|
2000-01-22 13:50:49 +08:00
|
|
|
categoryvalue = guess_category_value (category, categoryname);
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
domainname_len = strlen (domainname);
|
|
|
|
xdomainname = (char *) alloca (strlen (categoryname)
|
|
|
|
+ domainname_len + 5);
|
|
|
|
ADD_BLOCK (block_list, xdomainname);
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
stpcpy ((char *) mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
|
|
|
|
domainname, domainname_len),
|
2000-01-22 13:50:49 +08:00
|
|
|
".mo");
|
|
|
|
|
|
|
|
/* Creating working area. */
|
|
|
|
single_locale = (char *) alloca (strlen (categoryvalue) + 1);
|
|
|
|
ADD_BLOCK (block_list, single_locale);
|
|
|
|
|
|
|
|
|
|
|
|
/* Search for the given string. This is a loop because we perhaps
|
|
|
|
got an ordered list of languages to consider for the translation. */
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
/* Make CATEGORYVALUE point to the next element of the list. */
|
|
|
|
while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
|
|
|
|
++categoryvalue;
|
|
|
|
if (categoryvalue[0] == '\0')
|
|
|
|
{
|
|
|
|
/* The whole contents of CATEGORYVALUE has been searched but
|
|
|
|
no valid entry has been found. We solve this situation
|
|
|
|
by implicitly appending a "C" entry, i.e. no translation
|
|
|
|
will take place. */
|
|
|
|
single_locale[0] = 'C';
|
|
|
|
single_locale[1] = '\0';
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char *cp = single_locale;
|
|
|
|
while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
|
|
|
|
*cp++ = *categoryvalue++;
|
|
|
|
*cp = '\0';
|
|
|
|
|
|
|
|
/* When this is a SUID binary we must not allow accessing files
|
|
|
|
outside the dedicated directories. */
|
2014-12-10 20:03:53 +08:00
|
|
|
if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
|
2000-01-22 13:50:49 +08:00
|
|
|
/* Ingore this entry. */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the current locale value is C (or POSIX) we don't load a
|
|
|
|
domain. Return the MSGID. */
|
|
|
|
if (strcmp (single_locale, "C") == 0
|
|
|
|
|| strcmp (single_locale, "POSIX") == 0)
|
2014-12-10 20:03:53 +08:00
|
|
|
break;
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
/* Find structure describing the message catalog matching the
|
|
|
|
DOMAINNAME and CATEGORY. */
|
2000-05-04 10:46:54 +08:00
|
|
|
domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
if (domain != NULL)
|
|
|
|
{
|
2014-12-10 20:03:53 +08:00
|
|
|
#if defined IN_LIBGLOCALE
|
|
|
|
retval = _nl_find_msg (domain, binding, encoding, msgid1, &retlen);
|
|
|
|
#else
|
2005-04-05 06:37:38 +08:00
|
|
|
retval = _nl_find_msg (domain, binding, msgid1, 1, &retlen);
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
if (retval == NULL)
|
|
|
|
{
|
|
|
|
int cnt;
|
|
|
|
|
|
|
|
for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
|
|
|
|
{
|
2014-12-10 20:03:53 +08:00
|
|
|
#if defined IN_LIBGLOCALE
|
|
|
|
retval = _nl_find_msg (domain->successor[cnt], binding,
|
|
|
|
encoding, msgid1, &retlen);
|
|
|
|
#else
|
2001-04-10 08:15:08 +08:00
|
|
|
retval = _nl_find_msg (domain->successor[cnt], binding,
|
2005-04-05 06:37:38 +08:00
|
|
|
msgid1, 1, &retlen);
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
|
Fix _nl_find_msg malloc failure case, and callers.
This patch fixes two issues, and perhaps should be two distinct commits,
but I present it here as one for the sake of completeness.
Commit 006dd86111c44572dbd3b26e9c63dd0f834d7762 fails to check malloc's
return in intl/dcigettext.c (_nl_find_msg):
~~~
freemem_size = INITIAL_BLOCK_SIZE;
newmem = (transmem_block_t *) malloc (freemem_size);
...
newmem->next = transmem_list;
transmem_list = newmem;
~~~
If malloc fails then newmem is NULL then newmem->next results in a
fault.
The fix is easy enough, check for newmem != NULL, and fall through to
the error condition below which returns (char *) -1 e.g. resource error.
The problem is that returning (char *) -1 will break all sorts of other
code, so while what we did is correct, the real failure case fix is
slightly broader.
There are 4 other places where _nl_find_msg is called, one is OK, the
other three are fixed to handle -1 error return value.
No regressions on x86-64 or x86.
However, no regressions isn't really a useful metric for this code.
The change was tested as documented here:
http://sourceware.org/glibc/wiki/Testing/WhiteBox
using SystemTap for fault injection to simulate malloc failure.
---
2013-05-03 Carlos O'Donell <carlos at redhat.com>
[BZ #15441]
* intl/dcigettext.c (DCIGETTEXT): Skip translating if _nl_find_msg
returns -1.
(_nl_find_msg): Return -1 if recursive call returned -1. If newmem is
null return -1.
* intl/loadmsgcat.c (_nl_load_domain): If _nl_find_msg returns -1 abort
loading the domain.
2013-05-23 02:50:26 +08:00
|
|
|
/* Resource problems are not fatal, instead we return no
|
|
|
|
translation. */
|
2014-12-10 20:03:53 +08:00
|
|
|
if (__builtin_expect (retval == (char *) -1, 0))
|
|
|
|
goto return_untranslated;
|
Fix _nl_find_msg malloc failure case, and callers.
This patch fixes two issues, and perhaps should be two distinct commits,
but I present it here as one for the sake of completeness.
Commit 006dd86111c44572dbd3b26e9c63dd0f834d7762 fails to check malloc's
return in intl/dcigettext.c (_nl_find_msg):
~~~
freemem_size = INITIAL_BLOCK_SIZE;
newmem = (transmem_block_t *) malloc (freemem_size);
...
newmem->next = transmem_list;
transmem_list = newmem;
~~~
If malloc fails then newmem is NULL then newmem->next results in a
fault.
The fix is easy enough, check for newmem != NULL, and fall through to
the error condition below which returns (char *) -1 e.g. resource error.
The problem is that returning (char *) -1 will break all sorts of other
code, so while what we did is correct, the real failure case fix is
slightly broader.
There are 4 other places where _nl_find_msg is called, one is OK, the
other three are fixed to handle -1 error return value.
No regressions on x86-64 or x86.
However, no regressions isn't really a useful metric for this code.
The change was tested as documented here:
http://sourceware.org/glibc/wiki/Testing/WhiteBox
using SystemTap for fault injection to simulate malloc failure.
---
2013-05-03 Carlos O'Donell <carlos at redhat.com>
[BZ #15441]
* intl/dcigettext.c (DCIGETTEXT): Skip translating if _nl_find_msg
returns -1.
(_nl_find_msg): Return -1 if recursive call returned -1. If newmem is
null return -1.
* intl/loadmsgcat.c (_nl_load_domain): If _nl_find_msg returns -1 abort
loading the domain.
2013-05-23 02:50:26 +08:00
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
if (retval != NULL)
|
2001-01-05 14:43:17 +08:00
|
|
|
{
|
|
|
|
domain = domain->successor[cnt];
|
|
|
|
break;
|
|
|
|
}
|
2000-01-22 13:50:49 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-23 07:59:32 +08:00
|
|
|
/* Returning -1 means that some resource problem exists
|
|
|
|
(likely memory) and that the strings could not be
|
|
|
|
converted. Return the original strings. */
|
2014-12-10 20:03:53 +08:00
|
|
|
if (__builtin_expect (retval == (char *) -1, 0))
|
|
|
|
break;
|
2006-06-23 07:59:32 +08:00
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
if (retval != NULL)
|
|
|
|
{
|
2001-01-05 14:43:17 +08:00
|
|
|
/* Found the translation of MSGID1 in domain DOMAIN:
|
|
|
|
starting at RETVAL, RETLEN bytes. */
|
2000-01-22 13:50:49 +08:00
|
|
|
FREE_BLOCKS (block_list);
|
|
|
|
if (foundp == NULL)
|
|
|
|
{
|
|
|
|
/* Create a new entry and add it to the search tree. */
|
2007-11-17 15:37:30 +08:00
|
|
|
size_t msgid_len;
|
2005-04-29 02:21:03 +08:00
|
|
|
size_t size;
|
2000-01-22 13:50:49 +08:00
|
|
|
struct known_translation_t *newp;
|
|
|
|
|
2007-11-17 15:37:30 +08:00
|
|
|
msgid_len = strlen (msgid1) + 1;
|
2005-04-29 02:21:03 +08:00
|
|
|
size = offsetof (struct known_translation_t, msgid)
|
|
|
|
+ msgid_len + domainname_len + 1;
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifdef HAVE_PER_THREAD_LOCALE
|
2005-04-29 02:21:03 +08:00
|
|
|
size += strlen (localename) + 1;
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
2005-04-29 02:21:03 +08:00
|
|
|
newp = (struct known_translation_t *) malloc (size);
|
2000-01-22 13:50:49 +08:00
|
|
|
if (newp != NULL)
|
|
|
|
{
|
2005-03-30 07:41:03 +08:00
|
|
|
char *new_domainname;
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifdef HAVE_PER_THREAD_LOCALE
|
2005-04-29 02:21:03 +08:00
|
|
|
char *new_localename;
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
2005-03-30 07:41:03 +08:00
|
|
|
|
2007-11-17 15:37:30 +08:00
|
|
|
new_domainname =
|
2014-12-10 20:03:53 +08:00
|
|
|
(char *) mempcpy (newp->msgid.appended, msgid1,
|
|
|
|
msgid_len);
|
2005-03-30 07:41:03 +08:00
|
|
|
memcpy (new_domainname, domainname, domainname_len + 1);
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifdef HAVE_PER_THREAD_LOCALE
|
2005-04-29 02:21:03 +08:00
|
|
|
new_localename = new_domainname + domainname_len + 1;
|
|
|
|
strcpy (new_localename, localename);
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
2005-03-30 07:41:03 +08:00
|
|
|
newp->domainname = new_domainname;
|
2000-01-22 13:50:49 +08:00
|
|
|
newp->category = category;
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifdef HAVE_PER_THREAD_LOCALE
|
2005-04-29 02:21:03 +08:00
|
|
|
newp->localename = new_localename;
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
|
|
|
#ifdef IN_LIBGLOCALE
|
|
|
|
newp->encoding = encoding;
|
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
newp->counter = _nl_msg_cat_cntr;
|
2001-01-05 14:43:17 +08:00
|
|
|
newp->domain = domain;
|
2000-01-22 13:50:49 +08:00
|
|
|
newp->translation = retval;
|
2001-01-05 14:43:17 +08:00
|
|
|
newp->translation_length = retlen;
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_wrlock (tree_lock);
|
2004-09-26 12:45:24 +08:00
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
/* Insert the entry in the search tree. */
|
|
|
|
foundp = (struct known_translation_t **)
|
|
|
|
tsearch (newp, &root, transcmp);
|
2004-09-26 12:45:24 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_unlock (tree_lock);
|
2004-09-26 12:45:24 +08:00
|
|
|
|
2000-05-08 03:32:30 +08:00
|
|
|
if (foundp == NULL
|
|
|
|
|| __builtin_expect (*foundp != newp, 0))
|
2000-01-22 13:50:49 +08:00
|
|
|
/* The insert failed. */
|
|
|
|
free (newp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We can update the existing entry. */
|
|
|
|
(*foundp)->counter = _nl_msg_cat_cntr;
|
2001-01-05 14:43:17 +08:00
|
|
|
(*foundp)->domain = domain;
|
2000-01-22 13:50:49 +08:00
|
|
|
(*foundp)->translation = retval;
|
2001-01-05 14:43:17 +08:00
|
|
|
(*foundp)->translation_length = retlen;
|
2000-01-22 13:50:49 +08:00
|
|
|
}
|
2014-12-10 20:03:53 +08:00
|
|
|
|
2002-09-21 07:25:36 +08:00
|
|
|
__set_errno (saved_errno);
|
|
|
|
|
2001-01-05 14:43:17 +08:00
|
|
|
/* Now deal with plural. */
|
|
|
|
if (plural)
|
|
|
|
retval = plural_lookup (domain, n, retval, retlen);
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_unlock (_nl_state_lock);
|
|
|
|
#ifdef _LIBC
|
2008-03-31 08:38:06 +08:00
|
|
|
__libc_rwlock_unlock (__libc_setlocale_lock);
|
2014-12-10 20:03:53 +08:00
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-12-10 20:03:53 +08:00
|
|
|
|
|
|
|
return_untranslated:
|
|
|
|
/* Return the untranslated MSGID. */
|
|
|
|
FREE_BLOCKS (block_list);
|
|
|
|
gl_rwlock_unlock (_nl_state_lock);
|
|
|
|
#ifdef _LIBC
|
|
|
|
__libc_rwlock_unlock (__libc_setlocale_lock);
|
|
|
|
#endif
|
|
|
|
#ifndef _LIBC
|
|
|
|
if (!ENABLE_SECURE)
|
|
|
|
{
|
|
|
|
extern void _nl_log_untranslated (const char *logfilename,
|
|
|
|
const char *domainname,
|
|
|
|
const char *msgid1, const char *msgid2,
|
|
|
|
int plural);
|
|
|
|
const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED");
|
|
|
|
|
|
|
|
if (logfilename != NULL && logfilename[0] != '\0')
|
|
|
|
_nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
__set_errno (saved_errno);
|
|
|
|
return (plural == 0
|
|
|
|
? (char *) msgid1
|
|
|
|
/* Use the Germanic plural rule. */
|
|
|
|
: n == 1 ? (char *) msgid1 : (char *) msgid2);
|
2000-01-22 13:50:49 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* Look up the translation of msgid within DOMAIN_FILE and DOMAINBINDING.
|
|
|
|
Return it if found. Return NULL if not found or in case of a conversion
|
|
|
|
failure (problem in the particular message catalog). Return (char *) -1
|
|
|
|
in case of a memory allocation failure during conversion (only if
|
|
|
|
ENCODING != NULL resp. CONVERT == true). */
|
2000-01-22 13:50:49 +08:00
|
|
|
char *
|
|
|
|
internal_function
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifdef IN_LIBGLOCALE
|
|
|
|
_nl_find_msg (struct loaded_l10nfile *domain_file,
|
|
|
|
struct binding *domainbinding, const char *encoding,
|
|
|
|
const char *msgid,
|
|
|
|
size_t *lengthp)
|
|
|
|
#else
|
|
|
|
_nl_find_msg (struct loaded_l10nfile *domain_file,
|
|
|
|
struct binding *domainbinding,
|
|
|
|
const char *msgid, int convert,
|
|
|
|
size_t *lengthp)
|
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
{
|
2001-01-09 09:04:59 +08:00
|
|
|
struct loaded_domain *domain;
|
Update.
2002-07-15 Alexandre Oliva <aoliva@redhat.com>
* configure.in (static_nss): Set to `yes' if --disable-shared.
2002-07-23 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (PRI*): Redefine the macros if PRI_MACROS_BROKEN
is set.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/sigcontextinfo.h: New file.
* sysdeps/unix/sysv/linux/ia64/profil-counter.h: Fix profil_counter
arguments.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/alpha/adjtime.c (__adjtimex_internal): Add
alias.
2002-07-21 Bruno Haible <bruno@clisp.org>
* intl/libintl.h (__GNU_GETTEXT_SUPPORTED_REVISION): New macro.
* intl/gettext.h (struct mo_file_header): New fields n_sysdep_segments,
sysdep_segments_offset, n_sysdep_strings, orig_sysdep_tab_offset,
trans_sysdep_tab_offset.
(struct sysdep_segment): New type.
(struct sysdep_string): New type.
(SEGMENTS_END): New macro.
* intl/gettextP.h (struct sysdep_string_desc): New type.
(struct loaded_domain): New fields malloced, n_sysdep_strings,
orig_sysdep_tab, trans_sysdep_tab, must_swap_hash_tab. Make fields
orig_tab, trans_tab, hash_tab to const pointers because they point
into read-only memory.
* intl/loadmsgcat.c: Include stdint.h, inttypes.h, hash-string.h.
(PRI*): Define fallback values.
(get_sysdep_segment_value): New function.
(_nl_load_domain): Distinguish major and minor revision parts. Add
support for minor revision 1 with system dependent strings.
(_nl_unload_domain): Also free the 'malloced' field.
* intl/dcigettext.c (_nl_find_msg): Remove test for domain->hash_size,
now done in loadmsgcat.c. Add support for system dependent strings.
2002-07-27 16:47:23 +08:00
|
|
|
nls_uint32 nstrings;
|
2000-04-28 13:12:30 +08:00
|
|
|
size_t act;
|
|
|
|
char *result;
|
2001-01-05 14:43:17 +08:00
|
|
|
size_t resultlen;
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2004-09-26 12:45:24 +08:00
|
|
|
if (domain_file->decided <= 0)
|
2001-04-10 08:15:08 +08:00
|
|
|
_nl_load_domain (domain_file, domainbinding);
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
if (domain_file->data == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2001-01-09 09:04:59 +08:00
|
|
|
domain = (struct loaded_domain *) domain_file->data;
|
2000-01-22 13:50:49 +08:00
|
|
|
|
Update.
2002-07-15 Alexandre Oliva <aoliva@redhat.com>
* configure.in (static_nss): Set to `yes' if --disable-shared.
2002-07-23 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (PRI*): Redefine the macros if PRI_MACROS_BROKEN
is set.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/sigcontextinfo.h: New file.
* sysdeps/unix/sysv/linux/ia64/profil-counter.h: Fix profil_counter
arguments.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/alpha/adjtime.c (__adjtimex_internal): Add
alias.
2002-07-21 Bruno Haible <bruno@clisp.org>
* intl/libintl.h (__GNU_GETTEXT_SUPPORTED_REVISION): New macro.
* intl/gettext.h (struct mo_file_header): New fields n_sysdep_segments,
sysdep_segments_offset, n_sysdep_strings, orig_sysdep_tab_offset,
trans_sysdep_tab_offset.
(struct sysdep_segment): New type.
(struct sysdep_string): New type.
(SEGMENTS_END): New macro.
* intl/gettextP.h (struct sysdep_string_desc): New type.
(struct loaded_domain): New fields malloced, n_sysdep_strings,
orig_sysdep_tab, trans_sysdep_tab, must_swap_hash_tab. Make fields
orig_tab, trans_tab, hash_tab to const pointers because they point
into read-only memory.
* intl/loadmsgcat.c: Include stdint.h, inttypes.h, hash-string.h.
(PRI*): Define fallback values.
(get_sysdep_segment_value): New function.
(_nl_load_domain): Distinguish major and minor revision parts. Add
support for minor revision 1 with system dependent strings.
(_nl_unload_domain): Also free the 'malloced' field.
* intl/dcigettext.c (_nl_find_msg): Remove test for domain->hash_size,
now done in loadmsgcat.c. Add support for system dependent strings.
2002-07-27 16:47:23 +08:00
|
|
|
nstrings = domain->nstrings;
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
/* Locate the MSGID and its translation. */
|
Update.
2002-07-15 Alexandre Oliva <aoliva@redhat.com>
* configure.in (static_nss): Set to `yes' if --disable-shared.
2002-07-23 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (PRI*): Redefine the macros if PRI_MACROS_BROKEN
is set.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/sigcontextinfo.h: New file.
* sysdeps/unix/sysv/linux/ia64/profil-counter.h: Fix profil_counter
arguments.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/alpha/adjtime.c (__adjtimex_internal): Add
alias.
2002-07-21 Bruno Haible <bruno@clisp.org>
* intl/libintl.h (__GNU_GETTEXT_SUPPORTED_REVISION): New macro.
* intl/gettext.h (struct mo_file_header): New fields n_sysdep_segments,
sysdep_segments_offset, n_sysdep_strings, orig_sysdep_tab_offset,
trans_sysdep_tab_offset.
(struct sysdep_segment): New type.
(struct sysdep_string): New type.
(SEGMENTS_END): New macro.
* intl/gettextP.h (struct sysdep_string_desc): New type.
(struct loaded_domain): New fields malloced, n_sysdep_strings,
orig_sysdep_tab, trans_sysdep_tab, must_swap_hash_tab. Make fields
orig_tab, trans_tab, hash_tab to const pointers because they point
into read-only memory.
* intl/loadmsgcat.c: Include stdint.h, inttypes.h, hash-string.h.
(PRI*): Define fallback values.
(get_sysdep_segment_value): New function.
(_nl_load_domain): Distinguish major and minor revision parts. Add
support for minor revision 1 with system dependent strings.
(_nl_unload_domain): Also free the 'malloced' field.
* intl/dcigettext.c (_nl_find_msg): Remove test for domain->hash_size,
now done in loadmsgcat.c. Add support for system dependent strings.
2002-07-27 16:47:23 +08:00
|
|
|
if (domain->hash_tab != NULL)
|
2000-01-22 13:50:49 +08:00
|
|
|
{
|
|
|
|
/* Use the hashing table. */
|
|
|
|
nls_uint32 len = strlen (msgid);
|
2003-06-12 05:57:23 +08:00
|
|
|
nls_uint32 hash_val = __hash_string (msgid);
|
2000-01-22 13:50:49 +08:00
|
|
|
nls_uint32 idx = hash_val % domain->hash_size;
|
|
|
|
nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
Update.
2002-07-15 Alexandre Oliva <aoliva@redhat.com>
* configure.in (static_nss): Set to `yes' if --disable-shared.
2002-07-23 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (PRI*): Redefine the macros if PRI_MACROS_BROKEN
is set.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/sigcontextinfo.h: New file.
* sysdeps/unix/sysv/linux/ia64/profil-counter.h: Fix profil_counter
arguments.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/alpha/adjtime.c (__adjtimex_internal): Add
alias.
2002-07-21 Bruno Haible <bruno@clisp.org>
* intl/libintl.h (__GNU_GETTEXT_SUPPORTED_REVISION): New macro.
* intl/gettext.h (struct mo_file_header): New fields n_sysdep_segments,
sysdep_segments_offset, n_sysdep_strings, orig_sysdep_tab_offset,
trans_sysdep_tab_offset.
(struct sysdep_segment): New type.
(struct sysdep_string): New type.
(SEGMENTS_END): New macro.
* intl/gettextP.h (struct sysdep_string_desc): New type.
(struct loaded_domain): New fields malloced, n_sysdep_strings,
orig_sysdep_tab, trans_sysdep_tab, must_swap_hash_tab. Make fields
orig_tab, trans_tab, hash_tab to const pointers because they point
into read-only memory.
* intl/loadmsgcat.c: Include stdint.h, inttypes.h, hash-string.h.
(PRI*): Define fallback values.
(get_sysdep_segment_value): New function.
(_nl_load_domain): Distinguish major and minor revision parts. Add
support for minor revision 1 with system dependent strings.
(_nl_unload_domain): Also free the 'malloced' field.
* intl/dcigettext.c (_nl_find_msg): Remove test for domain->hash_size,
now done in loadmsgcat.c. Add support for system dependent strings.
2002-07-27 16:47:23 +08:00
|
|
|
nls_uint32 nstr =
|
|
|
|
W (domain->must_swap_hash_tab, domain->hash_tab[idx]);
|
Update.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain) [!_LIBC]: Use fstat, not fstat64.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (struct expression): Add operators lnot, less_than,
greater_than, less_or_equal, greater_or_equal. Replace args2/args3
union by a 'nargs' counter and an 'args[]' array.
* intl/plural.y: Don't include stdarg.h.
(new_exp): Take an array of arguments instead of varargs.
(new_exp_0, new_exp_1, new_exp_2, new_exp_3): New functions.
('?' ':'): Make right-associative.
(EQUOP2): New token, replaces '=' and '!'.
(CMPOP2): New token.
(ADDOP2): New token, replaces '+' and '-'.
(MULOP2): New token, replaces '*', '/' and '%'.
('!'): New token.
(exp): Add rules for CMPOP2 and '!'. Don't call YYABORT.
(start): Call YYABORT here.
(FREE_EXPRESSION): Update.
(yylex): Don't skip "\\n". Recognize comparison and '!' operators.
Update for new token symbols.
* intl/loadmsgcat.c (plvar, plone, germanic_plural,
init_germanic_plural): Update.
* intl/dcigettext.c (_nl_find_msg): Optimize for space.
(plural_eval): Recognize comparison and '!' operators. Optimize for
space.
2001-03-10 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain): locale_charset() doesn't return
NULL any more.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c: Include headers needed for alloca().
(freea): New macro.
(_nl_load_domain): Add fallback code for platforms lacking alloca.
* intl/localealias.c: (ADD_BLOCK, FREE_BLOCK): Remove macros.
(freea): New macro.
(read_alias_file): Simplify fallback code for platforms lacking
alloca.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (__gettextdebug): Remove declaration.
(__gettext_free_exp, __gettextparse): Convert prototype to K&R C
syntax.
(gettext_free_exp__, gettextparse__): New non-libc declarations.
* intl/plural.y [!_LIBC]: Define gettextparse__, gettext_free_exp__,
not __gettextparse, __gettext_free_exp.
* intl/loadmsgcat.c [!_LIBC]: Use gettextparse__, not __gettextparse.
2001-02-24 Bruno Haible <haible@clisp.cons.org>
* intl/dcigettext.c: Update comment about HAVE_LOCALE_NULL.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/loadmsgcat.c (_nl_load_domain): Add fallback code for platforms
lacking strtoul, like SunOS4.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/l10nflist.c (_nl_normalize_codeset): Use tolower, not _tolower.
2001-01-05 Bruno Haible <haible@clisp.cons.org>
* intl/bindtextdom.c (set_binding_values): Convert prototype to K&R C
syntax.
* intl/dcigettext.c (transcmp): Convert to K&R C syntax.
* intl/explodename.c (_nl_find_language): Convert to K&R C syntax.
* intl/plural.y (__gettext_free_exp, yylex, yyerror): Convert to K&R C
syntax.
2001-01-07 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (gettext__, dgettext__, dcgettext__, textdomain__,
bindtextdomain__, bind_textdomain_codeset__): New declarations, from
old libgettext.h.
* intl/bindtextdom.c: Include libgnuintl.h instead of libgettext.h.
* intl/dcgettext.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dcngettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/textdomain.c: Likewise.
* intl/dgettext.c: Include libgnuintl.h instead of libgettext.h.
Include gettextP.h.
* intl/gettext.c: Likewise. Don't include locale.h.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h (ZERO): New macro.
(struct binding): Always use ZERO.
* intl/bindtextdom.c (offsetof): Provide fallback for platforms that
lack it, like SunOS4.
(set_binding_values): Use offsetof, not sizeof.
* intl/dcigettext.c (offsetof): Provide fallback for platforms that
lack it, like SunOS4.
(ZERO): Remove macro.
(struct transmem_list): Use ZERO.
(DCIGETTEXT): Use offsetof, not sizeof.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettextP.h: Include <stddef.h>. Include gettext.h, for
nls_uint32.
* intl/bindtextdom.c: Don't include gettext.h.
* intl/dcgettext.c: Likewise.
* intl/dcigettext.c: Likewise.
* intl/dcngettext.c: Likewise.
* intl/dngettext.c: Likewise.
* intl/finddomain.c: Likewise.
* intl/localealias.c: Likewise.
* intl/ngettext.c: Likewise.
* intl/plural.y: Likewise.
* intl/textdomain.c: Likewise.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/gettext.h: Don't include <stdio.h>.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/Makefile (CPPFLAGS): Set LOCALEDIR instead of GNULOCALEDIR.
* intl/dcigettext.c (_nl_default_dirname): Initialize with LOCALEDIR.
2001-03-20 09:00:20 +08:00
|
|
|
|
|
|
|
if (nstr == 0)
|
|
|
|
/* Hash table entry is empty. */
|
|
|
|
return NULL;
|
|
|
|
|
Update.
2002-07-15 Alexandre Oliva <aoliva@redhat.com>
* configure.in (static_nss): Set to `yes' if --disable-shared.
2002-07-23 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (PRI*): Redefine the macros if PRI_MACROS_BROKEN
is set.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/sigcontextinfo.h: New file.
* sysdeps/unix/sysv/linux/ia64/profil-counter.h: Fix profil_counter
arguments.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/alpha/adjtime.c (__adjtimex_internal): Add
alias.
2002-07-21 Bruno Haible <bruno@clisp.org>
* intl/libintl.h (__GNU_GETTEXT_SUPPORTED_REVISION): New macro.
* intl/gettext.h (struct mo_file_header): New fields n_sysdep_segments,
sysdep_segments_offset, n_sysdep_strings, orig_sysdep_tab_offset,
trans_sysdep_tab_offset.
(struct sysdep_segment): New type.
(struct sysdep_string): New type.
(SEGMENTS_END): New macro.
* intl/gettextP.h (struct sysdep_string_desc): New type.
(struct loaded_domain): New fields malloced, n_sysdep_strings,
orig_sysdep_tab, trans_sysdep_tab, must_swap_hash_tab. Make fields
orig_tab, trans_tab, hash_tab to const pointers because they point
into read-only memory.
* intl/loadmsgcat.c: Include stdint.h, inttypes.h, hash-string.h.
(PRI*): Define fallback values.
(get_sysdep_segment_value): New function.
(_nl_load_domain): Distinguish major and minor revision parts. Add
support for minor revision 1 with system dependent strings.
(_nl_unload_domain): Also free the 'malloced' field.
* intl/dcigettext.c (_nl_find_msg): Remove test for domain->hash_size,
now done in loadmsgcat.c. Add support for system dependent strings.
2002-07-27 16:47:23 +08:00
|
|
|
nstr--;
|
|
|
|
|
|
|
|
/* Compare msgid with the original string at index nstr.
|
2001-01-05 14:43:17 +08:00
|
|
|
We compare the lengths with >=, not ==, because plural entries
|
|
|
|
are represented by strings with an embedded NUL. */
|
Update.
2002-07-15 Alexandre Oliva <aoliva@redhat.com>
* configure.in (static_nss): Set to `yes' if --disable-shared.
2002-07-23 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (PRI*): Redefine the macros if PRI_MACROS_BROKEN
is set.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/sigcontextinfo.h: New file.
* sysdeps/unix/sysv/linux/ia64/profil-counter.h: Fix profil_counter
arguments.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/alpha/adjtime.c (__adjtimex_internal): Add
alias.
2002-07-21 Bruno Haible <bruno@clisp.org>
* intl/libintl.h (__GNU_GETTEXT_SUPPORTED_REVISION): New macro.
* intl/gettext.h (struct mo_file_header): New fields n_sysdep_segments,
sysdep_segments_offset, n_sysdep_strings, orig_sysdep_tab_offset,
trans_sysdep_tab_offset.
(struct sysdep_segment): New type.
(struct sysdep_string): New type.
(SEGMENTS_END): New macro.
* intl/gettextP.h (struct sysdep_string_desc): New type.
(struct loaded_domain): New fields malloced, n_sysdep_strings,
orig_sysdep_tab, trans_sysdep_tab, must_swap_hash_tab. Make fields
orig_tab, trans_tab, hash_tab to const pointers because they point
into read-only memory.
* intl/loadmsgcat.c: Include stdint.h, inttypes.h, hash-string.h.
(PRI*): Define fallback values.
(get_sysdep_segment_value): New function.
(_nl_load_domain): Distinguish major and minor revision parts. Add
support for minor revision 1 with system dependent strings.
(_nl_unload_domain): Also free the 'malloced' field.
* intl/dcigettext.c (_nl_find_msg): Remove test for domain->hash_size,
now done in loadmsgcat.c. Add support for system dependent strings.
2002-07-27 16:47:23 +08:00
|
|
|
if (nstr < nstrings
|
|
|
|
? W (domain->must_swap, domain->orig_tab[nstr].length) >= len
|
|
|
|
&& (strcmp (msgid,
|
|
|
|
domain->data + W (domain->must_swap,
|
|
|
|
domain->orig_tab[nstr].offset))
|
|
|
|
== 0)
|
|
|
|
: domain->orig_sysdep_tab[nstr - nstrings].length > len
|
|
|
|
&& (strcmp (msgid,
|
|
|
|
domain->orig_sysdep_tab[nstr - nstrings].pointer)
|
|
|
|
== 0))
|
2001-01-05 14:43:17 +08:00
|
|
|
{
|
Update.
2002-07-15 Alexandre Oliva <aoliva@redhat.com>
* configure.in (static_nss): Set to `yes' if --disable-shared.
2002-07-23 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (PRI*): Redefine the macros if PRI_MACROS_BROKEN
is set.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/sigcontextinfo.h: New file.
* sysdeps/unix/sysv/linux/ia64/profil-counter.h: Fix profil_counter
arguments.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/alpha/adjtime.c (__adjtimex_internal): Add
alias.
2002-07-21 Bruno Haible <bruno@clisp.org>
* intl/libintl.h (__GNU_GETTEXT_SUPPORTED_REVISION): New macro.
* intl/gettext.h (struct mo_file_header): New fields n_sysdep_segments,
sysdep_segments_offset, n_sysdep_strings, orig_sysdep_tab_offset,
trans_sysdep_tab_offset.
(struct sysdep_segment): New type.
(struct sysdep_string): New type.
(SEGMENTS_END): New macro.
* intl/gettextP.h (struct sysdep_string_desc): New type.
(struct loaded_domain): New fields malloced, n_sysdep_strings,
orig_sysdep_tab, trans_sysdep_tab, must_swap_hash_tab. Make fields
orig_tab, trans_tab, hash_tab to const pointers because they point
into read-only memory.
* intl/loadmsgcat.c: Include stdint.h, inttypes.h, hash-string.h.
(PRI*): Define fallback values.
(get_sysdep_segment_value): New function.
(_nl_load_domain): Distinguish major and minor revision parts. Add
support for minor revision 1 with system dependent strings.
(_nl_unload_domain): Also free the 'malloced' field.
* intl/dcigettext.c (_nl_find_msg): Remove test for domain->hash_size,
now done in loadmsgcat.c. Add support for system dependent strings.
2002-07-27 16:47:23 +08:00
|
|
|
act = nstr;
|
2001-01-05 14:43:17 +08:00
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
if (idx >= domain->hash_size - incr)
|
|
|
|
idx -= domain->hash_size - incr;
|
|
|
|
else
|
|
|
|
idx += incr;
|
|
|
|
}
|
|
|
|
/* NOTREACHED */
|
|
|
|
}
|
2000-04-28 13:12:30 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Try the default method: binary search in the sorted array of
|
|
|
|
messages. */
|
|
|
|
size_t top, bottom;
|
|
|
|
|
|
|
|
bottom = 0;
|
Update.
2002-07-15 Alexandre Oliva <aoliva@redhat.com>
* configure.in (static_nss): Set to `yes' if --disable-shared.
2002-07-23 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (PRI*): Redefine the macros if PRI_MACROS_BROKEN
is set.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/sigcontextinfo.h: New file.
* sysdeps/unix/sysv/linux/ia64/profil-counter.h: Fix profil_counter
arguments.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/alpha/adjtime.c (__adjtimex_internal): Add
alias.
2002-07-21 Bruno Haible <bruno@clisp.org>
* intl/libintl.h (__GNU_GETTEXT_SUPPORTED_REVISION): New macro.
* intl/gettext.h (struct mo_file_header): New fields n_sysdep_segments,
sysdep_segments_offset, n_sysdep_strings, orig_sysdep_tab_offset,
trans_sysdep_tab_offset.
(struct sysdep_segment): New type.
(struct sysdep_string): New type.
(SEGMENTS_END): New macro.
* intl/gettextP.h (struct sysdep_string_desc): New type.
(struct loaded_domain): New fields malloced, n_sysdep_strings,
orig_sysdep_tab, trans_sysdep_tab, must_swap_hash_tab. Make fields
orig_tab, trans_tab, hash_tab to const pointers because they point
into read-only memory.
* intl/loadmsgcat.c: Include stdint.h, inttypes.h, hash-string.h.
(PRI*): Define fallback values.
(get_sysdep_segment_value): New function.
(_nl_load_domain): Distinguish major and minor revision parts. Add
support for minor revision 1 with system dependent strings.
(_nl_unload_domain): Also free the 'malloced' field.
* intl/dcigettext.c (_nl_find_msg): Remove test for domain->hash_size,
now done in loadmsgcat.c. Add support for system dependent strings.
2002-07-27 16:47:23 +08:00
|
|
|
top = nstrings;
|
2000-04-28 13:12:30 +08:00
|
|
|
while (bottom < top)
|
|
|
|
{
|
|
|
|
int cmp_val;
|
|
|
|
|
|
|
|
act = (bottom + top) / 2;
|
|
|
|
cmp_val = strcmp (msgid, (domain->data
|
|
|
|
+ W (domain->must_swap,
|
|
|
|
domain->orig_tab[act].offset)));
|
|
|
|
if (cmp_val < 0)
|
|
|
|
top = act;
|
|
|
|
else if (cmp_val > 0)
|
|
|
|
bottom = act + 1;
|
|
|
|
else
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
/* No translation was found. */
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2000-04-28 13:12:30 +08:00
|
|
|
found:
|
|
|
|
/* The translation was found at index ACT. If we have to convert the
|
|
|
|
string to use a different character set, this is the time. */
|
Update.
2002-07-15 Alexandre Oliva <aoliva@redhat.com>
* configure.in (static_nss): Set to `yes' if --disable-shared.
2002-07-23 Bruno Haible <bruno@clisp.org>
* intl/loadmsgcat.c (PRI*): Redefine the macros if PRI_MACROS_BROKEN
is set.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/sigcontextinfo.h: New file.
* sysdeps/unix/sysv/linux/ia64/profil-counter.h: Fix profil_counter
arguments.
2002-07-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/alpha/adjtime.c (__adjtimex_internal): Add
alias.
2002-07-21 Bruno Haible <bruno@clisp.org>
* intl/libintl.h (__GNU_GETTEXT_SUPPORTED_REVISION): New macro.
* intl/gettext.h (struct mo_file_header): New fields n_sysdep_segments,
sysdep_segments_offset, n_sysdep_strings, orig_sysdep_tab_offset,
trans_sysdep_tab_offset.
(struct sysdep_segment): New type.
(struct sysdep_string): New type.
(SEGMENTS_END): New macro.
* intl/gettextP.h (struct sysdep_string_desc): New type.
(struct loaded_domain): New fields malloced, n_sysdep_strings,
orig_sysdep_tab, trans_sysdep_tab, must_swap_hash_tab. Make fields
orig_tab, trans_tab, hash_tab to const pointers because they point
into read-only memory.
* intl/loadmsgcat.c: Include stdint.h, inttypes.h, hash-string.h.
(PRI*): Define fallback values.
(get_sysdep_segment_value): New function.
(_nl_load_domain): Distinguish major and minor revision parts. Add
support for minor revision 1 with system dependent strings.
(_nl_unload_domain): Also free the 'malloced' field.
* intl/dcigettext.c (_nl_find_msg): Remove test for domain->hash_size,
now done in loadmsgcat.c. Add support for system dependent strings.
2002-07-27 16:47:23 +08:00
|
|
|
if (act < nstrings)
|
|
|
|
{
|
|
|
|
result = (char *)
|
|
|
|
(domain->data + W (domain->must_swap, domain->trans_tab[act].offset));
|
|
|
|
resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer;
|
|
|
|
resultlen = domain->trans_sysdep_tab[act - nstrings].length;
|
|
|
|
}
|
2000-04-28 13:12:30 +08:00
|
|
|
|
|
|
|
#if defined _LIBC || HAVE_ICONV
|
2014-12-10 20:03:53 +08:00
|
|
|
# ifdef IN_LIBGLOCALE
|
|
|
|
if (encoding != NULL)
|
|
|
|
# else
|
2005-04-05 06:37:38 +08:00
|
|
|
if (convert)
|
2014-12-10 20:03:53 +08:00
|
|
|
# endif
|
2001-04-10 08:15:08 +08:00
|
|
|
{
|
2005-04-05 06:37:38 +08:00
|
|
|
/* We are supposed to do a conversion. */
|
2014-12-10 20:03:53 +08:00
|
|
|
# ifndef IN_LIBGLOCALE
|
2005-04-05 06:37:38 +08:00
|
|
|
const char *encoding = get_output_charset (domainbinding);
|
2014-12-10 20:03:53 +08:00
|
|
|
# endif
|
|
|
|
size_t nconversions;
|
|
|
|
struct converted_domain *convd;
|
|
|
|
size_t i;
|
2005-04-05 06:37:38 +08:00
|
|
|
|
2007-09-25 00:09:09 +08:00
|
|
|
/* Protect against reallocation of the table. */
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_rdlock (domain->conversions_lock);
|
2007-09-25 00:09:09 +08:00
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
/* Search whether a table with converted translations for this
|
|
|
|
encoding has already been allocated. */
|
2014-12-10 20:03:53 +08:00
|
|
|
nconversions = domain->nconversions;
|
|
|
|
convd = NULL;
|
2005-04-05 06:37:38 +08:00
|
|
|
|
|
|
|
for (i = nconversions; i > 0; )
|
|
|
|
{
|
|
|
|
i--;
|
|
|
|
if (strcmp (domain->conversions[i].encoding, encoding) == 0)
|
|
|
|
{
|
|
|
|
convd = &domain->conversions[i];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2007-07-13 02:26:36 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_unlock (domain->conversions_lock);
|
2007-09-25 00:09:09 +08:00
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
if (convd == NULL)
|
|
|
|
{
|
2007-09-25 00:09:09 +08:00
|
|
|
/* We have to allocate a new conversions table. */
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_wrlock (domain->conversions_lock);
|
2008-03-31 07:40:18 +08:00
|
|
|
nconversions = domain->nconversions;
|
2007-09-25 00:09:09 +08:00
|
|
|
|
|
|
|
/* Maybe in the meantime somebody added the translation.
|
|
|
|
Recheck. */
|
|
|
|
for (i = nconversions; i > 0; )
|
|
|
|
{
|
|
|
|
i--;
|
|
|
|
if (strcmp (domain->conversions[i].encoding, encoding) == 0)
|
|
|
|
{
|
|
|
|
convd = &domain->conversions[i];
|
|
|
|
goto found_convd;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
{
|
|
|
|
/* Allocate a table for the converted translations for this
|
|
|
|
encoding. */
|
|
|
|
struct converted_domain *new_conversions =
|
|
|
|
(struct converted_domain *)
|
|
|
|
(domain->conversions != NULL
|
|
|
|
? realloc (domain->conversions,
|
|
|
|
(nconversions + 1) * sizeof (struct converted_domain))
|
|
|
|
: malloc ((nconversions + 1) * sizeof (struct converted_domain)));
|
|
|
|
|
|
|
|
if (__builtin_expect (new_conversions == NULL, 0))
|
|
|
|
{
|
|
|
|
/* Nothing we can do, no more memory. We cannot use the
|
|
|
|
translation because it might be encoded incorrectly. */
|
|
|
|
unlock_fail:
|
|
|
|
gl_rwlock_unlock (domain->conversions_lock);
|
|
|
|
return (char *) -1;
|
|
|
|
}
|
2005-04-05 06:37:38 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
domain->conversions = new_conversions;
|
|
|
|
|
|
|
|
/* Copy the 'encoding' string to permanent storage. */
|
|
|
|
encoding = strdup (encoding);
|
|
|
|
if (__builtin_expect (encoding == NULL, 0))
|
2007-09-25 00:09:09 +08:00
|
|
|
/* Nothing we can do, no more memory. We cannot use the
|
|
|
|
translation because it might be encoded incorrectly. */
|
2014-12-10 20:03:53 +08:00
|
|
|
goto unlock_fail;
|
2005-04-05 06:37:38 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
convd = &new_conversions[nconversions];
|
|
|
|
convd->encoding = encoding;
|
2005-04-05 06:37:38 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* Find out about the character set the file is encoded with.
|
|
|
|
This can be found (in textual form) in the entry "". If this
|
|
|
|
entry does not exist or if this does not contain the 'charset='
|
|
|
|
information, we will assume the charset matches the one the
|
|
|
|
current locale and we don't have to perform any conversion. */
|
2007-07-13 02:26:36 +08:00
|
|
|
# ifdef _LIBC
|
2014-12-10 20:03:53 +08:00
|
|
|
convd->conv = (__gconv_t) -1;
|
2007-07-13 02:26:36 +08:00
|
|
|
# else
|
|
|
|
# if HAVE_ICONV
|
2014-12-10 20:03:53 +08:00
|
|
|
convd->conv = (iconv_t) -1;
|
2007-07-13 02:26:36 +08:00
|
|
|
# endif
|
|
|
|
# endif
|
2014-12-10 20:03:53 +08:00
|
|
|
{
|
|
|
|
char *nullentry;
|
|
|
|
size_t nullentrylen;
|
|
|
|
|
|
|
|
/* Get the header entry. This is a recursion, but it doesn't
|
|
|
|
reallocate domain->conversions because we pass
|
|
|
|
encoding = NULL or convert = 0, respectively. */
|
|
|
|
nullentry =
|
|
|
|
# ifdef IN_LIBGLOCALE
|
|
|
|
_nl_find_msg (domain_file, domainbinding, NULL, "",
|
|
|
|
&nullentrylen);
|
|
|
|
# else
|
|
|
|
_nl_find_msg (domain_file, domainbinding, "", 0, &nullentrylen);
|
|
|
|
# endif
|
2005-04-05 06:37:38 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* Resource problems are fatal. If we continue onwards we will
|
|
|
|
only attempt to calloc a new conv_tab and fail later. */
|
|
|
|
if (__builtin_expect (nullentry == (char *) -1, 0))
|
|
|
|
return (char *) -1;
|
Fix _nl_find_msg malloc failure case, and callers.
This patch fixes two issues, and perhaps should be two distinct commits,
but I present it here as one for the sake of completeness.
Commit 006dd86111c44572dbd3b26e9c63dd0f834d7762 fails to check malloc's
return in intl/dcigettext.c (_nl_find_msg):
~~~
freemem_size = INITIAL_BLOCK_SIZE;
newmem = (transmem_block_t *) malloc (freemem_size);
...
newmem->next = transmem_list;
transmem_list = newmem;
~~~
If malloc fails then newmem is NULL then newmem->next results in a
fault.
The fix is easy enough, check for newmem != NULL, and fall through to
the error condition below which returns (char *) -1 e.g. resource error.
The problem is that returning (char *) -1 will break all sorts of other
code, so while what we did is correct, the real failure case fix is
slightly broader.
There are 4 other places where _nl_find_msg is called, one is OK, the
other three are fixed to handle -1 error return value.
No regressions on x86-64 or x86.
However, no regressions isn't really a useful metric for this code.
The change was tested as documented here:
http://sourceware.org/glibc/wiki/Testing/WhiteBox
using SystemTap for fault injection to simulate malloc failure.
---
2013-05-03 Carlos O'Donell <carlos at redhat.com>
[BZ #15441]
* intl/dcigettext.c (DCIGETTEXT): Skip translating if _nl_find_msg
returns -1.
(_nl_find_msg): Return -1 if recursive call returned -1. If newmem is
null return -1.
* intl/loadmsgcat.c (_nl_load_domain): If _nl_find_msg returns -1 abort
loading the domain.
2013-05-23 02:50:26 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
if (nullentry != NULL)
|
|
|
|
{
|
|
|
|
const char *charsetstr;
|
2005-04-05 06:37:38 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
charsetstr = strstr (nullentry, "charset=");
|
|
|
|
if (charsetstr != NULL)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
char *charset;
|
|
|
|
const char *outcharset;
|
2005-04-05 06:37:38 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
charsetstr += strlen ("charset=");
|
|
|
|
len = strcspn (charsetstr, " \t\n");
|
2005-04-05 06:37:38 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
charset = (char *) alloca (len + 1);
|
2005-04-05 06:37:38 +08:00
|
|
|
# if defined _LIBC || HAVE_MEMPCPY
|
2014-12-10 20:03:53 +08:00
|
|
|
*((char *) mempcpy (charset, charsetstr, len)) = '\0';
|
2005-04-05 06:37:38 +08:00
|
|
|
# else
|
2014-12-10 20:03:53 +08:00
|
|
|
memcpy (charset, charsetstr, len);
|
|
|
|
charset[len] = '\0';
|
2005-04-05 06:37:38 +08:00
|
|
|
# endif
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
outcharset = encoding;
|
2005-04-05 06:37:38 +08:00
|
|
|
|
|
|
|
# ifdef _LIBC
|
2014-12-10 20:03:53 +08:00
|
|
|
/* We always want to use transliteration. */
|
|
|
|
outcharset = norm_add_slashes (outcharset, "TRANSLIT");
|
|
|
|
charset = norm_add_slashes (charset, "");
|
|
|
|
int r = __gconv_open (outcharset, charset, &convd->conv,
|
|
|
|
GCONV_AVOID_NOCONV);
|
|
|
|
if (__builtin_expect (r != __GCONV_OK, 0))
|
|
|
|
{
|
|
|
|
/* If the output encoding is the same there is
|
|
|
|
nothing to do. Otherwise do not use the
|
|
|
|
translation at all. */
|
|
|
|
if (__builtin_expect (r != __GCONV_NULCONV, 1))
|
|
|
|
{
|
|
|
|
gl_rwlock_unlock (domain->conversions_lock);
|
|
|
|
free ((char *) encoding);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
convd->conv = (__gconv_t) -1;
|
|
|
|
}
|
2005-04-05 06:37:38 +08:00
|
|
|
# else
|
|
|
|
# if HAVE_ICONV
|
2014-12-10 20:03:53 +08:00
|
|
|
/* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
|
|
|
|
we want to use transliteration. */
|
|
|
|
# if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \
|
|
|
|
&& !defined __UCLIBC__) \
|
2005-04-05 06:37:38 +08:00
|
|
|
|| _LIBICONV_VERSION >= 0x0105
|
2014-12-10 20:03:53 +08:00
|
|
|
if (strchr (outcharset, '/') == NULL)
|
|
|
|
{
|
|
|
|
char *tmp;
|
2005-04-05 06:37:38 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
len = strlen (outcharset);
|
|
|
|
tmp = (char *) alloca (len + 10 + 1);
|
|
|
|
memcpy (tmp, outcharset, len);
|
|
|
|
memcpy (tmp + len, "//TRANSLIT", 10 + 1);
|
|
|
|
outcharset = tmp;
|
2005-04-05 06:37:38 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
convd->conv = iconv_open (outcharset, charset);
|
2005-04-05 06:37:38 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
freea (outcharset);
|
|
|
|
}
|
|
|
|
else
|
2005-04-05 06:37:38 +08:00
|
|
|
# endif
|
2014-12-10 20:03:53 +08:00
|
|
|
convd->conv = iconv_open (outcharset, charset);
|
2005-04-05 06:37:38 +08:00
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
freea (charset);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
convd->conv_tab = NULL;
|
|
|
|
/* Here domain->conversions is still == new_conversions. */
|
|
|
|
domain->nconversions++;
|
2005-04-05 06:37:38 +08:00
|
|
|
}
|
2007-09-25 00:09:09 +08:00
|
|
|
|
|
|
|
found_convd:
|
2014-12-10 20:03:53 +08:00
|
|
|
gl_rwlock_unlock (domain->conversions_lock);
|
2005-04-05 06:37:38 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (
|
|
|
|
# ifdef _LIBC
|
|
|
|
convd->conv != (__gconv_t) -1
|
|
|
|
# else
|
|
|
|
# if HAVE_ICONV
|
|
|
|
convd->conv != (iconv_t) -1
|
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
)
|
2000-04-28 13:12:30 +08:00
|
|
|
{
|
2005-04-05 06:37:38 +08:00
|
|
|
/* We are supposed to do a conversion. First allocate an
|
|
|
|
appropriate table with the same structure as the table
|
|
|
|
of translations in the file, where we can put the pointers
|
|
|
|
to the converted strings in.
|
|
|
|
There is a slight complication with plural entries. They
|
|
|
|
are represented by consecutive NUL terminated strings. We
|
|
|
|
handle this case by converting RESULTLEN bytes, including
|
|
|
|
NULs. */
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* This lock primarily protects the memory management variables
|
|
|
|
freemem, freemem_size. It also protects write accesses to
|
|
|
|
convd->conv_tab. It's not worth using a separate lock (such
|
|
|
|
as domain->conversions_lock) for this purpose, because when
|
|
|
|
modifying convd->conv_tab, we also need to lock freemem,
|
|
|
|
freemem_size for most of the time. */
|
|
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
|
|
|
|
if (__builtin_expect (convd->conv_tab == NULL, 0))
|
2008-03-31 07:40:18 +08:00
|
|
|
{
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
if (convd->conv_tab == NULL)
|
|
|
|
{
|
2014-12-10 20:03:53 +08:00
|
|
|
convd->conv_tab =
|
|
|
|
(char **) calloc (nstrings + domain->n_sysdep_strings,
|
|
|
|
sizeof (char *));
|
2008-03-31 07:40:18 +08:00
|
|
|
if (convd->conv_tab != NULL)
|
|
|
|
goto not_translated_yet;
|
|
|
|
/* Mark that we didn't succeed allocating a table. */
|
|
|
|
convd->conv_tab = (char **) -1;
|
|
|
|
}
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
}
|
2005-04-05 06:37:38 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
if (__builtin_expect (convd->conv_tab == (char **) -1, 0))
|
2006-06-23 07:59:32 +08:00
|
|
|
/* Nothing we can do, no more memory. We cannot use the
|
|
|
|
translation because it might be encoded incorrectly. */
|
|
|
|
return (char *) -1;
|
2005-04-05 06:37:38 +08:00
|
|
|
|
|
|
|
if (convd->conv_tab[act] == NULL)
|
|
|
|
{
|
|
|
|
/* We haven't used this string so far, so it is not
|
|
|
|
translated yet. Do this now. */
|
|
|
|
/* We use a bit more efficient memory handling.
|
|
|
|
We allocate always larger blocks which get used over
|
|
|
|
time. This is faster than many small allocations. */
|
2001-01-05 14:43:17 +08:00
|
|
|
# define INITIAL_BLOCK_SIZE 4080
|
2005-04-05 06:37:38 +08:00
|
|
|
static unsigned char *freemem;
|
|
|
|
static size_t freemem_size;
|
2000-04-28 13:12:30 +08:00
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
const unsigned char *inbuf;
|
|
|
|
unsigned char *outbuf;
|
|
|
|
int malloc_count;
|
2001-01-05 14:43:17 +08:00
|
|
|
# ifndef _LIBC
|
2014-12-10 20:03:53 +08:00
|
|
|
transmem_block_t *transmem_list;
|
2001-01-05 14:43:17 +08:00
|
|
|
# endif
|
2000-04-28 13:12:30 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
__libc_lock_lock (lock);
|
|
|
|
not_translated_yet:
|
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
inbuf = (const unsigned char *) result;
|
|
|
|
outbuf = freemem + sizeof (size_t);
|
2014-12-10 20:03:53 +08:00
|
|
|
# ifndef _LIBC
|
|
|
|
transmem_list = NULL;
|
|
|
|
# endif
|
2000-05-08 05:23:56 +08:00
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
malloc_count = 0;
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
transmem_block_t *newmem;
|
2000-04-28 13:12:30 +08:00
|
|
|
# ifdef _LIBC
|
2005-04-05 06:37:38 +08:00
|
|
|
size_t non_reversible;
|
|
|
|
int res;
|
2000-05-04 10:46:54 +08:00
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
if (freemem_size < sizeof (size_t))
|
|
|
|
goto resize_freemem;
|
2000-05-08 05:23:56 +08:00
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
res = __gconv (convd->conv,
|
|
|
|
&inbuf, inbuf + resultlen,
|
|
|
|
&outbuf,
|
|
|
|
outbuf + freemem_size - sizeof (size_t),
|
|
|
|
&non_reversible);
|
2000-05-04 10:46:54 +08:00
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
|
|
|
|
break;
|
2000-05-04 10:46:54 +08:00
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
if (res != __GCONV_FULL_OUTPUT)
|
|
|
|
{
|
2006-06-23 07:59:32 +08:00
|
|
|
/* We should not use the translation at all, it
|
|
|
|
is incorrectly encoded. */
|
2005-04-05 06:37:38 +08:00
|
|
|
__libc_lock_unlock (lock);
|
2006-06-23 07:59:32 +08:00
|
|
|
return NULL;
|
2005-04-05 06:37:38 +08:00
|
|
|
}
|
2000-05-04 10:46:54 +08:00
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
inbuf = (const unsigned char *) result;
|
2000-04-28 13:12:30 +08:00
|
|
|
# else
|
|
|
|
# if HAVE_ICONV
|
2005-04-05 06:37:38 +08:00
|
|
|
const char *inptr = (const char *) inbuf;
|
|
|
|
size_t inleft = resultlen;
|
|
|
|
char *outptr = (char *) outbuf;
|
|
|
|
size_t outleft;
|
|
|
|
|
|
|
|
if (freemem_size < sizeof (size_t))
|
|
|
|
goto resize_freemem;
|
|
|
|
|
|
|
|
outleft = freemem_size - sizeof (size_t);
|
|
|
|
if (iconv (convd->conv,
|
|
|
|
(ICONV_CONST char **) &inptr, &inleft,
|
|
|
|
&outptr, &outleft)
|
|
|
|
!= (size_t) (-1))
|
|
|
|
{
|
|
|
|
outbuf = (unsigned char *) outptr;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (errno != E2BIG)
|
|
|
|
{
|
|
|
|
__libc_lock_unlock (lock);
|
2006-06-23 07:59:32 +08:00
|
|
|
return NULL;
|
2005-04-05 06:37:38 +08:00
|
|
|
}
|
2000-05-04 10:46:54 +08:00
|
|
|
# endif
|
|
|
|
# endif
|
2000-04-28 13:12:30 +08:00
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
resize_freemem:
|
|
|
|
/* We must allocate a new buffer or resize the old one. */
|
|
|
|
if (malloc_count > 0)
|
|
|
|
{
|
|
|
|
++malloc_count;
|
|
|
|
freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
|
|
|
|
newmem = (transmem_block_t *) realloc (transmem_list,
|
|
|
|
freemem_size);
|
2001-01-05 14:43:17 +08:00
|
|
|
# ifdef _LIBC
|
2005-04-05 06:37:38 +08:00
|
|
|
if (newmem != NULL)
|
2012-06-22 07:15:38 +08:00
|
|
|
transmem_list = newmem;
|
2005-04-05 06:37:38 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
struct transmem_list *old = transmem_list;
|
|
|
|
|
|
|
|
transmem_list = transmem_list->next;
|
|
|
|
free (old);
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
}
|
2001-01-05 14:43:17 +08:00
|
|
|
else
|
|
|
|
{
|
2005-04-05 06:37:38 +08:00
|
|
|
malloc_count = 1;
|
|
|
|
freemem_size = INITIAL_BLOCK_SIZE;
|
|
|
|
newmem = (transmem_block_t *) malloc (freemem_size);
|
2012-06-22 07:15:38 +08:00
|
|
|
# ifdef _LIBC
|
Fix _nl_find_msg malloc failure case, and callers.
This patch fixes two issues, and perhaps should be two distinct commits,
but I present it here as one for the sake of completeness.
Commit 006dd86111c44572dbd3b26e9c63dd0f834d7762 fails to check malloc's
return in intl/dcigettext.c (_nl_find_msg):
~~~
freemem_size = INITIAL_BLOCK_SIZE;
newmem = (transmem_block_t *) malloc (freemem_size);
...
newmem->next = transmem_list;
transmem_list = newmem;
~~~
If malloc fails then newmem is NULL then newmem->next results in a
fault.
The fix is easy enough, check for newmem != NULL, and fall through to
the error condition below which returns (char *) -1 e.g. resource error.
The problem is that returning (char *) -1 will break all sorts of other
code, so while what we did is correct, the real failure case fix is
slightly broader.
There are 4 other places where _nl_find_msg is called, one is OK, the
other three are fixed to handle -1 error return value.
No regressions on x86-64 or x86.
However, no regressions isn't really a useful metric for this code.
The change was tested as documented here:
http://sourceware.org/glibc/wiki/Testing/WhiteBox
using SystemTap for fault injection to simulate malloc failure.
---
2013-05-03 Carlos O'Donell <carlos at redhat.com>
[BZ #15441]
* intl/dcigettext.c (DCIGETTEXT): Skip translating if _nl_find_msg
returns -1.
(_nl_find_msg): Return -1 if recursive call returned -1. If newmem is
null return -1.
* intl/loadmsgcat.c (_nl_load_domain): If _nl_find_msg returns -1 abort
loading the domain.
2013-05-23 02:50:26 +08:00
|
|
|
if (newmem != NULL)
|
|
|
|
{
|
|
|
|
/* Add the block to the list of blocks we have to free
|
|
|
|
at some point. */
|
|
|
|
newmem->next = transmem_list;
|
|
|
|
transmem_list = newmem;
|
|
|
|
}
|
|
|
|
/* Fall through and return -1. */
|
2012-06-22 07:15:38 +08:00
|
|
|
# endif
|
2005-04-05 06:37:38 +08:00
|
|
|
}
|
2014-12-10 20:03:53 +08:00
|
|
|
if (__builtin_expect (newmem == NULL, 0))
|
2005-04-05 06:37:38 +08:00
|
|
|
{
|
|
|
|
freemem = NULL;
|
|
|
|
freemem_size = 0;
|
|
|
|
__libc_lock_unlock (lock);
|
2006-06-23 07:59:32 +08:00
|
|
|
return (char *) -1;
|
2001-01-05 14:43:17 +08:00
|
|
|
}
|
2000-04-28 13:12:30 +08:00
|
|
|
|
2000-07-01 08:04:28 +08:00
|
|
|
# ifdef _LIBC
|
2005-04-05 06:37:38 +08:00
|
|
|
freemem = (unsigned char *) newmem->data;
|
|
|
|
freemem_size -= offsetof (struct transmem_list, data);
|
2001-01-05 14:43:17 +08:00
|
|
|
# else
|
2005-04-05 06:37:38 +08:00
|
|
|
transmem_list = newmem;
|
|
|
|
freemem = newmem;
|
2000-07-01 08:04:28 +08:00
|
|
|
# endif
|
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
outbuf = freemem + sizeof (size_t);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We have now in our buffer a converted string. Put this
|
|
|
|
into the table of conversions. */
|
|
|
|
*(size_t *) freemem = outbuf - freemem - sizeof (size_t);
|
|
|
|
convd->conv_tab[act] = (char *) freemem;
|
|
|
|
/* Shrink freemem, but keep it aligned. */
|
|
|
|
freemem_size -= outbuf - freemem;
|
|
|
|
freemem = outbuf;
|
|
|
|
freemem += freemem_size & (alignof (size_t) - 1);
|
|
|
|
freemem_size = freemem_size & ~ (alignof (size_t) - 1);
|
|
|
|
|
|
|
|
__libc_lock_unlock (lock);
|
2000-04-28 13:12:30 +08:00
|
|
|
}
|
|
|
|
|
2005-04-05 06:37:38 +08:00
|
|
|
/* Now convd->conv_tab[act] contains the translation of all
|
|
|
|
the plural variants. */
|
|
|
|
result = convd->conv_tab[act] + sizeof (size_t);
|
|
|
|
resultlen = *(size_t *) convd->conv_tab[act];
|
2000-04-28 13:12:30 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The result string is converted. */
|
|
|
|
|
|
|
|
#endif /* _LIBC || HAVE_ICONV */
|
|
|
|
|
2001-01-05 14:43:17 +08:00
|
|
|
*lengthp = resultlen;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Look up a plural variant. */
|
|
|
|
static char *
|
|
|
|
internal_function
|
2014-12-10 20:03:53 +08:00
|
|
|
plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
|
|
|
|
const char *translation, size_t translation_len)
|
2001-01-05 14:43:17 +08:00
|
|
|
{
|
|
|
|
struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
|
|
|
|
unsigned long int index;
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
index = plural_eval (domaindata->plural, n);
|
|
|
|
if (index >= domaindata->nplurals)
|
|
|
|
/* This should never happen. It means the plural expression and the
|
|
|
|
given maximum value do not match. */
|
|
|
|
index = 0;
|
|
|
|
|
|
|
|
/* Skip INDEX strings at TRANSLATION. */
|
|
|
|
p = translation;
|
2000-04-28 13:12:30 +08:00
|
|
|
while (index-- > 0)
|
|
|
|
{
|
|
|
|
#ifdef _LIBC
|
2001-01-05 14:43:17 +08:00
|
|
|
p = __rawmemchr (p, '\0');
|
2000-04-28 13:12:30 +08:00
|
|
|
#else
|
2001-01-05 14:43:17 +08:00
|
|
|
p = strchr (p, '\0');
|
2000-04-28 13:12:30 +08:00
|
|
|
#endif
|
|
|
|
/* And skip over the NUL byte. */
|
2001-01-05 14:43:17 +08:00
|
|
|
p++;
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2001-01-05 14:43:17 +08:00
|
|
|
if (p >= translation + translation_len)
|
|
|
|
/* This should never happen. It means the plural expression
|
|
|
|
evaluated to a value larger than the number of variants
|
|
|
|
available for MSGID1. */
|
|
|
|
return (char *) translation;
|
|
|
|
}
|
|
|
|
return (char *) p;
|
2000-01-22 13:50:49 +08:00
|
|
|
}
|
|
|
|
|
2002-08-31 03:36:12 +08:00
|
|
|
#ifndef _LIBC
|
2000-01-22 13:50:49 +08:00
|
|
|
/* Return string representation of locale CATEGORY. */
|
|
|
|
static const char *
|
|
|
|
internal_function
|
2014-12-10 20:03:53 +08:00
|
|
|
category_to_name (int category)
|
2000-01-22 13:50:49 +08:00
|
|
|
{
|
|
|
|
const char *retval;
|
|
|
|
|
|
|
|
switch (category)
|
|
|
|
{
|
|
|
|
#ifdef LC_COLLATE
|
|
|
|
case LC_COLLATE:
|
|
|
|
retval = "LC_COLLATE";
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef LC_CTYPE
|
|
|
|
case LC_CTYPE:
|
|
|
|
retval = "LC_CTYPE";
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef LC_MONETARY
|
|
|
|
case LC_MONETARY:
|
|
|
|
retval = "LC_MONETARY";
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef LC_NUMERIC
|
|
|
|
case LC_NUMERIC:
|
|
|
|
retval = "LC_NUMERIC";
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef LC_TIME
|
|
|
|
case LC_TIME:
|
|
|
|
retval = "LC_TIME";
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef LC_MESSAGES
|
|
|
|
case LC_MESSAGES:
|
|
|
|
retval = "LC_MESSAGES";
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef LC_RESPONSE
|
|
|
|
case LC_RESPONSE:
|
|
|
|
retval = "LC_RESPONSE";
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef LC_ALL
|
|
|
|
case LC_ALL:
|
|
|
|
/* This might not make sense but is perhaps better than any other
|
|
|
|
value. */
|
|
|
|
retval = "LC_ALL";
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
/* If you have a better idea for a default value let me know. */
|
|
|
|
retval = "LC_XXX";
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
2002-08-31 03:36:12 +08:00
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* Guess value of current locale from value of the environment variables
|
|
|
|
or system-dependent defaults. */
|
2000-01-22 13:50:49 +08:00
|
|
|
static const char *
|
|
|
|
internal_function
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifdef IN_LIBGLOCALE
|
|
|
|
guess_category_value (int category, const char *categoryname,
|
|
|
|
const char *locale)
|
|
|
|
|
|
|
|
#else
|
|
|
|
guess_category_value (int category, const char *categoryname)
|
|
|
|
#endif
|
2000-01-22 13:50:49 +08:00
|
|
|
{
|
2001-01-03 12:01:43 +08:00
|
|
|
const char *language;
|
2014-12-10 20:03:53 +08:00
|
|
|
#ifndef IN_LIBGLOCALE
|
|
|
|
const char *locale;
|
|
|
|
# ifndef _LIBC
|
|
|
|
const char *language_default;
|
|
|
|
int locale_defaulted;
|
|
|
|
# endif
|
|
|
|
#endif
|
2001-01-03 12:01:43 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* We use the settings in the following order:
|
|
|
|
1. The value of the environment variable 'LANGUAGE'. This is a GNU
|
|
|
|
extension. Its value can be a colon-separated list of locale names.
|
|
|
|
2. The value of the environment variable 'LC_ALL', 'LC_xxx', or 'LANG'.
|
|
|
|
More precisely, the first among these that is set to a non-empty value.
|
|
|
|
This is how POSIX specifies it. The value is a single locale name.
|
|
|
|
3. A system-dependent preference list of languages. Its value can be a
|
|
|
|
colon-separated list of locale names.
|
|
|
|
4. A system-dependent default locale name.
|
|
|
|
This way:
|
|
|
|
- System-dependent settings can be overridden by environment variables.
|
|
|
|
- If the system provides both a list of languages and a default locale,
|
|
|
|
the former is used. */
|
|
|
|
|
|
|
|
#ifndef IN_LIBGLOCALE
|
|
|
|
/* Fetch the locale name, through the POSIX method of looking to `LC_ALL',
|
2001-01-03 12:01:43 +08:00
|
|
|
`LC_xxx', and `LANG'. On some systems this can be done by the
|
|
|
|
`setlocale' function itself. */
|
2014-12-10 20:03:53 +08:00
|
|
|
# ifdef _LIBC
|
|
|
|
locale = __current_locale_name (category);
|
|
|
|
# else
|
|
|
|
locale_defaulted = 0;
|
|
|
|
# if HAVE_USELOCALE
|
|
|
|
locale = _nl_locale_name_thread_unsafe (category, categoryname);
|
|
|
|
if (locale == NULL)
|
|
|
|
# endif
|
|
|
|
{
|
|
|
|
locale = _nl_locale_name_posix (category, categoryname);
|
|
|
|
if (locale == NULL)
|
|
|
|
{
|
|
|
|
locale = _nl_locale_name_default ();
|
|
|
|
locale_defaulted = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
# endif
|
2000-01-22 13:50:49 +08:00
|
|
|
#endif
|
2001-01-03 12:01:43 +08:00
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
/* Ignore LANGUAGE and its system-dependent analogon if the locale is set
|
|
|
|
to "C" because
|
|
|
|
1. "C" locale usually uses the ASCII encoding, and most international
|
|
|
|
messages use non-ASCII characters. These characters get displayed
|
|
|
|
as question marks (if using glibc's iconv()) or as invalid 8-bit
|
|
|
|
characters (because other iconv()s refuse to convert most non-ASCII
|
|
|
|
characters to ASCII). In any case, the output is ugly.
|
|
|
|
2. The precise output of some programs in the "C" locale is specified
|
|
|
|
by POSIX and should not depend on environment variables like
|
|
|
|
"LANGUAGE" or system-dependent information. We allow such programs
|
|
|
|
to use gettext(). */
|
|
|
|
if (strcmp (locale, "C") == 0)
|
|
|
|
return locale;
|
|
|
|
|
|
|
|
/* The highest priority value is the value of the 'LANGUAGE' environment
|
|
|
|
variable. */
|
|
|
|
language = getenv ("LANGUAGE");
|
|
|
|
if (language != NULL && language[0] != '\0')
|
|
|
|
return language;
|
|
|
|
#if !defined IN_LIBGLOCALE && !defined _LIBC
|
|
|
|
/* The next priority value is the locale name, if not defaulted. */
|
|
|
|
if (locale_defaulted)
|
|
|
|
{
|
|
|
|
/* The next priority value is the default language preferences list. */
|
|
|
|
language_default = _nl_language_preferences_default ();
|
|
|
|
if (language_default != NULL)
|
|
|
|
return language_default;
|
|
|
|
}
|
|
|
|
/* The least priority value is the locale name, if defaulted. */
|
|
|
|
#endif
|
|
|
|
return locale;
|
2000-01-22 13:50:49 +08:00
|
|
|
}
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
#if (defined _LIBC || HAVE_ICONV) && !defined IN_LIBGLOCALE
|
2005-04-05 06:37:38 +08:00
|
|
|
/* Returns the output charset. */
|
|
|
|
static const char *
|
|
|
|
internal_function
|
2014-12-10 20:03:53 +08:00
|
|
|
get_output_charset (struct binding *domainbinding)
|
2005-04-05 06:37:38 +08:00
|
|
|
{
|
|
|
|
/* The output charset should normally be determined by the locale. But
|
|
|
|
sometimes the locale is not used or not correctly set up, so we provide
|
|
|
|
a possibility for the user to override this: the OUTPUT_CHARSET
|
|
|
|
environment variable. Moreover, the value specified through
|
|
|
|
bind_textdomain_codeset overrides both. */
|
|
|
|
if (domainbinding != NULL && domainbinding->codeset != NULL)
|
|
|
|
return domainbinding->codeset;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* For speed reasons, we look at the value of OUTPUT_CHARSET only
|
|
|
|
once. This is a user variable that is not supposed to change
|
|
|
|
during a program run. */
|
|
|
|
static char *output_charset_cache;
|
|
|
|
static int output_charset_cached;
|
|
|
|
|
|
|
|
if (!output_charset_cached)
|
|
|
|
{
|
|
|
|
const char *value = getenv ("OUTPUT_CHARSET");
|
|
|
|
|
|
|
|
if (value != NULL && value[0] != '\0')
|
|
|
|
{
|
|
|
|
size_t len = strlen (value) + 1;
|
|
|
|
char *value_copy = (char *) malloc (len);
|
|
|
|
|
|
|
|
if (value_copy != NULL)
|
|
|
|
memcpy (value_copy, value, len);
|
|
|
|
output_charset_cache = value_copy;
|
|
|
|
}
|
|
|
|
output_charset_cached = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (output_charset_cache != NULL)
|
|
|
|
return output_charset_cache;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
# ifdef _LIBC
|
|
|
|
return _NL_CURRENT (LC_CTYPE, CODESET);
|
|
|
|
# else
|
|
|
|
# if HAVE_ICONV
|
|
|
|
return locale_charset ();
|
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
/* @@ begin of epilog @@ */
|
|
|
|
|
|
|
|
/* We don't want libintl.a to depend on any other library. So we
|
|
|
|
avoid the non-standard function stpcpy. In GNU C Library this
|
|
|
|
function is available, though. Also allow the symbol HAVE_STPCPY
|
|
|
|
to be defined. */
|
|
|
|
#if !_LIBC && !HAVE_STPCPY
|
|
|
|
static char *
|
2014-12-10 20:03:53 +08:00
|
|
|
stpcpy (char *dest, const char *src)
|
2000-01-22 13:50:49 +08:00
|
|
|
{
|
|
|
|
while ((*dest++ = *src++) != '\0')
|
|
|
|
/* Do nothing. */ ;
|
|
|
|
return dest - 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !_LIBC && !HAVE_MEMPCPY
|
|
|
|
static void *
|
2014-12-10 20:03:53 +08:00
|
|
|
mempcpy (void *dest, const void *src, size_t n)
|
2000-01-22 13:50:49 +08:00
|
|
|
{
|
2000-05-07 01:54:58 +08:00
|
|
|
return (void *) ((char *) memcpy (dest, src, n) + n);
|
2000-01-22 13:50:49 +08:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-12-10 20:03:53 +08:00
|
|
|
#if !_LIBC && !HAVE_TSEARCH
|
|
|
|
# include "tsearch.c"
|
|
|
|
#endif
|
|
|
|
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
/* If we want to free all resources we have to do some work at
|
|
|
|
program's end. */
|
2002-11-02 04:44:15 +08:00
|
|
|
libc_freeres_fn (free_mem)
|
2000-01-22 13:50:49 +08:00
|
|
|
{
|
2000-07-01 08:04:28 +08:00
|
|
|
void *old;
|
2000-01-22 13:50:49 +08:00
|
|
|
|
2000-09-01 05:05:59 +08:00
|
|
|
while (_nl_domain_bindings != NULL)
|
2000-05-04 10:46:54 +08:00
|
|
|
{
|
2000-09-01 05:05:59 +08:00
|
|
|
struct binding *oldp = _nl_domain_bindings;
|
|
|
|
_nl_domain_bindings = _nl_domain_bindings->next;
|
[BZ #284, BZ #721]
* intl/dcigettext.c (_nl_find_msg): Add a cast.
* nis/nis_clone_dir.c (nis_clone_directory): Use char * for ADDR.
* nis/nis_clone_obj.c (nis_clone_object): Likewise.
* nis/nis_clone_res.c (nis_clone_result): Likewise.
* resolv/nss_dns/dns-network.c (getanswer_r): Use const unsigned char *
for END_OF_MESSAGE and CP.
* resolv/res_send.c (send_dg): Add else branch for case impossible
unless `poll' is buggy.
* crypt/crypt_util.c (__setkey_r): Add a cast.
* locale/programs/linereader.c (get_toplvl_escape): Use size_t for
NBYTES, and unsigned char * for BYTES.
* locale/programs/charmap.c (charmap_new_char): Use size_t and
unsighed char * for NBYTES, BYTES parameters.
* sysdeps/generic/dl-hash.h (_dl_elf_hash): Take const char * argument
and cast it.
* sysdeps/i386/i686/dl-hash.h (_dl_elf_hash): Likewise.
* sunrpc/create_xid.c (_create_xid): Don't use unsigned long for RES.
* sunrpc/svcauth_des.c (_svcauth_des): Fix cast type.
* sunrpc/auth_des.c (authdes_create): Don't use u_char for PKEY_DATA.
(authdes_marshal): Don't use unsigned int for LEN.
* sunrpc/xdr.c (xdr_hyper): Don't use unsigned long for T2.
(xdr_u_hyper): Likewise.
(xdr_u_short): Don't use u_long for L.
* sunrpc/xdr_intXX_t.c (xdr_int64_t): Don't use uint32_t for T2.
* inet/rexec.c (rexec_af): Use socklen_t.
* sunrpc/key_call.c (getkeyserv_handle): Likewise.
* sunrpc/rtime.c (rtime): Likewise.
* resolv/res_send.c (send_vc, send_dg): Likewise.
* nis/nis_callback.c (__nis_create_callback): Likewise.
* sysdeps/generic/libc-start.c: Use unsigned int for nthreads ptr.
* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix type of ADDR local.
* libio/libio.h (_IO_BE): Add parenthesis around EXPR.
* intl/dcigettext.c (INTVARDEF, INTUSE): Macros removed.
(_nl_default_dirname): Use libc_hidden_data_def instead of INTVARDEF.
(libc_freeres_fn, DCIGETTEXT): Don't use INTUSE.
* intl/bindtextdom.c (INTUSE): Macro removed.
(_nl_default_dirname): Use libc_hidden_proto.
(set_binding_values): Don't use INTUSE.
* include/libintl.h (_libc_intl_domainname_internal): Decl removed.
(_libc_intl_domainname): Use libc_hidden_proto.
* posix/regex_internal.h (gettext): Remove INTUSE on it.
* locale/SYS_libc.c (_libc_intl_domainname): Use libc_hidden_data_def
rather than INTDEF.
* include/libintl.h (_): Don't use *_internal name.
* ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Use int32_t,
not uint32_t.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise for assignments.
* iconv/gconv_open.c (__gconv_open): Remove useless cast.
[BZ #721]
* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
of [RESOLVE_MAP].
* sysdeps/sh/dl-machine.h (ELF_MACHINE_NO_REL): Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
* sysdeps/powerpc/powerpc64/dl-machine.h
(elf_machine_rel, elf_machine_rel_relative): Removed.
2005-02-03 Alexandre Oliva <aoliva@redhat.com>
[BZ #721]
* elf/dynamic-link.h: Don't declare nested auto functions that are
not going to be defined.
2004-07-23 Jakub Jelinek <jakub@redhat.com>
[BZ #284]
* include/features.h (_POSIX_SOURCE, _POSIX_C_SOURCE): Define
if _XOPEN_SOURCE >= 500 even if __STRICT_ANSI__ is defined.
2005-02-16 Roland McGrath <roland@redhat.com>
2005-02-17 09:19:55 +08:00
|
|
|
if (oldp->dirname != _nl_default_dirname)
|
2000-05-04 10:46:54 +08:00
|
|
|
/* Yes, this is a pointer comparison. */
|
2000-09-01 05:05:59 +08:00
|
|
|
free (oldp->dirname);
|
|
|
|
free (oldp->codeset);
|
|
|
|
free (oldp);
|
2000-05-04 10:46:54 +08:00
|
|
|
}
|
2000-01-22 13:50:49 +08:00
|
|
|
|
|
|
|
if (_nl_current_default_domain != _nl_default_default_domain)
|
|
|
|
/* Yes, again a pointer comparison. */
|
|
|
|
free ((char *) _nl_current_default_domain);
|
|
|
|
|
2000-05-04 10:46:54 +08:00
|
|
|
/* Remove the search tree with the known translations. */
|
2000-01-22 13:50:49 +08:00
|
|
|
__tdestroy (root, free);
|
2000-09-01 05:05:59 +08:00
|
|
|
root = NULL;
|
2000-07-01 08:04:28 +08:00
|
|
|
|
|
|
|
while (transmem_list != NULL)
|
|
|
|
{
|
|
|
|
old = transmem_list;
|
|
|
|
transmem_list = transmem_list->next;
|
|
|
|
free (old);
|
|
|
|
}
|
2000-01-22 13:50:49 +08:00
|
|
|
}
|
|
|
|
#endif
|