From f0f1bf8536fe660cb6230a22694f9b7e6b02605e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 12 Sep 1996 02:51:03 +0000 Subject: update from main archive 960911 Thu Sep 12 03:35:27 1996 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/Dist: Remove init-first.h. * sysdeps/unix/sysv/linux/m68k/Dist: Likewise. * sysdeps/unix/sysv/linux/Dist: Add init-first.h. 1996-09-11 Paul Eggert * strftime.c (strftime): Handle E and O modifiers, required for POSIX.2 and XPG4. Don't use sprintf to format numbers; this way, we can handle time_t correctly regardless of whether it's signed. Don't dump core if format ends in %. In default %c format, use %e instead of %d, for POSIX.2 compatibility. For %z: Use tm_gmtoff if available. Output nothing if tm_isdst is negative. Output correct value even if arg is 1969-12-31 23:59:59 UTC. Don't assume that UTC offset is less than 24 hours; Posix requires support for 24 hours, and there's no point limiting it at all. (HAVE_TM_GMTOFF, TYPE_SIGNED, INT_STRLEN_BOUND): New macros. (CHAR_BIT): Define if doesn't. (tm_diff): New function. (fmt, ): Remove; no longer used. Thu Sep 12 02:21:44 1996 Ulrich Drepper * db/Makefile: Add extra-libs-others variable so that shared library is built in `others' pass. * elf/Makefile: Likewise. * math/Makefile: Likewise. * resolv/Makefile: Likewise. * Makefile (generated): Add version.info.h. * time/checktab.awk: New file. From ADO 96k. * time/iso3166.tab: Likewise. * time/tzselect.ksh: Likewise. * time/zone.tab: Likewise. * stdio-common/vfprintf.c: Correct cleanup registration. We cannot use a macro 1996-09-11 Paul Eggert * time/time.h (tm_gmtoff, tm_zone): Prefix with `__' unless __USE_BSD; this is required for ANSI C compatibility. * manual/time.texi: Replace GMT by UTC, daylight savings by daylight saving, timezone by time zone. Rewrite description of %V to match ISO 8601. Fix TZ Posix string example for US Eastern time. Explain tzname[1] when DST isn't used. Explain tzname when multiple abbreviations used (e.g. EST/EWT/EDT). Explain that timezone's sign is opposite from tm_gmtoff, and that timezone lacks DST adjustment whereas tm_gmtoff has it. Deprecate tzname and timezone. Tue Sep 10 14:46:16 1996 Andreas Schwab Implement Roland McGrath's idea of how to put an .interp into shared libraries. * interp.c: New file. * Makerules (interp-obj): New object, linked into every shared library. (common-generated): Add interp.so. (CFLAGS-interp.c): Pass name of interpreter. Tue Sep 10 21:09:35 1996 Andreas Schwab * db/Makefile: Fix typo. Tue Sep 10 19:29:53 1996 Andreas Schwab * nss/db-Makefile ($(VAR_DB)/passwd.db): Look for multiple occurences of the same uid, and only generate a mapping for the first one. Tue Sep 10 03:14:59 1996 Andreas Schwab * sysdeps/unix/sysv/linux/system.c: New file, to override sysdeps/unix/system.c. Tue Sep 10 15:05:40 1996 Andreas Schwab * Makefile (before-compile): Add version-info.h, needed to build version.d. Tue Sep 10 14:14:33 1996 Andreas Schwab * sysdeps/unix/sysv/linux/m68k/sysdep.S: Remove check for EWOULDBLOCK, never true on Linux. (__errno_location): New function. [_LIBC_REENTRANT]: Set errno using __errno_location function. * sysdeps/unix/sysv/linux/m68k/sysdep.h [PIC]: Add second syscall_error handler for reentrant libc. Tue Sep 10 13:27:49 1996 Andreas Schwab * elf/Makefile (extra-objs): Add eval.so to get dependencies. Wed Sep 11 04:40:57 1996 Ulrich Drepper * time/tzset.c (__tzname_cur_max): Use type `size_t' to avoid warning. * time/tzfile.c (compute_tzname_max): Likewise. --- sysdeps/generic/dl-cache.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) (limited to 'sysdeps/generic/dl-cache.c') diff --git a/sysdeps/generic/dl-cache.c b/sysdeps/generic/dl-cache.c index 6cd454c7ac..20a312fee3 100644 --- a/sysdeps/generic/dl-cache.c +++ b/sysdeps/generic/dl-cache.c @@ -84,3 +84,89 @@ _dl_load_cache_lookup (const char *name) return NULL; } +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. +Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +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., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include +#include +#include + +/* System-dependent function to read a file's whole contents + in the most convenient manner available. */ +extern void *_dl_sysdep_read_whole_file (const char *filename, + size_t *filesize_ptr, + int mmap_prot); + +#define CACHEMAGIC "ld.so-1.7.0" + +struct cache_file + { + char magic[sizeof CACHEMAGIC - 1]; + unsigned int nlibs; + struct + { + int flags; /* This is 1 for an ELF library. */ + unsigned int key, value; /* String table indices. */ + } libs[0]; + }; + +/* Look up NAME in ld.so.cache and return the file name stored there, + or null if none is found. */ + +const char * +_dl_load_cache_lookup (const char *name) +{ + static struct cache_file *cache; + static size_t cachesize; + unsigned int i; + + if (cache == (void *) -1) + /* Previously looked for the cache file and didn't find it. */ + return NULL; + + if (cache == NULL) + { + /* Read the contents of the file. */ + void *file = _dl_sysdep_read_whole_file ("/etc/ld.so.cache", &cachesize, + PROT_READ); + if (file && cachesize > sizeof *cache && + !memcmp (file, CACHEMAGIC, sizeof CACHEMAGIC - 1)) + /* Looks ok. */ + cache = file; + else + { + if (file) + __munmap (file, cachesize); + cache = (void *) -1; + return NULL; + } + } + + for (i = 0; i < cache->nlibs; ++i) + if (cache->libs[i].flags == 1 && /* ELF library entry. */ + /* Make sure string table indices are not bogus before using them. */ + cache->libs[i].key < cachesize - sizeof *cache && + cache->libs[i].value < cachesize - sizeof *cache && + /* Does the name match? */ + ! strcmp (name, ((const char *) &cache->libs[cache->nlibs] + + cache->libs[i].key))) + return (const char *) &cache->libs[cache->nlibs] + cache->libs[i].value; + + return NULL; +} -- cgit v1.2.3