From 686dfcd106e96e3f991cec76c8d0e434cf97fe54 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 2 May 1999 18:29:49 +0000 Subject: Update. * sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Use _dl_cache_libcmp instead of strcmp. --- ChangeLog | 3 +++ sysdeps/generic/dl-cache.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d1cf99d55..bbd9700a62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 1999-05-02 Ulrich Drepper + * 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 [PR libc/1032]. diff --git a/sysdeps/generic/dl-cache.c b/sysdeps/generic/dl-cache.c index ee7080bc8e..582afb51c3 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; -- cgit 1.4.1