baa3334acc
1998-09-06 15:13 Ulrich Drepper <drepper@cygnus.com> * elf/dlsym.c (dlsym_doit): Use new RTLD_DEFAULT macro to test for use of global scope. * elf/dlvsym.c (dlvsym_doit): Likewise. 1998-09-02 Paul Eggert <eggert@twinsun.com> * strftime.c (my_strftime): When mbrlen returns (size_t) -2, copy the redundant bytes at the end of the format as-is; don't just copy their first byte and then rescan, as that might get us an encoding error. Account correctly for the length of multibyte sequences in the format. 1998-09-03 20:14 Tim Waugh <tim@cyberelk.demon.co.uk> * posix/wordexp-test.c: Add tests for different IFS values. Change unquoted-newline test so that newline is not in IFS. * posix/wordexp.c (wordexp): Correct null/unset mix-up when determining IFS characters. Return WRDE_BADCHAR for unquoted special characters _except_ if they are separators. 1998-09-06 10:56 Ulrich Drepper <drepper@cygnus.com> * include/tgmath.h: New file. * libio/stdio.h: Correct reversed #ifs. Patch by Zack Weinberg. * manual/creature.texi: Better explain reason for feature select macros. Patch by Michael Deutschmann <michael@talamasca.wkpowerlink.com>. 1998-09-06 10:25 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu> * include/alloca.h: Add multiple-inclusion guard. * include/db.h: Likewise. * include/db_185.h: Likewise. * include/fcntl.h: Likewise. * include/grp.h: Likewise. * include/libintl.h: Likewise. * include/mntent.h: Likewise. * include/pwd.h: Likewise. * include/sched.h: Likewise. * include/search.h: Likewise. * include/setjmp.h: Likewise. * include/shadow.h: Likewise. * include/signal.h: Likewise. * include/stdio.h: Likewise. * include/stdlib.h: Likewise. * include/string.h: Likewise. * include/termios.h: Likewise. * include/time.h: Likewise. * include/ulimit.h: Likewise. * include/utmp.h: Likewise. * include/wchar.h: Likewise. * include/sys/file.h: Likewise. * include/sys/gmon.h: Likewise. * include/sys/ioctl.h: Likewise. * include/sys/mman.h: Likewise. * include/sys/resource.h: Likewise. * include/sys/select.h: Likewise. * include/sys/socket.h: Likewise. * include/sys/statfs.h: Likewise. * include/sys/time.h: Likewise. * include/sys/times.h: Likewise. * include/sys/wait.h: Likewise. * include/dlfcn.h: Declare dladdr only for __USE_GNU. Define RTLD_DEFAULT.
106 lines
3.1 KiB
C
106 lines
3.1 KiB
C
/* Look up a versioned symbol in a shared object loaded by `dlopen'.
|
|
Copyright (C) 1995, 1996, 1997, 1998 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. */
|
|
|
|
#include <dlfcn.h>
|
|
#include <setjmp.h>
|
|
#include <stddef.h>
|
|
#include <elf/ldsodefs.h>
|
|
|
|
#include <dl-hash.h>
|
|
|
|
struct dlvsym_args
|
|
{
|
|
/* The arguments to dlvsym_doit. */
|
|
void *handle;
|
|
const char *name;
|
|
struct r_found_version version;
|
|
ElfW(Addr) caller;
|
|
/* The return values of dlvsym_doit. */
|
|
ElfW(Addr) loadbase;
|
|
const ElfW(Sym) *ref;
|
|
};
|
|
|
|
|
|
static void
|
|
dlvsym_doit (void *a)
|
|
{
|
|
struct dlvsym_args *args = (struct dlvsym_args *)a;
|
|
args->ref = NULL;
|
|
|
|
if (args->handle == RTLD_DEFAULT)
|
|
/* Search the global scope. */
|
|
args->loadbase = _dl_lookup_versioned_symbol (args->name, &args->ref,
|
|
_dl_global_scope,
|
|
NULL, &args->version, 0);
|
|
else if (args->handle == RTLD_NEXT)
|
|
{
|
|
struct link_map *l, *match;
|
|
|
|
/* Find the highest-addressed object that CALLER is not below. */
|
|
match = NULL;
|
|
for (l = _dl_loaded; l; l = l->l_next)
|
|
if (args->caller >= l->l_addr && (!match || match->l_addr < l->l_addr))
|
|
match = l;
|
|
|
|
if (! match)
|
|
_dl_signal_error (0, NULL, _("\
|
|
RTLD_NEXT used in code not dynamically loaded"));
|
|
|
|
l = match;
|
|
while (l->l_loader)
|
|
l = l->l_loader;
|
|
|
|
args->loadbase = _dl_lookup_versioned_symbol_skip (args->name,
|
|
&args->ref,
|
|
l->l_local_scope,
|
|
NULL, &args->version,
|
|
match);
|
|
}
|
|
else
|
|
{
|
|
/* Search the scope of the given object. */
|
|
struct link_map *map = args->handle;
|
|
args->loadbase = _dl_lookup_versioned_symbol (args->name, &args->ref,
|
|
map->l_local_scope,
|
|
map->l_name,
|
|
&args->version, 0);
|
|
}
|
|
}
|
|
|
|
void *
|
|
__dlvsym (void *handle, const char *name, const char *version_str)
|
|
{
|
|
struct dlvsym_args args;
|
|
|
|
args.handle = handle;
|
|
args.name = name;
|
|
args.caller = (ElfW(Addr)) __builtin_return_address (0);
|
|
|
|
/* Compute hash value to the version string. */
|
|
args.version.name = version_str;
|
|
args.version.hidden = 1;
|
|
args.version.hash = _dl_elf_hash (version_str);
|
|
/* We don't have a specific file where the symbol can be found. */
|
|
args.version.filename = NULL;
|
|
|
|
return (_dlerror_run (dlvsym_doit, &args)
|
|
? NULL : (void *) (args.loadbase + args.ref->st_value));
|
|
}
|
|
weak_alias (__dlvsym, dlvsym)
|