9a0a462ceb
1997-09-11 04:36 Ulrich Drepper <drepper@cygnus.com> * db2/db_int.h: Define __set_errno if not yet available. * db2/btree/bt_rec.c: Use __set_errno to set errno value. * db2/clib/getlong.c: Likewise. * db2/db185/db185.c: Likewise. * db2/db185/db185_int.h: Likewise. * db2/dbm/dbm.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log_archive.c: Likewise. * elf/dl-profile.c: Implement mcount function. * gmon/gmon.c: Use __profil not profil because of namespace pollution. * gmon/mcount.c: Remove BSD kernel code. Use compare&swap instruction if possible to change state variable. Optimize frompc folding. * gmon/sys/gmon.h (struct gmonparam): Change state field to long int. * sysdeps/i386/i486/atomicity.h: New file. * sysdeps/stub/atomicity.h: New file. * sysdeps/mach/hurd/profil.c: Define function as __profil and make profil weak alias. * sysdeps/posix/profil.c: Likewise. * string/bits/string2.h: New file. * include/bits/string2.h: New file. * string/Makefile (routines): Add mempcpy. (tests): Add inl-tester. Remove _D__NO_STRING_INLINES from CFLAGS-* variables. * sysdeps/generic/mempcpy.c: New file. * sysdeps/generic/memccpy.c: Undef function name to enable definition as macro. * sysdeps/generic/memchr.c: Likewise. * sysdeps/generic/memcmp.c: Likewise. * sysdeps/generic/memmem.c: Likewise. * sysdeps/generic/memmove.c: Likewise. * sysdeps/generic/strcat.c: Likewise. * sysdeps/generic/strchr.c: Likewise. * sysdeps/generic/strcmp.c: Likewise. * sysdeps/generic/strcpy.c: Likewise. * sysdeps/generic/strcspn.c: Likewise. * sysdeps/generic/strlen.c: Likewise. * sysdeps/generic/strncat.c: Likewise. * sysdeps/generic/strncmp.c: Likewise. * sysdeps/generic/strncpy.c: Likewise. * sysdeps/generic/strpbrk.c: Likewise. * sysdeps/generic/strrchr.c: Likewise. * sysdeps/generic/strsep.c: Likewise. * sysdeps/generic/strspn.c: Likewise. * sysdeps/generic/strstr.c: Likewise. * sysdeps/generic/strtok.c: Likewise. * sysdeps/generic/strtok_r.c: Likewise. * sysdeps/i386/memset.c: Likewise. * sysdeps/i386/bits/string.h: Correct a few types and constraints. * sysdeps/i386/i486/bits/string.h: Heavy rewrites and optimizations. * string/stratcliff.c: Undefine __USE_STRING_INLINES. * string/tst-strlen.c: Likewise. * string/string.h: Add prototype for mempcpy. Include bits/string2.h header always if optimizing. * intl/dcgettext.c: Don't unconditionally define stpcpy, only if not yet defined. * intl/l10nflist.c: Likewise. * string/tester.c: Add copyright and make little cleanups. * inet/test_ifindex.c: Change type of ni variable to unsigned int. * locale/programs/ld-ctype.c (struct locale_ctype_t): Change type of fields map_collection_max and map_collection_act to size_t. * nss/libnss_files.map: Group entries. * posix/unistd.h: Add prototype for __setpgid and __profil. * sysdeps/generic/crypt.h: Declare __crypt_r. * sysdeps/i386/bits/select.h: Fix fatal bugs, use correct casts now. * sysdeps/i386/fpu/bits/mathinline.h (isgreater, isgreaterequal, isless, islessequal, islessgreater, isunordered): Optimize a bit. * sysdeps/stub/ftruncate.c: Include missing header for prototype. * sysdeps/stub/getdents.c: Likewise. * sysdeps/stub/reboot.c: Likewise. * sysdeps/stub/swapon.c: Likewise. * sysdeps/stub/syscall.c: Likewise. * sysdeps/stub/ualarm.c: Likewise. * sysdeps/stub/usleep.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Don't compile or use opensock if SIOGIFINDEX and SIOGIFNAME are not defined. * sysdeps/unix/sysv/linux/net/if.h: Add IFF_PORTSEL and IFF_AUTOMEDIA according to recent kernel changes. 1997-09-10 21:32 Klaus Espenlaub <kespenla@student.informatik.uni-ulm.de> * Makeconfig: Use $(have-initfini) instead of $(elf) to figure out the installed name of the startup code. (common-generated): Add version.mk. * Makefile (distclean-1): Add glibcbug. * Makerules: Replace -lgcc by $(gnulib). * catgets/Makefile (generated): Add xmalloc.o. * csu/Makefile (generated): Replace align.h and end.h by defs.h to match the generated file. * manual/Makefile (mostlyclean): Add stub-manual and stamp.o. (realclean): Changed to remove chapters-incl[12]. * po/Makefile (realclean): New rule to remove the generated .mo files. * time/Makefile: Only include zonefile dependencies if $(no_deps) is not true to avoid make clean failure when directory time doesn't exist yet. (generated): Add tzselect. * stdio/fgets.c (fgets): Add casts to reduce gcc warning noise. * stdio/internals.c (flushbuf): Likewise. * stdio/linewrap.c (lwupdate): Likewise. * stdio/memstream.c (enlarge_buffer): Likewise. * stdio-common/vfscanf.c (_IO_vfscanf): Likewise. * time/tzset.c (compute_change): Likewise. * misc/init-misc.c (__init_misc): Only declare static if HAVE_GNU_LD is defined. * sysdeps/posix/pipestream.c (FUNC): Change to generate ANSI C style functions. * sysdeps/stub/init-posix.c: Likewise. * sysdeps/stub/profil.c: Likewise. * munch-tmpl.c (__libc_init): Convert to ANSI C style declaration to reduce gcc warning noise. * stdio/glue.c (_filbuf, _flsbuf): Likewise. * stdio/obstream.c (grow, seek, input, init_obstream): Likewise. * stdio/vasprintf.c (enlarge_buffer): Likewise. * sysdeps/generic/sysd-stdio.c (__stdio_read, __stdio_write, __stdio_seek, __stdio_close, __stdio_fileno, __stdio_open, __stdio_reopen): Likewise. * sysdeps/posix/defs.c (_cleanup): Likewise. * time/offtime.c (__offtime): Add cast. * posix/getopt.c: Don't use text_set_element if not defined. * configure.in: Provide a check for underscores before user labels that works even when the compiler used for building doesn't work (like when there is no C library). Use the old way if the compiler works. 1997-09-10 05:08 David S. Miller <davem@caip.rutgers.edu> * sysdeps/unix/sysv/linux/sparc/bits/ioctls.h: The TC* ioctls use 'T' not 't' on SparcLinux. * sysdeps/unix/sysv/linux/sparc/bits/termios.h: tcflag_t is 32 bits. * sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add aliases for _longjmp and siglongjmp. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/stdio.h: Add format attributes to the extra printf and scanf like functions. * stdio/stdio.h: Likewise. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r): Print tablename_val, not tablename_len. * nis/nss_nisplus/nisplus-ethers.c (_nss_nisplus_getntohost_r): Use sprintf instead of sprintf, the string always fits. * nis/nss_nisplus/nisplus-hosts.c (_nss_nisplus_gethostbyaddr_r): Likewise. * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r): Likewise. * nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_getprotobynumber_r): Likewise. * nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_getrpcbynumber_r): Likewise. * nis/nss_nisplus/nisplus-service.c (_nss_nisplus_getservbynumber_r): Likewise. * nis/nss_nisplus/nisplus-alias.c (_nss_create_tablename): Use __stpcpy, __stpncpy and __strdup instead of public names. * nis/nss_nisplus/nisplus-ethers.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-grp.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-hosts.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_parse_netgroup): Likewise. * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_parse_netent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_parse_protoent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-pwd.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_parse_rpcent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-service.c (_nss_nisplus_parse_servent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-spwd.c (_nss_create_tablename): Likewise. * libc.map: Export __stpcpy and __strdup. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/Makefile (CFLAGS-test-float.c, CFLAGS-test-double.c, CFLAGS-test-ldouble.c): Pass -ffloat-store to avoid excessive precision. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * include/rpc/auth_des.h: New file. 1997-09-09 Paul Eggert <eggert@twinsun.com> * time/mktime.c (__mktime_internal): Declare sec_requested even if !LEAP_SECONDS_POSSIBLE, since it's needed at the end when checking for time_t overflow. 1997-09-09 22:11 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/getcwd.c: Correct test for too small buffer. Reported by Erik Troan <ewt@redhat.com>. * elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>. * elf/dl-open.c: Likewise. 1997-09-07 17:09 Richard Henderson <rth@cygnus.com> * sysdeps/alpha/Makefile: Kill setjmp_aux. * sysdeps/alpha/bits/setjmp.h: Rewrite in terms of an array. * sysdeps/alpha/__longjmp.c: Remove. * sysdeps/alpha/setjmp_aux.c: Remove. * sysdeps/alpha/__longjmp.S: New file. * sysdeps/alpha/bsd-_setjmp.S: Stub out. * sysdeps/alpha/bsd-setjmp.S: Likewise. * sysdeps/alpha/setjmp.S: Do the work; don't call __setjmp_aux. Move _setjmp and setjmp from bsd-*.S. 1997-09-06 20:20 Ulrich Drepper <drepper@cygnus.com> * include/rpc/auth.h: New file. * include/rpc/auth_unix.h: New file. 1997-09-06 Paul Eggert <eggert@twinsun.com> Fix gmtime so that it reports leap seconds when TZ indicates that leap seconds are desired. * time/gmtime.c (<stddef.h>): Remove unnecessary include. (gmtime): Put after gmtime_r, to help the compiler inline. (__tz_convert): New decl. (gmtime_r): Use __tz_convert instead of __offtime, so that leap seconds are handled correctly. * time/localtime.c (<errno.h>, <libc-lock.h>): Remove includes that are now unnecessary. (__tzset_internal, __tz_compute, __tzfile_compute, __use_tzfile, __tzset_lock): Remove extern decls that are now unnecessary. (localtime_internal): Moved to __tz_convert in tzset.c. so that localtime and gmtime can both use it easily. (localtime): Put after localtime_r, to help the compiler inline. (localtime_r): Use __tz_convert instead of localtime_internal. * time/strftime.c (__tz_compute): Remove unused (and now incorrect) decl. * time/tzfile.c (__tzfile_compute): New arg USE_LOCALTIME. * time/tzset.c (<errno.h>): Include. (_tmbuf): New decl. (__tzfile_compute): New function. (tz_compute): Renamed from __tz_compute. No longer extern. Remove redundant call to tzset_internal. (tzset_internal): Renamed from __tzset_internal. No longer extern. (tzset_lock): Renamed from __tzset_lock. No longer extern. (__tz_convert): New function, containing functionality of old localtime_internal function, plus locking and optional UTC. 1997-09-06 Paul Eggert <eggert@twinsun.com> * time/tzfile.c (__tzfile_read): Don't read a file if TZ is the empty string, just use UTC without leap seconds. This is for compatibility with the Olson code. 1997-09-06 Paul Eggert <eggert@twinsun.com> * time/tzset.c (__tzname_max): Lock tz data structures before invoking tzset_internal. * time/tzfile.c: Define compute_tzname_max statically. 1997-09-07 10:57 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_call.c: Remove not longer necessary HAVE_SECURE_RPC ifdefs. * nis/nis_intern.h: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/ypclnt.c: Likewise. * sunrpc/auth_des.c: Don't dereference NULL pointer, initialize ad->ad_timediff. * sunrpc/auth_none.c: Don't define our own prototypes, use the one from the header files. * sunrpc/auth_unix.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/rpc_cmsg.c: Likewise. * sunrpc/key_call.c: Fix signal handling. * sunrpc/openchild.c: Don't use /bin/sh to start /usr/etc/keyenvoy, or we will get a deadlock with NIS+. * sunrpc/rpc/auth.h: Add prototype for xdr_opaque_auth, don't define HAVE_SECURE_RPC. 1997-09-07 15:51 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/bits/select.h [__GNUC__] (__FD_ZERO, __FD_SET, __FD_CLR, __FD_ISSET): Use correct casts to address array correctly. Reported by urbanw@cs.umu.se. 1997-09-07 05:07 Ulrich Drepper <drepper@cygnus.com> * elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>. * elf/dl-open.c: Likewise. * sysdeps/i386/memset.c: Undefine memset in case the header with the optimized functions is included. Patches by NIIBE Yutaka <gniibe@mri.co.jp>. * sysdeps/i386/bits/string.h [__PIC__] (strcspn, strspn, strpbrk, strsep): Use register for second parameter. * sysdeps/i386/i486/bits/string.h: Likewise. Reported by NIIBE Yutaka <gniibe@mri.co.jp>. 1997-09-03 09:48 Geoff Keating <geoffk@ozemail.com.au> * math/libm-test.c: Change various tolerances to match what the tested routines can actually provide. * math/Makefile: Add new tests. * math/atest-sincos.c: New file. * math/atest-exp.c: New file. * csu/Makefile: Give initfini.s and initfiniS.s their own CFLAGS-* macros so they can be overridden. * sysdeps/powerpc/Makefile [subdir=csu]: Override flags for initfiniS.s to use -fpic instead of -fPIC, because the sed script breaks otherwise. * sysdeps/powerpc/Makefile [build-shared]: Use -fpic not -fPIC for efficiency. * sysdeps/powerpc/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Don't use register 0, to let _mcount be in a shared object. * sysdeps/powerpc/dl-machine.h: Use full sentences in comments. Generally clean up. Suppress some code we don't need when relocating ld.so. * sysdeps/powerpc/test-arith.c: Change loop indices to size_t when appropriate to suppress gcc warning. * resolv/res_send.c: Suppress warning. * sunrpc/xdr_sizeof.c: Suppress warning. * FAQ: Add ppc-linux. * manual/maint.texi: Add ppc-linux. Explain that gcc can't build it yet. * sysdeps/unix/sysv/linux/powerpc/profil-counter.h: Correct for current kernels. 1997-08-15 07:45 Geoff Keating <geoffk@ozemail.com.au> * stdlib/fmtmsg.c: Use two parameters for __libc_once_define. * sysdeps/i386/machine-gmon.h: Correct typo. * sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Change to match kernel. * sysdeps/generic/dl-sysdep.c: Add hook for bizzare PPC argument hack. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Rewrite to use sysdeps/linux/dl-sysdep.c. * sysdeps/powerpc/Makefile [subdir=gmon]: Compile ppc-mcount. * sysdeps/powerpc/machine-gmon.h: Use ppc-mcount. * sysdeps/powerpc/ppc-mcount: New file. The following are mostly changes to allow profiling: * sysdeps/powerpc/add_n.S: Added. * sysdeps/powerpc/add_n.s: Removed. * sysdeps/powerpc/addmul_1.S: Added. * sysdeps/powerpc/addmul_1.s: Removed. * sysdeps/powerpc/bsd-_setjmp.S: Use JUMPTARGET macro. * sysdeps/powerpc/bsd-setjmp.S: Use JUMPTARGET macro. * sysdeps/powerpc/lshift.S: Added. * sysdeps/powerpc/lshift.s: Removed. * sysdeps/powerpc/memset.S: Added. * sysdeps/powerpc/memset.s: Removed. * sysdeps/powerpc/mul_1.S: Added. * sysdeps/powerpc/mul_1.s: Removed. * sysdeps/powerpc/rshift.S: Added. * sysdeps/powerpc/rshift.s: Removed. * sysdeps/powerpc/s_copysign.S: Use ENTRY, END, weak_alias macros. * sysdeps/powerpc/s_fabs.S: Use ENTRY, END, weak_alias macros. * sysdeps/powerpc/setjmp.S: Use JUMPTARGET macro. * sysdeps/powerpc/strchr.S: Added. * sysdeps/powerpc/strchr.s: Removed. * sysdeps/powerpc/strcmp.S: Added. * sysdeps/powerpc/strcmp.s: Removed. * sysdeps/powerpc/strlen.S: Added. * sysdeps/powerpc/strlen.s: Removed. * sysdeps/powerpc/sub_n.S: Added. * sysdeps/powerpc/sub_n.s: Removed. * sysdeps/powerpc/submul_1.S: Added. * sysdeps/powerpc/submul_1.s: Removed. * sysdeps/unix/sysv/linux/powerpc/_exit.S: Removed. * sysdeps/unix/sysv/linux/powerpc/brk.S: Added. * sysdeps/unix/sysv/linux/powerpc/brk.c: Removed. * sysdeps/unix/sysv/linux/powerpc/clone.S: Use new macros. Fix various bugs. Document that it isn't tested. * sysdeps/unix/sysv/linux/powerpc/sigreturn.S: Make look like sysdeps/unix/_exit.S. * sysdeps/unix/sysv/linux/powerpc/socket.S: Use new macros. * sysdeps/unix/sysv/linux/powerpc/syscall.S: Use new macros. * sysdeps/unix/sysv/linux/powerpc/sysdep.h: Define some new macros to make assembler (possibly) more portable, allow profiling, etc.
600 lines
16 KiB
C
600 lines
16 KiB
C
/* Implementation of the dcgettext(3) function.
|
|
Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU C Library. Its master source is NOT part of
|
|
the C library, however.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <sys/types.h>
|
|
|
|
#ifdef __GNUC__
|
|
# define alloca __builtin_alloca
|
|
# define HAVE_ALLOCA 1
|
|
#else
|
|
# if defined HAVE_ALLOCA_H || defined _LIBC
|
|
# include <alloca.h>
|
|
# else
|
|
# ifdef _AIX
|
|
#pragma alloca
|
|
# else
|
|
# ifndef alloca
|
|
char *alloca ();
|
|
# endif
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#include <errno.h>
|
|
#ifndef errno
|
|
extern int errno;
|
|
#endif
|
|
#ifndef __set_errno
|
|
# define __set_errno(val) errno = (val)
|
|
#endif
|
|
|
|
#if defined STDC_HEADERS || defined _LIBC
|
|
# include <stdlib.h>
|
|
#else
|
|
char *getenv ();
|
|
# ifdef HAVE_MALLOC_H
|
|
# include <malloc.h>
|
|
# else
|
|
void free ();
|
|
# endif
|
|
#endif
|
|
|
|
#if defined HAVE_STRING_H || defined _LIBC
|
|
# ifndef _GNU_SOURCE
|
|
# define _GNU_SOURCE 1
|
|
# endif
|
|
# include <string.h>
|
|
#else
|
|
# include <strings.h>
|
|
#endif
|
|
#if !HAVE_STRCHR && !defined _LIBC
|
|
# ifndef strchr
|
|
# define strchr index
|
|
# endif
|
|
#endif
|
|
|
|
#if defined HAVE_UNISTD_H || defined _LIBC
|
|
# include <unistd.h>
|
|
#endif
|
|
|
|
#include "gettext.h"
|
|
#include "gettextP.h"
|
|
#ifdef _LIBC
|
|
# include <libintl.h>
|
|
#else
|
|
# include "libgettext.h"
|
|
#endif
|
|
#include "hash-string.h"
|
|
|
|
/* @@ 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
|
|
#else
|
|
# if !defined HAVE_GETCWD
|
|
char *getwd ();
|
|
# define getcwd(buf, max) getwd (buf)
|
|
# else
|
|
char *getcwd ();
|
|
# endif
|
|
# ifndef HAVE_STPCPY
|
|
static char *stpcpy PARAMS ((char *dest, const char *src));
|
|
# endif
|
|
#endif
|
|
|
|
/* 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)
|
|
# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
|
|
#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
|
|
|
|
/* XPG3 defines the result of `setlocale (category, NULL)' as:
|
|
``Directs `setlocale()' to query `category' and return the current
|
|
setting of `local'.''
|
|
However it does not specify the exact format. And even worse: POSIX
|
|
defines this not at all. So we can use this feature only on selected
|
|
system (e.g. those using GNU C Library). */
|
|
#ifdef _LIBC
|
|
# define HAVE_LOCALE_NULL
|
|
#endif
|
|
|
|
/* Name of the default domain used for gettext(3) prior any call to
|
|
textdomain(3). The default value for this is "messages". */
|
|
const char _nl_default_default_domain[] = "messages";
|
|
|
|
/* Value used as the default domain for gettext(3). */
|
|
const char *_nl_current_default_domain = _nl_default_default_domain;
|
|
|
|
/* Contains the default location of the message catalogs. */
|
|
const char _nl_default_dirname[] = GNULOCALEDIR;
|
|
|
|
/* List with bindings of specific domains created by bindtextdomain()
|
|
calls. */
|
|
struct binding *_nl_domain_bindings;
|
|
|
|
/* Prototypes for local functions. */
|
|
static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
|
|
const char *msgid));
|
|
static const char *category_to_name PARAMS ((int category));
|
|
static const char *guess_category_value PARAMS ((int category,
|
|
const char *categoryname));
|
|
|
|
|
|
/* For those loosing systems which don't have `alloca' we have to add
|
|
some additional code emulating it. */
|
|
#ifdef HAVE_ALLOCA
|
|
/* Nothing has to be done. */
|
|
# 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; \
|
|
free (old); \
|
|
} \
|
|
} while (0)
|
|
# undef alloca
|
|
# define alloca(size) (malloc (size))
|
|
#endif /* have alloca */
|
|
|
|
|
|
/* 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 DCGETTEXT __dcgettext
|
|
#else
|
|
# define DCGETTEXT dcgettext__
|
|
#endif
|
|
|
|
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
|
|
locale. */
|
|
char *
|
|
DCGETTEXT (domainname, msgid, category)
|
|
const char *domainname;
|
|
const char *msgid;
|
|
int category;
|
|
{
|
|
#ifndef HAVE_ALLOCA
|
|
struct block_list *block_list = NULL;
|
|
#endif
|
|
struct loaded_l10nfile *domain;
|
|
struct binding *binding;
|
|
const char *categoryname;
|
|
const char *categoryvalue;
|
|
char *dirname, *xdomainname;
|
|
char *single_locale;
|
|
char *retval;
|
|
int saved_errno = errno;
|
|
|
|
/* If no real MSGID is given return NULL. */
|
|
if (msgid == NULL)
|
|
return NULL;
|
|
|
|
/* 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
|
|
defintion left this undefined. */
|
|
if (domainname == NULL)
|
|
domainname = _nl_current_default_domain;
|
|
|
|
/* First find matching binding. */
|
|
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)
|
|
dirname = (char *) _nl_default_dirname;
|
|
else if (binding->dirname[0] == '/')
|
|
dirname = binding->dirname;
|
|
else
|
|
{
|
|
/* We have a relative path. Make it absolute now. */
|
|
size_t dirname_len = strlen (binding->dirname) + 1;
|
|
size_t path_max;
|
|
char *ret;
|
|
|
|
path_max = (unsigned) PATH_MAX;
|
|
path_max += 2; /* The getcwd docs say to do this. */
|
|
|
|
dirname = (char *) alloca (path_max + dirname_len);
|
|
ADD_BLOCK (block_list, dirname);
|
|
|
|
__set_errno (0);
|
|
while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
|
|
{
|
|
path_max += PATH_INCR;
|
|
dirname = (char *) alloca (path_max + dirname_len);
|
|
ADD_BLOCK (block_list, dirname);
|
|
__set_errno (0);
|
|
}
|
|
|
|
if (ret == NULL)
|
|
{
|
|
/* We cannot get the current working directory. Don't signal an
|
|
error but simply return the default string. */
|
|
FREE_BLOCKS (block_list);
|
|
__set_errno (saved_errno);
|
|
return (char *) msgid;
|
|
}
|
|
|
|
stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
|
|
}
|
|
|
|
/* Now determine the symbolic name of CATEGORY and its value. */
|
|
categoryname = category_to_name (category);
|
|
categoryvalue = guess_category_value (category, categoryname);
|
|
|
|
xdomainname = (char *) alloca (strlen (categoryname)
|
|
+ strlen (domainname) + 5);
|
|
ADD_BLOCK (block_list, xdomainname);
|
|
|
|
stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
|
|
domainname),
|
|
".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 th 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';
|
|
}
|
|
|
|
/* 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)
|
|
{
|
|
FREE_BLOCKS (block_list);
|
|
__set_errno (saved_errno);
|
|
return (char *) msgid;
|
|
}
|
|
|
|
|
|
/* Find structure describing the message catalog matching the
|
|
DOMAINNAME and CATEGORY. */
|
|
domain = _nl_find_domain (dirname, single_locale, xdomainname);
|
|
|
|
if (domain != NULL)
|
|
{
|
|
retval = find_msg (domain, msgid);
|
|
|
|
if (retval == NULL)
|
|
{
|
|
int cnt;
|
|
|
|
for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
|
|
{
|
|
retval = find_msg (domain->successor[cnt], msgid);
|
|
|
|
if (retval != NULL)
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (retval != NULL)
|
|
{
|
|
FREE_BLOCKS (block_list);
|
|
__set_errno (saved_errno);
|
|
return retval;
|
|
}
|
|
}
|
|
}
|
|
/* NOTREACHED */
|
|
}
|
|
|
|
#ifdef _LIBC
|
|
/* Alias for function name in GNU C Library. */
|
|
weak_alias (__dcgettext, dcgettext);
|
|
#endif
|
|
|
|
|
|
static char *
|
|
find_msg (domain_file, msgid)
|
|
struct loaded_l10nfile *domain_file;
|
|
const char *msgid;
|
|
{
|
|
size_t top, act, bottom;
|
|
struct loaded_domain *domain;
|
|
|
|
if (domain_file->decided == 0)
|
|
_nl_load_domain (domain_file);
|
|
|
|
if (domain_file->data == NULL)
|
|
return NULL;
|
|
|
|
domain = (struct loaded_domain *) domain_file->data;
|
|
|
|
/* Locate the MSGID and its translation. */
|
|
if (domain->hash_size > 2 && domain->hash_tab != NULL)
|
|
{
|
|
/* Use the hashing table. */
|
|
nls_uint32 len = strlen (msgid);
|
|
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));
|
|
nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
|
|
|
|
if (nstr == 0)
|
|
/* Hash table entry is empty. */
|
|
return NULL;
|
|
|
|
if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
|
|
&& strcmp (msgid,
|
|
domain->data + W (domain->must_swap,
|
|
domain->orig_tab[nstr - 1].offset)) == 0)
|
|
return (char *) domain->data + W (domain->must_swap,
|
|
domain->trans_tab[nstr - 1].offset);
|
|
|
|
while (1)
|
|
{
|
|
if (idx >= domain->hash_size - incr)
|
|
idx -= domain->hash_size - incr;
|
|
else
|
|
idx += incr;
|
|
|
|
nstr = W (domain->must_swap, domain->hash_tab[idx]);
|
|
if (nstr == 0)
|
|
/* Hash table entry is empty. */
|
|
return NULL;
|
|
|
|
if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
|
|
&& strcmp (msgid,
|
|
domain->data + W (domain->must_swap,
|
|
domain->orig_tab[nstr - 1].offset))
|
|
== 0)
|
|
return (char *) domain->data
|
|
+ W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
|
|
}
|
|
/* NOTREACHED */
|
|
}
|
|
|
|
/* Now we try the default method: binary search in the sorted
|
|
array of messages. */
|
|
bottom = 0;
|
|
top = domain->nstrings;
|
|
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
|
|
break;
|
|
}
|
|
|
|
/* If an translation is found return this. */
|
|
return bottom >= top ? NULL : (char *) domain->data
|
|
+ W (domain->must_swap,
|
|
domain->trans_tab[act].offset);
|
|
}
|
|
|
|
|
|
/* Return string representation of locale CATEGORY. */
|
|
static const char *
|
|
category_to_name (category)
|
|
int category;
|
|
{
|
|
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;
|
|
}
|
|
|
|
/* Guess value of current locale from value of the environment variables. */
|
|
static const char *
|
|
guess_category_value (category, categoryname)
|
|
int category;
|
|
const char *categoryname;
|
|
{
|
|
const char *retval;
|
|
|
|
/* The highest priority value is the `LANGUAGE' environment
|
|
variable. This is a GNU extension. */
|
|
retval = getenv ("LANGUAGE");
|
|
if (retval != NULL && retval[0] != '\0')
|
|
return retval;
|
|
|
|
/* `LANGUAGE' is not set. So we have to proceed with the POSIX
|
|
methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some
|
|
systems this can be done by the `setlocale' function itself. */
|
|
#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
|
|
return setlocale (category, NULL);
|
|
#else
|
|
/* Setting of LC_ALL overwrites all other. */
|
|
retval = getenv ("LC_ALL");
|
|
if (retval != NULL && retval[0] != '\0')
|
|
return retval;
|
|
|
|
/* Next comes the name of the desired category. */
|
|
retval = getenv (categoryname);
|
|
if (retval != NULL && retval[0] != '\0')
|
|
return retval;
|
|
|
|
/* Last possibility is the LANG environment variable. */
|
|
retval = getenv ("LANG");
|
|
if (retval != NULL && retval[0] != '\0')
|
|
return retval;
|
|
|
|
/* We use C as the default domain. POSIX says this is implementation
|
|
defined. */
|
|
return "C";
|
|
#endif
|
|
}
|
|
|
|
/* @@ 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 *
|
|
stpcpy (dest, src)
|
|
char *dest;
|
|
const char *src;
|
|
{
|
|
while ((*dest++ = *src++) != '\0')
|
|
/* Do nothing. */ ;
|
|
return dest - 1;
|
|
}
|
|
#endif
|