mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
6d24885784
This patch merges the latest release of gettext into the intl subdirectory. The initial motivation was to include the plural.y changes which enable building with bison 3.0, but the majority of the other changes are merely cosmetic so it seemed like merging the whole directory was simpler than trying to take it piecemeal. The merge was done by copying across the latext gettext code and adding in a few small glibc changes that have been added over the years that seemed beneficial, as well as a couple of small build fixes that should be merged back to gettext. I also reverted the gettext commit: commit 279b57fc367251666f00e8e2b599b83703451afb Author: Bruno Haible <bruno@clisp.org> Date: Fri Jun 14 12:03:49 2002 +0000 Make absolute pathnames inside $LANGUAGE work. As it caused localedata/tst-setlocale3 to fail and it wasn't clear that glibc wanted that behaviour. The merge has dropped many uses of __glibc_likely/unlikely. This is intentional given that it eases merging. It seems to me that the cost of continually rewriting these lines when merging and the risk of adding bugs when doing so outweighs the benefits of using these macros when code is shared with another project. Tested with make check on x86_64. ChangeLog: 2014-12-11 Will Newton <will.newton@linaro.org> Merge gettext 0.19.3 into intl/. This involves a number of cosmetic changes to comments and ANSI function definitions and prototypes throughout all the files. The gettext copyright header is used but with the date ranges taken from the glibc copy. * NEWS: Add gettext merge to 2.21. * intl/bindtextdom.c: Switch to gettext copyright. Use ANSI definitions and prototypes. Use gl_* locking primitives rather than __libc_* ones. Use __builtin_expect rather than __glibc_likely/unlikely. * intl/dcgettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/dcigettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. (INTDIV0_RAISES_SIGFPE): New define. Use gl_* locking primitives rather than __libc_* ones. Include eval-plural.h instead of plural-eval.c. Use __builtin_expect rather than __glibc_likely/unlikely. * intl/dcngettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/dgettext.c: Likewise. * intl/dngettext.c: Likewise. * intl/plural-eval.c: Renamed to... * intl/eval-plural.h: ...this. * intl/explodename.c: Switch to gettext copyright. Use ANSI definitions and prototypes. (_nl_explode_name): Use strchr instead of __rawmemchr. * intl/finddomain.c: Switch to gettext copyright. Use ANSI definitions and prototypes. Use gl_* locking primitives rather than __libc_* ones. (_nl_find_domain): Use malloc rather than alloca for allocation of temporary locale name. * intl/gettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/gettextP.h: Switch to gettext copyright. Use ANSI definitions and prototypes. Use gl_* locking primitives rather than __libc_* ones. * intl/gmo.h: Switch to gettext copyright. (struct sysdep_string): Move struct segment_pair outside of struct definition. * intl/hash-string.c: Use ANSI definitions and prototypes. * intl/hash-string.h: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/l10nflist.c: Switch to gettext copyright. Use ANSI definitions and prototypes. (_nl_normalize_codeset): Avoid integer overflow. * intl/loadinfo.h: Switch to gettext copyright. Use ANSI definitions and prototypes. (LIBINTL_DLL_EXPORTED): New define. (PATH_SEPARATOR): New define. * intl/loadmsgcat.c: Switch to gettext copyright. * intl/localealias.c: Switch to gettext copyright. Use ANSI definitions and prototypes. (_nl_expand_alias): Use PATH_SEPARATOR. * intl/ngettext.c: Switch to gettext copyright. Use ANSI definitions and prototypes. * intl/plural-exp.c: Likewise. * intl/plural-exp.h: Switch to gettext copyright. Use ANSI definitions and prototypes. (struct expression): Move definition of enum operator outside of struct definition. * intl/plural.c: Regenerate. * intl/plural.y: Switch to gettext copyright. Use ANSI definitions and prototypes. Port to bison 3.0. * intl/textdomain.c: Switch to gettext copyright. Use ANSI definitions and prototypes. Use gl_* locking primitives rather than __libc_* ones.
131 lines
5.0 KiB
C
131 lines
5.0 KiB
C
/* Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
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.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _LOADINFO_H
|
|
#define _LOADINFO_H 1
|
|
|
|
/* Declarations of locale dependent catalog lookup functions.
|
|
Implemented in
|
|
|
|
localealias.c Possibly replace a locale name by another.
|
|
explodename.c Split a locale name into its various fields.
|
|
l10nflist.c Generate a list of filenames of possible message catalogs.
|
|
finddomain.c Find and open the relevant message catalogs.
|
|
|
|
The main function _nl_find_domain() in finddomain.c is declared
|
|
in gettextP.h.
|
|
*/
|
|
|
|
#ifndef internal_function
|
|
# define internal_function
|
|
#endif
|
|
|
|
#ifndef LIBINTL_DLL_EXPORTED
|
|
# define LIBINTL_DLL_EXPORTED
|
|
#endif
|
|
|
|
/* Tell the compiler when a conditional or integer expression is
|
|
almost always true or almost always false. */
|
|
#ifndef HAVE_BUILTIN_EXPECT
|
|
# define __builtin_expect(expr, val) (expr)
|
|
#endif
|
|
|
|
/* Separator in PATH like lists of pathnames. */
|
|
#if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
|
|
/* Win32, OS/2, DOS */
|
|
# define PATH_SEPARATOR ';'
|
|
#else
|
|
/* Unix */
|
|
# define PATH_SEPARATOR ':'
|
|
#endif
|
|
|
|
/* Encoding of locale name parts. */
|
|
#define XPG_NORM_CODESET 1
|
|
#define XPG_CODESET 2
|
|
#define XPG_TERRITORY 4
|
|
#define XPG_MODIFIER 8
|
|
|
|
|
|
struct loaded_l10nfile
|
|
{
|
|
const char *filename;
|
|
int decided;
|
|
|
|
const void *data;
|
|
|
|
struct loaded_l10nfile *next;
|
|
struct loaded_l10nfile *successor[1];
|
|
};
|
|
|
|
|
|
/* Normalize codeset name. There is no standard for the codeset
|
|
names. Normalization allows the user to use any of the common
|
|
names. The return value is dynamically allocated and has to be
|
|
freed by the caller. */
|
|
extern const char *_nl_normalize_codeset (const char *codeset,
|
|
size_t name_len);
|
|
|
|
/* Lookup a locale dependent file.
|
|
*L10NFILE_LIST denotes a pool of lookup results of locale dependent
|
|
files of the same kind, sorted in decreasing order of ->filename.
|
|
DIRLIST and DIRLIST_LEN are an argz list of directories in which to
|
|
look, containing at least one directory (i.e. DIRLIST_LEN > 0).
|
|
MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER
|
|
are the pieces of the locale name, as produced by _nl_explode_name().
|
|
FILENAME is the filename suffix.
|
|
The return value is the lookup result, either found in *L10NFILE_LIST,
|
|
or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL.
|
|
If the return value is non-NULL, it is added to *L10NFILE_LIST, and
|
|
its ->next field denotes the chaining inside *L10NFILE_LIST, and
|
|
furthermore its ->successor[] field contains a list of other lookup
|
|
results from which this lookup result inherits. */
|
|
extern struct loaded_l10nfile *
|
|
_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
|
|
const char *dirlist, size_t dirlist_len, int mask,
|
|
const char *language, const char *territory,
|
|
const char *codeset, const char *normalized_codeset,
|
|
const char *modifier,
|
|
const char *filename, int do_allocate);
|
|
|
|
/* Lookup the real locale name for a locale alias NAME, or NULL if
|
|
NAME is not a locale alias (but possibly a real locale name).
|
|
The return value is statically allocated and must not be freed. */
|
|
/* Part of the libintl ABI only for the sake of the gettext.m4 macro. */
|
|
extern LIBINTL_DLL_EXPORTED const char *_nl_expand_alias (const char *name);
|
|
|
|
/* Split a locale name NAME into its pieces: language, modifier,
|
|
territory, codeset.
|
|
NAME gets destructively modified: NUL bytes are inserted here and
|
|
there. *LANGUAGE gets assigned NAME. Each of *MODIFIER, *TERRITORY,
|
|
*CODESET gets assigned either a pointer into the old NAME string, or
|
|
NULL. *NORMALIZED_CODESET gets assigned the expanded *CODESET, if it
|
|
is different from *CODESET; this one is dynamically allocated and has
|
|
to be freed by the caller.
|
|
The return value is a bitmask, where each bit corresponds to one
|
|
filled-in value:
|
|
XPG_MODIFIER for *MODIFIER,
|
|
XPG_TERRITORY for *TERRITORY,
|
|
XPG_CODESET for *CODESET,
|
|
XPG_NORM_CODESET for *NORMALIZED_CODESET.
|
|
*/
|
|
extern int _nl_explode_name (char *name, const char **language,
|
|
const char **modifier, const char **territory,
|
|
const char **codeset,
|
|
const char **normalized_codeset);
|
|
|
|
#endif /* loadinfo.h */
|