From dd272e5774a6a64a0380c4dab5f0424c3ca66897 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 5 Mar 2004 04:24:45 +0000 Subject: Update. * sysdeps/generic/ldsodefs.h: Don't define _dl_name_match_p as inline. * elf/dl-misc.c: Define _dl_name_match_p here. * elf/dl-open.c (check_libc_caller): Don't use _dl_name_match_p. --- elf/dl-open.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'elf/dl-open.c') diff --git a/elf/dl-open.c b/elf/dl-open.c index 4a322e28e8..9befbc41cf 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -177,16 +177,32 @@ check_libc_caller (const void *caller) struct link_map *l; for (l = GL(dl_loaded); l != NULL; l = l->l_next) - if (_dl_name_match_p (expected1, l)) + if (strcmp (expected1, l->l_name) == 0) { + is_1: expected1_from = (const void *) l->l_map_start; expected1_to = (const void *) l->l_map_end; } - else if (_dl_name_match_p (expected2, l)) + else if (strcmp (expected1, l->l_name) == 0) { + is_2: expected2_from = (const void *) l->l_map_start; expected2_to = (const void *) l->l_map_end; } + else + { + struct libname_list *runp = l->l_libname; + + while (runp != NULL) + { + if (strcmp (expected1, runp->name) == 0) + goto is_1; + else if (strcmp (expected2, runp->name) == 0) + goto is_2; + + runp = runp->next; + } + } assert (expected1_from != NULL); } -- cgit v1.2.1