glibc/elf/dlvsym.c
Ulrich Drepper 03e4219e77 Update.
1998-02-19  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/sigqueue.c: Fix weak alias definition.

1998-02-19 17:16  Ulrich Drepper  <drepper@cygnus.com>

	* libc.map: More reordering for GLIBC_2.1 symbols.

1998-02-19  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* libc.map: Move some functions from version GLIBC_2.0 to
	GLIBC_2.1, reorder declarations.

1998-02-19  Ulrich Drepper  <drepper@cygnus.com>

	* resolv/gethnamaddr.c (addrsort): Make this function extern.
	Patch by zab@thebrain.grumblesmurf.net.

1998-02-19  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	* nis/libnsl.map: NIS+ support is new in glibc 2.1, add
	NIS+ functions with version GLIBC_2.1.

1998-02-19 14:05  Ulrich Drepper  <drepper@cygnus.com>

	* libc.map: Add __sbrk, __setpgid, __getpgid for binary compatibility
	with 2.0 binaries.  Reported by Thorsten Kukuk.

1998-02-19  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* elf/dlvsym.c (dlvsym_doit): Correct last patch.

	* elf/dlsym.c (dlsym_doit): Likewise.

1998-02-19  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* elf/link.h: Correct typos.

	* iconv/iconv_prog.c: Correct typo.

	* elf/dl-open.c (_dl_open): Assign correct value to new->l_global.
1998-02-19 18:52:30 +00:00

111 lines
3.2 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 <stddef.h>
#include <link.h>
#include <dlfcn.h>
#include <setjmp.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 == NULL)
/* Search the global scope. */
args->loadbase = _dl_lookup_versioned_symbol (args->name, &args->ref,
&(_dl_global_scope
?: _dl_default_scope)[2],
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;
{
struct link_map *map = l;
struct link_map *mapscope[2] = { map, NULL };
args->loadbase = _dl_lookup_versioned_symbol_skip (args->name,
&args->ref,
mapscope,
NULL,
match);
}
}
else
{
/* Search the scope of the given object. */
struct link_map *map = args->handle;
struct link_map *mapscope[2] = { map, NULL };
args->loadbase = _dl_lookup_versioned_symbol (args->name, &args->ref,
mapscope, 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)