mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
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.
415 lines
10 KiB
C
415 lines
10 KiB
C
/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
||
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
|
||
|
||
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
|
||
|
||
|
||
#if defined HAVE_STRING_H || defined _LIBC
|
||
# ifndef _GNU_SOURCE
|
||
# define _GNU_SOURCE 1
|
||
# endif
|
||
# include <string.h>
|
||
#else
|
||
# include <strings.h>
|
||
# ifndef memcpy
|
||
# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
|
||
# endif
|
||
#endif
|
||
#if !HAVE_STRCHR && !defined _LIBC
|
||
# ifndef strchr
|
||
# define strchr index
|
||
# endif
|
||
#endif
|
||
|
||
#if defined _LIBC || defined HAVE_ARGZ_H
|
||
# include <argz.h>
|
||
#endif
|
||
#include <ctype.h>
|
||
#include <sys/types.h>
|
||
|
||
#if defined STDC_HEADERS || defined _LIBC
|
||
# include <stdlib.h>
|
||
#endif
|
||
|
||
#include "loadinfo.h"
|
||
|
||
/* On some strange systems still no definition of NULL is found. Sigh! */
|
||
#ifndef NULL
|
||
# if defined __STDC__ && __STDC__
|
||
# define NULL ((void *) 0)
|
||
# else
|
||
# define NULL 0
|
||
# endif
|
||
#endif
|
||
|
||
/* @@ 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. */
|
||
# ifndef stpcpy
|
||
# define stpcpy(dest, src) __stpcpy(dest, src)
|
||
# endif
|
||
#else
|
||
# ifndef HAVE_STPCPY
|
||
static char *stpcpy PARAMS ((char *dest, const char *src));
|
||
# endif
|
||
#endif
|
||
|
||
/* Define function which are usually not available. */
|
||
|
||
#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
|
||
/* Returns the number of strings in ARGZ. */
|
||
static size_t argz_count__ PARAMS ((const char *argz, size_t len));
|
||
|
||
static size_t
|
||
argz_count__ (argz, len)
|
||
const char *argz;
|
||
size_t len;
|
||
{
|
||
size_t count = 0;
|
||
while (len > 0)
|
||
{
|
||
size_t part_len = strlen (argz);
|
||
argz += part_len + 1;
|
||
len -= part_len + 1;
|
||
count++;
|
||
}
|
||
return count;
|
||
}
|
||
# undef __argz_count
|
||
# define __argz_count(argz, len) argz_count__ (argz, len)
|
||
#endif /* !_LIBC && !HAVE___ARGZ_COUNT */
|
||
|
||
#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
|
||
/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
|
||
except the last into the character SEP. */
|
||
static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
|
||
|
||
static void
|
||
argz_stringify__ (argz, len, sep)
|
||
char *argz;
|
||
size_t len;
|
||
int sep;
|
||
{
|
||
while (len > 0)
|
||
{
|
||
size_t part_len = strlen (argz);
|
||
argz += part_len;
|
||
len -= part_len + 1;
|
||
if (len > 0)
|
||
*argz++ = sep;
|
||
}
|
||
}
|
||
# undef __argz_stringify
|
||
# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
|
||
#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
|
||
|
||
#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
|
||
static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
|
||
const char *entry));
|
||
|
||
static char *
|
||
argz_next__ (argz, argz_len, entry)
|
||
char *argz;
|
||
size_t argz_len;
|
||
const char *entry;
|
||
{
|
||
if (entry)
|
||
{
|
||
if (entry < argz + argz_len)
|
||
entry = strchr (entry, '\0') + 1;
|
||
|
||
return entry >= argz + argz_len ? NULL : (char *) entry;
|
||
}
|
||
else
|
||
if (argz_len > 0)
|
||
return argz;
|
||
else
|
||
return 0;
|
||
}
|
||
# undef __argz_next
|
||
# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
|
||
#endif /* !_LIBC && !HAVE___ARGZ_NEXT */
|
||
|
||
|
||
/* Return number of bits set in X. */
|
||
static int pop PARAMS ((int x));
|
||
|
||
static inline int
|
||
pop (x)
|
||
int x;
|
||
{
|
||
/* We assume that no more than 16 bits are used. */
|
||
x = ((x & ~0x5555) >> 1) + (x & 0x5555);
|
||
x = ((x & ~0x3333) >> 2) + (x & 0x3333);
|
||
x = ((x >> 4) + x) & 0x0f0f;
|
||
x = ((x >> 8) + x) & 0xff;
|
||
|
||
return x;
|
||
}
|
||
|
||
|
||
struct loaded_l10nfile *
|
||
_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
|
||
territory, codeset, normalized_codeset, modifier, special,
|
||
sponsor, revision, filename, do_allocate)
|
||
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 *special;
|
||
const char *sponsor;
|
||
const char *revision;
|
||
const char *filename;
|
||
int do_allocate;
|
||
{
|
||
char *abs_filename;
|
||
struct loaded_l10nfile *last = NULL;
|
||
struct loaded_l10nfile *retval;
|
||
char *cp;
|
||
size_t entries;
|
||
int cnt;
|
||
|
||
/* Allocate room for the full file name. */
|
||
abs_filename = (char *) malloc (dirlist_len
|
||
+ strlen (language)
|
||
+ ((mask & TERRITORY) != 0
|
||
? strlen (territory) + 1 : 0)
|
||
+ ((mask & XPG_CODESET) != 0
|
||
? strlen (codeset) + 1 : 0)
|
||
+ ((mask & XPG_NORM_CODESET) != 0
|
||
? strlen (normalized_codeset) + 1 : 0)
|
||
+ (((mask & XPG_MODIFIER) != 0
|
||
|| (mask & CEN_AUDIENCE) != 0)
|
||
? strlen (modifier) + 1 : 0)
|
||
+ ((mask & CEN_SPECIAL) != 0
|
||
? strlen (special) + 1 : 0)
|
||
+ (((mask & CEN_SPONSOR) != 0
|
||
|| (mask & CEN_REVISION) != 0)
|
||
? (1 + ((mask & CEN_SPONSOR) != 0
|
||
? strlen (sponsor) + 1 : 0)
|
||
+ ((mask & CEN_REVISION) != 0
|
||
? strlen (revision) + 1 : 0)) : 0)
|
||
+ 1 + strlen (filename) + 1);
|
||
|
||
if (abs_filename == NULL)
|
||
return NULL;
|
||
|
||
retval = NULL;
|
||
last = NULL;
|
||
|
||
/* Construct file name. */
|
||
memcpy (abs_filename, dirlist, dirlist_len);
|
||
__argz_stringify (abs_filename, dirlist_len, ':');
|
||
cp = abs_filename + (dirlist_len - 1);
|
||
*cp++ = '/';
|
||
cp = stpcpy (cp, language);
|
||
|
||
if ((mask & TERRITORY) != 0)
|
||
{
|
||
*cp++ = '_';
|
||
cp = stpcpy (cp, territory);
|
||
}
|
||
if ((mask & XPG_CODESET) != 0)
|
||
{
|
||
*cp++ = '.';
|
||
cp = stpcpy (cp, codeset);
|
||
}
|
||
if ((mask & XPG_NORM_CODESET) != 0)
|
||
{
|
||
*cp++ = '.';
|
||
cp = stpcpy (cp, normalized_codeset);
|
||
}
|
||
if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
|
||
{
|
||
/* This component can be part of both syntaces but has different
|
||
leading characters. For CEN we use `+', else `@'. */
|
||
*cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
|
||
cp = stpcpy (cp, modifier);
|
||
}
|
||
if ((mask & CEN_SPECIAL) != 0)
|
||
{
|
||
*cp++ = '+';
|
||
cp = stpcpy (cp, special);
|
||
}
|
||
if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
|
||
{
|
||
*cp++ = ',';
|
||
if ((mask & CEN_SPONSOR) != 0)
|
||
cp = stpcpy (cp, sponsor);
|
||
if ((mask & CEN_REVISION) != 0)
|
||
{
|
||
*cp++ = '_';
|
||
cp = stpcpy (cp, revision);
|
||
}
|
||
}
|
||
|
||
*cp++ = '/';
|
||
stpcpy (cp, filename);
|
||
|
||
/* Look in list of already loaded domains whether it is already
|
||
available. */
|
||
last = NULL;
|
||
for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
|
||
if (retval->filename != NULL)
|
||
{
|
||
int compare = strcmp (retval->filename, abs_filename);
|
||
if (compare == 0)
|
||
/* We found it! */
|
||
break;
|
||
if (compare < 0)
|
||
{
|
||
/* It's not in the list. */
|
||
retval = NULL;
|
||
break;
|
||
}
|
||
|
||
last = retval;
|
||
}
|
||
|
||
if (retval != NULL || do_allocate == 0)
|
||
{
|
||
free (abs_filename);
|
||
return retval;
|
||
}
|
||
|
||
retval = (struct loaded_l10nfile *)
|
||
malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len)
|
||
* (1 << pop (mask))
|
||
* sizeof (struct loaded_l10nfile *)));
|
||
if (retval == NULL)
|
||
return NULL;
|
||
|
||
retval->filename = abs_filename;
|
||
retval->decided = (__argz_count (dirlist, dirlist_len) != 1
|
||
|| ((mask & XPG_CODESET) != 0
|
||
&& (mask & XPG_NORM_CODESET) != 0));
|
||
retval->data = NULL;
|
||
|
||
if (last == NULL)
|
||
{
|
||
retval->next = *l10nfile_list;
|
||
*l10nfile_list = retval;
|
||
}
|
||
else
|
||
{
|
||
retval->next = last->next;
|
||
last->next = retval;
|
||
}
|
||
|
||
entries = 0;
|
||
/* If the DIRLIST is a real list the RETVAL entry corresponds not to
|
||
a real file. So we have to use the DIRLIST separation mechanism
|
||
of the inner loop. */
|
||
cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
|
||
for (; cnt >= 0; --cnt)
|
||
if ((cnt & ~mask) == 0
|
||
&& ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
|
||
&& ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
|
||
{
|
||
/* Iterate over all elements of the DIRLIST. */
|
||
char *dir = NULL;
|
||
|
||
while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
|
||
!= NULL)
|
||
retval->successor[entries++]
|
||
= _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
|
||
language, territory, codeset,
|
||
normalized_codeset, modifier, special,
|
||
sponsor, revision, filename, 1);
|
||
}
|
||
retval->successor[entries] = NULL;
|
||
|
||
return retval;
|
||
}
|
||
|
||
/* Normalize codeset name. There is no standard for the codeset
|
||
names. Normalization allows the user to use any of the common
|
||
names. */
|
||
const char *
|
||
_nl_normalize_codeset (codeset, name_len)
|
||
const char *codeset;
|
||
size_t name_len;
|
||
{
|
||
int len = 0;
|
||
int only_digit = 1;
|
||
char *retval;
|
||
char *wp;
|
||
size_t cnt;
|
||
|
||
for (cnt = 0; cnt < name_len; ++cnt)
|
||
if (isalnum (codeset[cnt]))
|
||
{
|
||
++len;
|
||
|
||
if (isalpha (codeset[cnt]))
|
||
only_digit = 0;
|
||
}
|
||
|
||
retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
|
||
|
||
if (retval != NULL)
|
||
{
|
||
if (only_digit)
|
||
wp = stpcpy (retval, "iso");
|
||
else
|
||
wp = retval;
|
||
|
||
for (cnt = 0; cnt < name_len; ++cnt)
|
||
if (isalpha (codeset[cnt]))
|
||
*wp++ = tolower (codeset[cnt]);
|
||
else if (isdigit (codeset[cnt]))
|
||
*wp++ = codeset[cnt];
|
||
|
||
*wp = '\0';
|
||
}
|
||
|
||
return (const char *) retval;
|
||
}
|
||
|
||
|
||
/* @@ 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
|