mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 23:30:07 +00:00
45eca4d141
2000-05-06 Bruno Haible <haible@clisp.cons.org> * iconv/gconv_open.c (__gconv_open): If __gconv_find_transform returned != __GCONV_OK, there is nothing to clean up. 2000-05-06 Bruno Haible <haible@clisp.cons.org> * intl/tst-gettext.c (main): Disable possibly existing LC_CTYPE and OUTPUT_CHARSET environment variables. 2000-05-06 Andreas Jaeger <aj@suse.de> * sysdeps/generic/dl-cache.h (struct file_entry_new): New. (struct cache_file_new): New. (struct file_entry): New (moved from cache.c). (struct cache_file): New (moved from cache.c). * sysdeps/generic/dl-cache.c (SEARCH_CACHE): New macro, broken out from _dl_load_cache_lookup. (_dl_load_cache_lookup): Move search to SEARCH_CACHE macro, handle the different cache formats. New variable cache_new for new format. * elf/ldconfig.h: Change according to changes in cache.c and ldconfig.c; remove cache_libcmp; add opt_format. * elf/ldconfig.c: Include "dl-cache.h" and "dl-procinfo.h"; remove stuff that's defined in those headers. Add hwcap to struct lib_entry. (opt_format): New variable to select cache format. (options): Add format parameter. (is_hwcap): New function. (path_hwcap): New function. (parse_opt): Handle new format parameter. (search_dir): Handle hwcap, search also subdirectories with hwcap. * elf/cache.c (_GNU_SOURCE): Removed. Not needed anymore since ldconfig is part of glibc. Include dl-cache.h and remove stuff that's defined there. (struct cache_entry): Add new member hwcap. (print_entry): Print hwcap, cleanup a bit. (print_cache): Print new and old formats. (compare): Use _dl_cache_libcmp from dl-cache.h; handle hwcap. (save_cache): Save new and old formats. (add_to_cache): Handle hwcap. * sysdeps/generic/dl-cache.c (_dl_cache_libcmp): Moved from here... * sysdeps/generic/dl-cache.h (_dl_cache_libcmp): ...to here. * sysdeps/generic/dl-cache.c (LD_SO_CACHE): Moved from here... * sysdeps/generic/dl-cache.h (LD_SO_CACHE): ...to here. * sysdeps/generic/dl-cache.c (CACHEMAGIC): Moved from here... * sysdeps/generic/dl-cache.h (CACHEMAGIC): ...to here. 2000-05-05 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (alignof): New macro. (_nl_find_msg): Use it instead of __alignof__. Pass correct output buffer length to __gconv/iconv. If malloc (freemem_size) fails, set freemem_size to 0. 2000-05-05 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (dcigettext): Fix interpretation of tsearch return value.
122 lines
3.1 KiB
C
122 lines
3.1 KiB
C
/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
|
|
Copyright (C) 1999, 2000 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., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#define _DL_CACHE_DEFAULT_ID 3
|
|
|
|
#define _dl_cache_check_flags(flags) \
|
|
((flags) == 1 || (flags) == _DL_CACHE_DEFAULT_ID)
|
|
|
|
|
|
#ifndef LD_SO_CACHE
|
|
# define LD_SO_CACHE "/etc/ld.so.cache"
|
|
#endif
|
|
|
|
#define CACHEMAGIC "ld.so-1.7.0"
|
|
|
|
/* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another
|
|
format has been added in a compatible way:
|
|
The beginning of the string table is used for the new table:
|
|
old_magic
|
|
nlibs
|
|
libs[0]
|
|
...
|
|
libs[nlibs-1]
|
|
new magic
|
|
newnlibs
|
|
...
|
|
newlibs[0]
|
|
...
|
|
newlibs[newnlibs-1]
|
|
string 1
|
|
string 2
|
|
...
|
|
*/
|
|
struct file_entry
|
|
{
|
|
int flags; /* This is 1 for an ELF library. */
|
|
unsigned int key, value; /* String table indices. */
|
|
};
|
|
|
|
struct cache_file
|
|
{
|
|
char magic[sizeof CACHEMAGIC - 1];
|
|
unsigned int nlibs;
|
|
struct file_entry libs[0];
|
|
};
|
|
|
|
#define CACHEMAGIC_NEW "glibc-ld.so.cache"
|
|
#define CACHE_VERSION "1.0"
|
|
|
|
|
|
struct file_entry_new
|
|
{
|
|
int flags; /* This is 1 for an ELF library. */
|
|
unsigned int key, value; /* String table indices. */
|
|
unsigned long hwcap; /* Hwcap entry. */
|
|
};
|
|
|
|
struct cache_file_new
|
|
{
|
|
char magic[sizeof CACHEMAGIC_NEW - 1];
|
|
char version[sizeof CACHE_VERSION - 1];
|
|
unsigned int nlibs; /* Number of entries. */
|
|
unsigned int len_strings; /* Size of string table. */
|
|
unsigned int unused[4]; /* Leave space for future extensions. */
|
|
struct file_entry_new libs[0]; /* Entries describing libraries. */
|
|
/* After this the string table of size len_strings is found. */
|
|
};
|
|
|
|
static int
|
|
_dl_cache_libcmp (const char *p1, const char *p2)
|
|
{
|
|
while (*p1 != '\0')
|
|
{
|
|
if (*p1 >= '0' && *p1 <= '9')
|
|
{
|
|
if (*p2 >= '0' && *p2 <= '9')
|
|
{
|
|
/* Must compare this numerically. */
|
|
int val1;
|
|
int val2;
|
|
|
|
val1 = *p1++ - '0';
|
|
val2 = *p2++ - '0';
|
|
while (*p1 >= '0' && *p1 <= '9')
|
|
val1 = val1 * 10 + *p1++ - '0';
|
|
while (*p2 >= '0' && *p2 <= '9')
|
|
val2 = val2 * 10 + *p2++ - '0';
|
|
if (val1 != val2)
|
|
return val1 - val2;
|
|
}
|
|
else
|
|
return 1;
|
|
}
|
|
else if (*p2 >= '0' && *p2 <= '9')
|
|
return -1;
|
|
else if (*p1 != *p2)
|
|
return *p1 - *p2;
|
|
else
|
|
{
|
|
++p1;
|
|
++p2;
|
|
}
|
|
}
|
|
return *p1 - *p2;
|
|
}
|