aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-05-02 18:29:49 +0000
committerUlrich Drepper <drepper@redhat.com>1999-05-02 18:29:49 +0000
commit686dfcd106e96e3f991cec76c8d0e434cf97fe54 (patch)
tree95fb3ed53f635a92edb9ba7abcd6213a94925a39
parent647361287ddb2d52ffe9dbbfe2bd27ed76dc2c56 (diff)
downloadglibc-686dfcd106e96e3f991cec76c8d0e434cf97fe54.zip
glibc-686dfcd106e96e3f991cec76c8d0e434cf97fe54.tar.gz
glibc-686dfcd106e96e3f991cec76c8d0e434cf97fe54.tar.bz2
Update.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Use _dl_cache_libcmp instead of strcmp.
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/generic/dl-cache.c8
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d1cf99..bbd9700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1999-05-02 Ulrich Drepper <drepper@cygnus.com>
+ * sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Use
+ _dl_cache_libcmp instead of strcmp.
+
* sysdeps/generic/glob.c (glob_in_dir): It's no error if opendir
fails on a file.
Reported by Sergei Ivanov <svivanov@pdmi.ras.ru> [PR libc/1032].
diff --git a/sysdeps/generic/dl-cache.c b/sysdeps/generic/dl-cache.c
index ee7080b..582afb5 100644
--- a/sysdeps/generic/dl-cache.c
+++ b/sysdeps/generic/dl-cache.c
@@ -179,7 +179,9 @@ _dl_load_cache_lookup (const char *name)
using them. */
&& cache->libs[middle - 1].key < cachesize - sizeof *cache
/* Actually compare the entry. */
- && strcmp (name, cache_data + cache->libs[middle - 1].key) == 0)
+ && (_dl_cache_libcmp (name,
+ cache_data + cache->libs[middle - 1].key)
+ == 0))
--middle;
do
@@ -192,7 +194,9 @@ _dl_load_cache_lookup (const char *name)
index is ok and whether the name matches. Otherwise
we are done. */
&& (cache->libs[middle].key >= cachesize - sizeof *cache
- || strcmp (name, cache_data + cache->libs[middle].key) != 0))
+ || (_dl_cache_libcmp (name,
+ cache_data + cache->libs[middle].key)
+ != 0)))
break;
flags = cache->libs[middle].flags;