mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03: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.
This commit is contained in:
Ulrich Drepper
@ -72,14 +72,380 @@ char *alloca ();
|
||||
# undef HAVE_MMAP
|
||||
#endif
|
||||
|
||||
#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
#if defined HAVE_INTTYPES_H || defined _LIBC
|
||||
# include <inttypes.h>
|
||||
#endif
|
||||
|
||||
#include "gettext.h"
|
||||
#include "gettextP.h"
|
||||
#include "hash-string.h"
|
||||
#include "plural-exp.h"
|
||||
|
||||
#ifdef _LIBC
|
||||
# include "../locale/localeinfo.h"
|
||||
#endif
|
||||
|
||||
/* Provide fallback values for macros that ought to be defined in <inttypes.h>.
|
||||
Note that our fallback values need not be literal strings, because we don't
|
||||
use them with preprocessor string concatenation. */
|
||||
#if !defined PRId8 || PRI_MACROS_BROKEN
|
||||
# undef PRId8
|
||||
# define PRId8 "d"
|
||||
#endif
|
||||
#if !defined PRIi8 || PRI_MACROS_BROKEN
|
||||
# undef PRIi8
|
||||
# define PRIi8 "i"
|
||||
#endif
|
||||
#if !defined PRIo8 || PRI_MACROS_BROKEN
|
||||
# undef PRIo8
|
||||
# define PRIo8 "o"
|
||||
#endif
|
||||
#if !defined PRIu8 || PRI_MACROS_BROKEN
|
||||
# undef PRIu8
|
||||
# define PRIu8 "u"
|
||||
#endif
|
||||
#if !defined PRIx8 || PRI_MACROS_BROKEN
|
||||
# undef PRIx8
|
||||
# define PRIx8 "x"
|
||||
#endif
|
||||
#if !defined PRIX8 || PRI_MACROS_BROKEN
|
||||
# undef PRIX8
|
||||
# define PRIX8 "X"
|
||||
#endif
|
||||
#if !defined PRId16 || PRI_MACROS_BROKEN
|
||||
# undef PRId16
|
||||
# define PRId16 "d"
|
||||
#endif
|
||||
#if !defined PRIi16 || PRI_MACROS_BROKEN
|
||||
# undef PRIi16
|
||||
# define PRIi16 "i"
|
||||
#endif
|
||||
#if !defined PRIo16 || PRI_MACROS_BROKEN
|
||||
# undef PRIo16
|
||||
# define PRIo16 "o"
|
||||
#endif
|
||||
#if !defined PRIu16 || PRI_MACROS_BROKEN
|
||||
# undef PRIu16
|
||||
# define PRIu16 "u"
|
||||
#endif
|
||||
#if !defined PRIx16 || PRI_MACROS_BROKEN
|
||||
# undef PRIx16
|
||||
# define PRIx16 "x"
|
||||
#endif
|
||||
#if !defined PRIX16 || PRI_MACROS_BROKEN
|
||||
# undef PRIX16
|
||||
# define PRIX16 "X"
|
||||
#endif
|
||||
#if !defined PRId32 || PRI_MACROS_BROKEN
|
||||
# undef PRId32
|
||||
# define PRId32 "d"
|
||||
#endif
|
||||
#if !defined PRIi32 || PRI_MACROS_BROKEN
|
||||
# undef PRIi32
|
||||
# define PRIi32 "i"
|
||||
#endif
|
||||
#if !defined PRIo32 || PRI_MACROS_BROKEN
|
||||
# undef PRIo32
|
||||
# define PRIo32 "o"
|
||||
#endif
|
||||
#if !defined PRIu32 || PRI_MACROS_BROKEN
|
||||
# undef PRIu32
|
||||
# define PRIu32 "u"
|
||||
#endif
|
||||
#if !defined PRIx32 || PRI_MACROS_BROKEN
|
||||
# undef PRIx32
|
||||
# define PRIx32 "x"
|
||||
#endif
|
||||
#if !defined PRIX32 || PRI_MACROS_BROKEN
|
||||
# undef PRIX32
|
||||
# define PRIX32 "X"
|
||||
#endif
|
||||
#if !defined PRId64 || PRI_MACROS_BROKEN
|
||||
# undef PRId64
|
||||
# define PRId64 (sizeof (long) == 8 ? "ld" : "lld")
|
||||
#endif
|
||||
#if !defined PRIi64 || PRI_MACROS_BROKEN
|
||||
# undef PRIi64
|
||||
# define PRIi64 (sizeof (long) == 8 ? "li" : "lli")
|
||||
#endif
|
||||
#if !defined PRIo64 || PRI_MACROS_BROKEN
|
||||
# undef PRIo64
|
||||
# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo")
|
||||
#endif
|
||||
#if !defined PRIu64 || PRI_MACROS_BROKEN
|
||||
# undef PRIu64
|
||||
# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu")
|
||||
#endif
|
||||
#if !defined PRIx64 || PRI_MACROS_BROKEN
|
||||
# undef PRIx64
|
||||
# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx")
|
||||
#endif
|
||||
#if !defined PRIX64 || PRI_MACROS_BROKEN
|
||||
# undef PRIX64
|
||||
# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX")
|
||||
#endif
|
||||
#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN
|
||||
# undef PRIdLEAST8
|
||||
# define PRIdLEAST8 "d"
|
||||
#endif
|
||||
#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN
|
||||
# undef PRIiLEAST8
|
||||
# define PRIiLEAST8 "i"
|
||||
#endif
|
||||
#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN
|
||||
# undef PRIoLEAST8
|
||||
# define PRIoLEAST8 "o"
|
||||
#endif
|
||||
#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN
|
||||
# undef PRIuLEAST8
|
||||
# define PRIuLEAST8 "u"
|
||||
#endif
|
||||
#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN
|
||||
# undef PRIxLEAST8
|
||||
# define PRIxLEAST8 "x"
|
||||
#endif
|
||||
#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN
|
||||
# undef PRIXLEAST8
|
||||
# define PRIXLEAST8 "X"
|
||||
#endif
|
||||
#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN
|
||||
# undef PRIdLEAST16
|
||||
# define PRIdLEAST16 "d"
|
||||
#endif
|
||||
#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN
|
||||
# undef PRIiLEAST16
|
||||
# define PRIiLEAST16 "i"
|
||||
#endif
|
||||
#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN
|
||||
# undef PRIoLEAST16
|
||||
# define PRIoLEAST16 "o"
|
||||
#endif
|
||||
#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN
|
||||
# undef PRIuLEAST16
|
||||
# define PRIuLEAST16 "u"
|
||||
#endif
|
||||
#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN
|
||||
# undef PRIxLEAST16
|
||||
# define PRIxLEAST16 "x"
|
||||
#endif
|
||||
#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN
|
||||
# undef PRIXLEAST16
|
||||
# define PRIXLEAST16 "X"
|
||||
#endif
|
||||
#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN
|
||||
# undef PRIdLEAST32
|
||||
# define PRIdLEAST32 "d"
|
||||
#endif
|
||||
#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN
|
||||
# undef PRIiLEAST32
|
||||
# define PRIiLEAST32 "i"
|
||||
#endif
|
||||
#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN
|
||||
# undef PRIoLEAST32
|
||||
# define PRIoLEAST32 "o"
|
||||
#endif
|
||||
#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN
|
||||
# undef PRIuLEAST32
|
||||
# define PRIuLEAST32 "u"
|
||||
#endif
|
||||
#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN
|
||||
# undef PRIxLEAST32
|
||||
# define PRIxLEAST32 "x"
|
||||
#endif
|
||||
#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN
|
||||
# undef PRIXLEAST32
|
||||
# define PRIXLEAST32 "X"
|
||||
#endif
|
||||
#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN
|
||||
# undef PRIdLEAST64
|
||||
# define PRIdLEAST64 PRId64
|
||||
#endif
|
||||
#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN
|
||||
# undef PRIiLEAST64
|
||||
# define PRIiLEAST64 PRIi64
|
||||
#endif
|
||||
#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN
|
||||
# undef PRIoLEAST64
|
||||
# define PRIoLEAST64 PRIo64
|
||||
#endif
|
||||
#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN
|
||||
# undef PRIuLEAST64
|
||||
# define PRIuLEAST64 PRIu64
|
||||
#endif
|
||||
#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN
|
||||
# undef PRIxLEAST64
|
||||
# define PRIxLEAST64 PRIx64
|
||||
#endif
|
||||
#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN
|
||||
# undef PRIXLEAST64
|
||||
# define PRIXLEAST64 PRIX64
|
||||
#endif
|
||||
#if !defined PRIdFAST8 || PRI_MACROS_BROKEN
|
||||
# undef PRIdFAST8
|
||||
# define PRIdFAST8 "d"
|
||||
#endif
|
||||
#if !defined PRIiFAST8 || PRI_MACROS_BROKEN
|
||||
# undef PRIiFAST8
|
||||
# define PRIiFAST8 "i"
|
||||
#endif
|
||||
#if !defined PRIoFAST8 || PRI_MACROS_BROKEN
|
||||
# undef PRIoFAST8
|
||||
# define PRIoFAST8 "o"
|
||||
#endif
|
||||
#if !defined PRIuFAST8 || PRI_MACROS_BROKEN
|
||||
# undef PRIuFAST8
|
||||
# define PRIuFAST8 "u"
|
||||
#endif
|
||||
#if !defined PRIxFAST8 || PRI_MACROS_BROKEN
|
||||
# undef PRIxFAST8
|
||||
# define PRIxFAST8 "x"
|
||||
#endif
|
||||
#if !defined PRIXFAST8 || PRI_MACROS_BROKEN
|
||||
# undef PRIXFAST8
|
||||
# define PRIXFAST8 "X"
|
||||
#endif
|
||||
#if !defined PRIdFAST16 || PRI_MACROS_BROKEN
|
||||
# undef PRIdFAST16
|
||||
# define PRIdFAST16 "d"
|
||||
#endif
|
||||
#if !defined PRIiFAST16 || PRI_MACROS_BROKEN
|
||||
# undef PRIiFAST16
|
||||
# define PRIiFAST16 "i"
|
||||
#endif
|
||||
#if !defined PRIoFAST16 || PRI_MACROS_BROKEN
|
||||
# undef PRIoFAST16
|
||||
# define PRIoFAST16 "o"
|
||||
#endif
|
||||
#if !defined PRIuFAST16 || PRI_MACROS_BROKEN
|
||||
# undef PRIuFAST16
|
||||
# define PRIuFAST16 "u"
|
||||
#endif
|
||||
#if !defined PRIxFAST16 || PRI_MACROS_BROKEN
|
||||
# undef PRIxFAST16
|
||||
# define PRIxFAST16 "x"
|
||||
#endif
|
||||
#if !defined PRIXFAST16 || PRI_MACROS_BROKEN
|
||||
# undef PRIXFAST16
|
||||
# define PRIXFAST16 "X"
|
||||
#endif
|
||||
#if !defined PRIdFAST32 || PRI_MACROS_BROKEN
|
||||
# undef PRIdFAST32
|
||||
# define PRIdFAST32 "d"
|
||||
#endif
|
||||
#if !defined PRIiFAST32 || PRI_MACROS_BROKEN
|
||||
# undef PRIiFAST32
|
||||
# define PRIiFAST32 "i"
|
||||
#endif
|
||||
#if !defined PRIoFAST32 || PRI_MACROS_BROKEN
|
||||
# undef PRIoFAST32
|
||||
# define PRIoFAST32 "o"
|
||||
#endif
|
||||
#if !defined PRIuFAST32 || PRI_MACROS_BROKEN
|
||||
# undef PRIuFAST32
|
||||
# define PRIuFAST32 "u"
|
||||
#endif
|
||||
#if !defined PRIxFAST32 || PRI_MACROS_BROKEN
|
||||
# undef PRIxFAST32
|
||||
# define PRIxFAST32 "x"
|
||||
#endif
|
||||
#if !defined PRIXFAST32 || PRI_MACROS_BROKEN
|
||||
# undef PRIXFAST32
|
||||
# define PRIXFAST32 "X"
|
||||
#endif
|
||||
#if !defined PRIdFAST64 || PRI_MACROS_BROKEN
|
||||
# undef PRIdFAST64
|
||||
# define PRIdFAST64 PRId64
|
||||
#endif
|
||||
#if !defined PRIiFAST64 || PRI_MACROS_BROKEN
|
||||
# undef PRIiFAST64
|
||||
# define PRIiFAST64 PRIi64
|
||||
#endif
|
||||
#if !defined PRIoFAST64 || PRI_MACROS_BROKEN
|
||||
# undef PRIoFAST64
|
||||
# define PRIoFAST64 PRIo64
|
||||
#endif
|
||||
#if !defined PRIuFAST64 || PRI_MACROS_BROKEN
|
||||
# undef PRIuFAST64
|
||||
# define PRIuFAST64 PRIu64
|
||||
#endif
|
||||
#if !defined PRIxFAST64 || PRI_MACROS_BROKEN
|
||||
# undef PRIxFAST64
|
||||
# define PRIxFAST64 PRIx64
|
||||
#endif
|
||||
#if !defined PRIXFAST64 || PRI_MACROS_BROKEN
|
||||
# undef PRIXFAST64
|
||||
# define PRIXFAST64 PRIX64
|
||||
#endif
|
||||
#if !defined PRIdMAX || PRI_MACROS_BROKEN
|
||||
# undef PRIdMAX
|
||||
# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld")
|
||||
#endif
|
||||
#if !defined PRIiMAX || PRI_MACROS_BROKEN
|
||||
# undef PRIiMAX
|
||||
# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli")
|
||||
#endif
|
||||
#if !defined PRIoMAX || PRI_MACROS_BROKEN
|
||||
# undef PRIoMAX
|
||||
# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo")
|
||||
#endif
|
||||
#if !defined PRIuMAX || PRI_MACROS_BROKEN
|
||||
# undef PRIuMAX
|
||||
# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu")
|
||||
#endif
|
||||
#if !defined PRIxMAX || PRI_MACROS_BROKEN
|
||||
# undef PRIxMAX
|
||||
# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx")
|
||||
#endif
|
||||
#if !defined PRIXMAX || PRI_MACROS_BROKEN
|
||||
# undef PRIXMAX
|
||||
# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX")
|
||||
#endif
|
||||
#if !defined PRIdPTR || PRI_MACROS_BROKEN
|
||||
# undef PRIdPTR
|
||||
# define PRIdPTR \
|
||||
(sizeof (void *) == sizeof (long) ? "ld" : \
|
||||
sizeof (void *) == sizeof (int) ? "d" : \
|
||||
"lld")
|
||||
#endif
|
||||
#if !defined PRIiPTR || PRI_MACROS_BROKEN
|
||||
# undef PRIiPTR
|
||||
# define PRIiPTR \
|
||||
(sizeof (void *) == sizeof (long) ? "li" : \
|
||||
sizeof (void *) == sizeof (int) ? "i" : \
|
||||
"lli")
|
||||
#endif
|
||||
#if !defined PRIoPTR || PRI_MACROS_BROKEN
|
||||
# undef PRIoPTR
|
||||
# define PRIoPTR \
|
||||
(sizeof (void *) == sizeof (long) ? "lo" : \
|
||||
sizeof (void *) == sizeof (int) ? "o" : \
|
||||
"llo")
|
||||
#endif
|
||||
#if !defined PRIuPTR || PRI_MACROS_BROKEN
|
||||
# undef PRIuPTR
|
||||
# define PRIuPTR \
|
||||
(sizeof (void *) == sizeof (long) ? "lu" : \
|
||||
sizeof (void *) == sizeof (int) ? "u" : \
|
||||
"llu")
|
||||
#endif
|
||||
#if !defined PRIxPTR || PRI_MACROS_BROKEN
|
||||
# undef PRIxPTR
|
||||
# define PRIxPTR \
|
||||
(sizeof (void *) == sizeof (long) ? "lx" : \
|
||||
sizeof (void *) == sizeof (int) ? "x" : \
|
||||
"llx")
|
||||
#endif
|
||||
#if !defined PRIXPTR || PRI_MACROS_BROKEN
|
||||
# undef PRIXPTR
|
||||
# define PRIXPTR \
|
||||
(sizeof (void *) == sizeof (long) ? "lX" : \
|
||||
sizeof (void *) == sizeof (int) ? "X" : \
|
||||
"llX")
|
||||
#endif
|
||||
|
||||
/* @@ end of prolog @@ */
|
||||
|
||||
#ifdef _LIBC
|
||||
@ -102,12 +468,274 @@ char *alloca ();
|
||||
# define freea(p) free (p)
|
||||
#endif
|
||||
|
||||
|
||||
/* Prototypes for local functions. Needed to ensure compiler checking of
|
||||
function argument counts despite of K&R C function definition syntax. */
|
||||
static const char *get_sysdep_segment_value PARAMS ((const char *name));
|
||||
|
||||
|
||||
/* We need a sign, whether a new catalog was loaded, which can be associated
|
||||
with all translations. This is important if the translations are
|
||||
cached by one of GCC's features. */
|
||||
int _nl_msg_cat_cntr;
|
||||
|
||||
|
||||
/* Expand a system dependent string segment. Return NULL if unsupported. */
|
||||
static const char *
|
||||
get_sysdep_segment_value (name)
|
||||
const char *name;
|
||||
{
|
||||
/* Test for an ISO C 99 section 7.8.1 format string directive.
|
||||
Syntax:
|
||||
P R I { d | i | o | u | x | X }
|
||||
{ { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR } */
|
||||
/* We don't use a table of 14 times 6 'const char *' strings here, because
|
||||
data relocations cost startup time. */
|
||||
if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I')
|
||||
{
|
||||
if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u'
|
||||
|| name[3] == 'x' || name[3] == 'X')
|
||||
{
|
||||
if (name[4] == '8' && name[5] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRId8;
|
||||
if (name[3] == 'i')
|
||||
return PRIi8;
|
||||
if (name[3] == 'o')
|
||||
return PRIo8;
|
||||
if (name[3] == 'u')
|
||||
return PRIu8;
|
||||
if (name[3] == 'x')
|
||||
return PRIx8;
|
||||
if (name[3] == 'X')
|
||||
return PRIX8;
|
||||
abort ();
|
||||
}
|
||||
if (name[4] == '1' && name[5] == '6' && name[6] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRId16;
|
||||
if (name[3] == 'i')
|
||||
return PRIi16;
|
||||
if (name[3] == 'o')
|
||||
return PRIo16;
|
||||
if (name[3] == 'u')
|
||||
return PRIu16;
|
||||
if (name[3] == 'x')
|
||||
return PRIx16;
|
||||
if (name[3] == 'X')
|
||||
return PRIX16;
|
||||
abort ();
|
||||
}
|
||||
if (name[4] == '3' && name[5] == '2' && name[6] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRId32;
|
||||
if (name[3] == 'i')
|
||||
return PRIi32;
|
||||
if (name[3] == 'o')
|
||||
return PRIo32;
|
||||
if (name[3] == 'u')
|
||||
return PRIu32;
|
||||
if (name[3] == 'x')
|
||||
return PRIx32;
|
||||
if (name[3] == 'X')
|
||||
return PRIX32;
|
||||
abort ();
|
||||
}
|
||||
if (name[4] == '6' && name[5] == '4' && name[6] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRId64;
|
||||
if (name[3] == 'i')
|
||||
return PRIi64;
|
||||
if (name[3] == 'o')
|
||||
return PRIo64;
|
||||
if (name[3] == 'u')
|
||||
return PRIu64;
|
||||
if (name[3] == 'x')
|
||||
return PRIx64;
|
||||
if (name[3] == 'X')
|
||||
return PRIX64;
|
||||
abort ();
|
||||
}
|
||||
if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A'
|
||||
&& name[7] == 'S' && name[8] == 'T')
|
||||
{
|
||||
if (name[9] == '8' && name[10] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRIdLEAST8;
|
||||
if (name[3] == 'i')
|
||||
return PRIiLEAST8;
|
||||
if (name[3] == 'o')
|
||||
return PRIoLEAST8;
|
||||
if (name[3] == 'u')
|
||||
return PRIuLEAST8;
|
||||
if (name[3] == 'x')
|
||||
return PRIxLEAST8;
|
||||
if (name[3] == 'X')
|
||||
return PRIXLEAST8;
|
||||
abort ();
|
||||
}
|
||||
if (name[9] == '1' && name[10] == '6' && name[11] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRIdLEAST16;
|
||||
if (name[3] == 'i')
|
||||
return PRIiLEAST16;
|
||||
if (name[3] == 'o')
|
||||
return PRIoLEAST16;
|
||||
if (name[3] == 'u')
|
||||
return PRIuLEAST16;
|
||||
if (name[3] == 'x')
|
||||
return PRIxLEAST16;
|
||||
if (name[3] == 'X')
|
||||
return PRIXLEAST16;
|
||||
abort ();
|
||||
}
|
||||
if (name[9] == '3' && name[10] == '2' && name[11] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRIdLEAST32;
|
||||
if (name[3] == 'i')
|
||||
return PRIiLEAST32;
|
||||
if (name[3] == 'o')
|
||||
return PRIoLEAST32;
|
||||
if (name[3] == 'u')
|
||||
return PRIuLEAST32;
|
||||
if (name[3] == 'x')
|
||||
return PRIxLEAST32;
|
||||
if (name[3] == 'X')
|
||||
return PRIXLEAST32;
|
||||
abort ();
|
||||
}
|
||||
if (name[9] == '6' && name[10] == '4' && name[11] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRIdLEAST64;
|
||||
if (name[3] == 'i')
|
||||
return PRIiLEAST64;
|
||||
if (name[3] == 'o')
|
||||
return PRIoLEAST64;
|
||||
if (name[3] == 'u')
|
||||
return PRIuLEAST64;
|
||||
if (name[3] == 'x')
|
||||
return PRIxLEAST64;
|
||||
if (name[3] == 'X')
|
||||
return PRIXLEAST64;
|
||||
abort ();
|
||||
}
|
||||
}
|
||||
if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S'
|
||||
&& name[7] == 'T')
|
||||
{
|
||||
if (name[8] == '8' && name[9] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRIdFAST8;
|
||||
if (name[3] == 'i')
|
||||
return PRIiFAST8;
|
||||
if (name[3] == 'o')
|
||||
return PRIoFAST8;
|
||||
if (name[3] == 'u')
|
||||
return PRIuFAST8;
|
||||
if (name[3] == 'x')
|
||||
return PRIxFAST8;
|
||||
if (name[3] == 'X')
|
||||
return PRIXFAST8;
|
||||
abort ();
|
||||
}
|
||||
if (name[8] == '1' && name[9] == '6' && name[10] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRIdFAST16;
|
||||
if (name[3] == 'i')
|
||||
return PRIiFAST16;
|
||||
if (name[3] == 'o')
|
||||
return PRIoFAST16;
|
||||
if (name[3] == 'u')
|
||||
return PRIuFAST16;
|
||||
if (name[3] == 'x')
|
||||
return PRIxFAST16;
|
||||
if (name[3] == 'X')
|
||||
return PRIXFAST16;
|
||||
abort ();
|
||||
}
|
||||
if (name[8] == '3' && name[9] == '2' && name[10] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRIdFAST32;
|
||||
if (name[3] == 'i')
|
||||
return PRIiFAST32;
|
||||
if (name[3] == 'o')
|
||||
return PRIoFAST32;
|
||||
if (name[3] == 'u')
|
||||
return PRIuFAST32;
|
||||
if (name[3] == 'x')
|
||||
return PRIxFAST32;
|
||||
if (name[3] == 'X')
|
||||
return PRIXFAST32;
|
||||
abort ();
|
||||
}
|
||||
if (name[8] == '6' && name[9] == '4' && name[10] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRIdFAST64;
|
||||
if (name[3] == 'i')
|
||||
return PRIiFAST64;
|
||||
if (name[3] == 'o')
|
||||
return PRIoFAST64;
|
||||
if (name[3] == 'u')
|
||||
return PRIuFAST64;
|
||||
if (name[3] == 'x')
|
||||
return PRIxFAST64;
|
||||
if (name[3] == 'X')
|
||||
return PRIXFAST64;
|
||||
abort ();
|
||||
}
|
||||
}
|
||||
if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X'
|
||||
&& name[7] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRIdMAX;
|
||||
if (name[3] == 'i')
|
||||
return PRIiMAX;
|
||||
if (name[3] == 'o')
|
||||
return PRIoMAX;
|
||||
if (name[3] == 'u')
|
||||
return PRIuMAX;
|
||||
if (name[3] == 'x')
|
||||
return PRIxMAX;
|
||||
if (name[3] == 'X')
|
||||
return PRIXMAX;
|
||||
abort ();
|
||||
}
|
||||
if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R'
|
||||
&& name[7] == '\0')
|
||||
{
|
||||
if (name[3] == 'd')
|
||||
return PRIdPTR;
|
||||
if (name[3] == 'i')
|
||||
return PRIiPTR;
|
||||
if (name[3] == 'o')
|
||||
return PRIoPTR;
|
||||
if (name[3] == 'u')
|
||||
return PRIuPTR;
|
||||
if (name[3] == 'x')
|
||||
return PRIxPTR;
|
||||
if (name[3] == 'X')
|
||||
return PRIXPTR;
|
||||
abort ();
|
||||
}
|
||||
}
|
||||
}
|
||||
/* Other system dependent strings are not valid. */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Initialize the codeset dependent parts of an opened message catalog.
|
||||
Return the header entry. */
|
||||
const char *
|
||||
@ -263,6 +891,7 @@ _nl_load_domain (domain_file, domainbinding)
|
||||
struct mo_file_header *data = (struct mo_file_header *) -1;
|
||||
int use_mmap = 0;
|
||||
struct loaded_domain *domain;
|
||||
int revision;
|
||||
const char *nullentry;
|
||||
|
||||
domain_file->decided = 1;
|
||||
@ -370,22 +999,257 @@ _nl_load_domain (domain_file, domainbinding)
|
||||
domain->use_mmap = use_mmap;
|
||||
domain->mmap_size = size;
|
||||
domain->must_swap = data->magic != _MAGIC;
|
||||
domain->malloced = NULL;
|
||||
|
||||
/* Fill in the information about the available tables. */
|
||||
switch (W (domain->must_swap, data->revision))
|
||||
revision = W (domain->must_swap, data->revision);
|
||||
/* We support only the major revision 0. */
|
||||
switch (revision >> 16)
|
||||
{
|
||||
case 0:
|
||||
domain->nstrings = W (domain->must_swap, data->nstrings);
|
||||
domain->orig_tab = (struct string_desc *)
|
||||
domain->orig_tab = (const struct string_desc *)
|
||||
((char *) data + W (domain->must_swap, data->orig_tab_offset));
|
||||
domain->trans_tab = (struct string_desc *)
|
||||
domain->trans_tab = (const struct string_desc *)
|
||||
((char *) data + W (domain->must_swap, data->trans_tab_offset));
|
||||
domain->hash_size = W (domain->must_swap, data->hash_tab_size);
|
||||
domain->hash_tab = (nls_uint32 *)
|
||||
((char *) data + W (domain->must_swap, data->hash_tab_offset));
|
||||
domain->hash_tab =
|
||||
(domain->hash_size > 2
|
||||
? (const nls_uint32 *)
|
||||
((char *) data + W (domain->must_swap, data->hash_tab_offset))
|
||||
: NULL);
|
||||
domain->must_swap_hash_tab = domain->must_swap;
|
||||
|
||||
/* Now dispatch on the minor revision. */
|
||||
switch (revision & 0xffff)
|
||||
{
|
||||
case 0:
|
||||
domain->n_sysdep_strings = 0;
|
||||
domain->orig_sysdep_tab = NULL;
|
||||
domain->trans_sysdep_tab = NULL;
|
||||
break;
|
||||
case 1:
|
||||
default:
|
||||
{
|
||||
nls_uint32 n_sysdep_strings;
|
||||
|
||||
if (domain->hash_tab == NULL)
|
||||
/* This is invalid. These minor revisions need a hash table. */
|
||||
goto invalid;
|
||||
|
||||
n_sysdep_strings =
|
||||
W (domain->must_swap, data->n_sysdep_strings);
|
||||
if (n_sysdep_strings > 0)
|
||||
{
|
||||
nls_uint32 n_sysdep_segments;
|
||||
const struct sysdep_segment *sysdep_segments;
|
||||
const char **sysdep_segment_values;
|
||||
const nls_uint32 *orig_sysdep_tab;
|
||||
const nls_uint32 *trans_sysdep_tab;
|
||||
size_t memneed;
|
||||
char *mem;
|
||||
struct sysdep_string_desc *inmem_orig_sysdep_tab;
|
||||
struct sysdep_string_desc *inmem_trans_sysdep_tab;
|
||||
nls_uint32 *inmem_hash_tab;
|
||||
unsigned int i;
|
||||
|
||||
/* Get the values of the system dependent segments. */
|
||||
n_sysdep_segments =
|
||||
W (domain->must_swap, data->n_sysdep_segments);
|
||||
sysdep_segments = (const struct sysdep_segment *)
|
||||
((char *) data
|
||||
+ W (domain->must_swap, data->sysdep_segments_offset));
|
||||
sysdep_segment_values =
|
||||
alloca (n_sysdep_segments * sizeof (const char *));
|
||||
for (i = 0; i < n_sysdep_segments; i++)
|
||||
{
|
||||
const char *name =
|
||||
(char *) data
|
||||
+ W (domain->must_swap, sysdep_segments[i].offset);
|
||||
nls_uint32 namelen =
|
||||
W (domain->must_swap, sysdep_segments[i].length);
|
||||
|
||||
if (!(namelen > 0 && name[namelen - 1] == '\0'))
|
||||
{
|
||||
freea (sysdep_segment_values);
|
||||
goto invalid;
|
||||
}
|
||||
|
||||
sysdep_segment_values[i] = get_sysdep_segment_value (name);
|
||||
}
|
||||
|
||||
orig_sysdep_tab = (const nls_uint32 *)
|
||||
((char *) data
|
||||
+ W (domain->must_swap, data->orig_sysdep_tab_offset));
|
||||
trans_sysdep_tab = (const nls_uint32 *)
|
||||
((char *) data
|
||||
+ W (domain->must_swap, data->trans_sysdep_tab_offset));
|
||||
|
||||
/* Compute the amount of additional memory needed for the
|
||||
system dependent strings and the augmented hash table. */
|
||||
memneed = 2 * n_sysdep_strings
|
||||
* sizeof (struct sysdep_string_desc)
|
||||
+ domain->hash_size * sizeof (nls_uint32);
|
||||
for (i = 0; i < 2 * n_sysdep_strings; i++)
|
||||
{
|
||||
const struct sysdep_string *sysdep_string =
|
||||
(const struct sysdep_string *)
|
||||
((char *) data
|
||||
+ W (domain->must_swap,
|
||||
i < n_sysdep_strings
|
||||
? orig_sysdep_tab[i]
|
||||
: trans_sysdep_tab[i - n_sysdep_strings]));
|
||||
size_t need = 0;
|
||||
const struct segment_pair *p = sysdep_string->segments;
|
||||
|
||||
if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END)
|
||||
for (p = sysdep_string->segments;; p++)
|
||||
{
|
||||
nls_uint32 sysdepref;
|
||||
|
||||
need += W (domain->must_swap, p->segsize);
|
||||
|
||||
sysdepref = W (domain->must_swap, p->sysdepref);
|
||||
if (sysdepref == SEGMENTS_END)
|
||||
break;
|
||||
|
||||
if (sysdepref >= n_sysdep_segments)
|
||||
{
|
||||
/* Invalid. */
|
||||
freea (sysdep_segment_values);
|
||||
goto invalid;
|
||||
}
|
||||
|
||||
need += strlen (sysdep_segment_values[sysdepref]);
|
||||
}
|
||||
|
||||
memneed += need;
|
||||
}
|
||||
|
||||
/* Allocate additional memory. */
|
||||
mem = (char *) malloc (memneed);
|
||||
if (mem == NULL)
|
||||
goto invalid;
|
||||
|
||||
domain->malloced = mem;
|
||||
inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;
|
||||
mem += n_sysdep_strings * sizeof (struct sysdep_string_desc);
|
||||
inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem;
|
||||
mem += n_sysdep_strings * sizeof (struct sysdep_string_desc);
|
||||
inmem_hash_tab = (nls_uint32 *) mem;
|
||||
mem += domain->hash_size * sizeof (nls_uint32);
|
||||
|
||||
/* Compute the system dependent strings. */
|
||||
for (i = 0; i < 2 * n_sysdep_strings; i++)
|
||||
{
|
||||
const struct sysdep_string *sysdep_string =
|
||||
(const struct sysdep_string *)
|
||||
((char *) data
|
||||
+ W (domain->must_swap,
|
||||
i < n_sysdep_strings
|
||||
? orig_sysdep_tab[i]
|
||||
: trans_sysdep_tab[i - n_sysdep_strings]));
|
||||
const char *static_segments =
|
||||
(char *) data
|
||||
+ W (domain->must_swap, sysdep_string->offset);
|
||||
const struct segment_pair *p = sysdep_string->segments;
|
||||
|
||||
/* Concatenate the segments, and fill
|
||||
inmem_orig_sysdep_tab[i] (for i < n_sysdep_strings) and
|
||||
inmem_trans_sysdep_tab[i-n_sysdep_strings] (for
|
||||
i >= n_sysdep_strings). */
|
||||
|
||||
if (W (domain->must_swap, p->sysdepref) == SEGMENTS_END)
|
||||
{
|
||||
/* Only one static segment. */
|
||||
inmem_orig_sysdep_tab[i].length =
|
||||
W (domain->must_swap, p->segsize);
|
||||
inmem_orig_sysdep_tab[i].pointer = static_segments;
|
||||
}
|
||||
else
|
||||
{
|
||||
inmem_orig_sysdep_tab[i].pointer = mem;
|
||||
|
||||
for (p = sysdep_string->segments;; p++)
|
||||
{
|
||||
nls_uint32 segsize =
|
||||
W (domain->must_swap, p->segsize);
|
||||
nls_uint32 sysdepref =
|
||||
W (domain->must_swap, p->sysdepref);
|
||||
size_t n;
|
||||
|
||||
if (segsize > 0)
|
||||
{
|
||||
memcpy (mem, static_segments, segsize);
|
||||
mem += segsize;
|
||||
static_segments += segsize;
|
||||
}
|
||||
|
||||
if (sysdepref == SEGMENTS_END)
|
||||
break;
|
||||
|
||||
n = strlen (sysdep_segment_values[sysdepref]);
|
||||
memcpy (mem, sysdep_segment_values[sysdepref], n);
|
||||
mem += n;
|
||||
}
|
||||
|
||||
inmem_orig_sysdep_tab[i].length =
|
||||
mem - inmem_orig_sysdep_tab[i].pointer;
|
||||
}
|
||||
}
|
||||
|
||||
/* Compute the augmented hash table. */
|
||||
for (i = 0; i < domain->hash_size; i++)
|
||||
inmem_hash_tab[i] =
|
||||
W (domain->must_swap_hash_tab, domain->hash_tab[i]);
|
||||
for (i = 0; i < n_sysdep_strings; i++)
|
||||
{
|
||||
const char *msgid = inmem_orig_sysdep_tab[i].pointer;
|
||||
nls_uint32 hash_val = hash_string (msgid);
|
||||
nls_uint32 idx = hash_val % domain->hash_size;
|
||||
nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
|
||||
|
||||
for (;;)
|
||||
{
|
||||
if (inmem_hash_tab[idx] == 0)
|
||||
{
|
||||
/* Hash table entry is empty. Use it. */
|
||||
inmem_hash_tab[idx] = 1 + domain->nstrings + i;
|
||||
break;
|
||||
}
|
||||
|
||||
if (idx >= domain->hash_size - incr)
|
||||
idx -= domain->hash_size - incr;
|
||||
else
|
||||
idx += incr;
|
||||
}
|
||||
}
|
||||
|
||||
freea (sysdep_segment_values);
|
||||
|
||||
domain->n_sysdep_strings = n_sysdep_strings;
|
||||
domain->orig_sysdep_tab = inmem_orig_sysdep_tab;
|
||||
domain->trans_sysdep_tab = inmem_trans_sysdep_tab;
|
||||
|
||||
domain->hash_tab = inmem_hash_tab;
|
||||
domain->must_swap_hash_tab = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
domain->n_sysdep_strings = 0;
|
||||
domain->orig_sysdep_tab = NULL;
|
||||
domain->trans_sysdep_tab = NULL;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
/* This is an invalid revision. */
|
||||
invalid:
|
||||
/* This is an invalid .mo file. */
|
||||
if (domain->malloced)
|
||||
free (domain->malloced);
|
||||
#ifdef HAVE_MMAP
|
||||
if (use_mmap)
|
||||
munmap ((caddr_t) data, size);
|
||||
@ -418,6 +1282,9 @@ _nl_unload_domain (domain)
|
||||
|
||||
_nl_free_domain_conv (domain);
|
||||
|
||||
if (domain->malloced)
|
||||
free (domain->malloced);
|
||||
|
||||
# ifdef _POSIX_MAPPED_FILES
|
||||
if (domain->use_mmap)
|
||||
munmap ((caddr_t) domain->data, domain->mmap_size);
|
||||
|
||||
Reference in New Issue
Block a user