mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00:00
5f21997b9d
2004-10-18 Jakub Jelinek <jakub@redhat.com> * elf/dl-libc.c (__libc_dlsym_private, __libc_register_dl_open_hook): New functions. (__libc_dlopen_mode): Call __libc_register_dl_open_hook and __libc_register_dlfcn_hook. * dlfcn/Makefile (routines, elide-routines.os): Set. Add rules to build and test tststatic2. * dlfcn/tststatic2.c: New test. * dlfcn/modstatic2.c: New test module. * dlfcn/dladdr.c: Call _dlfcn_hook from libdl.so if not NULL. Define __ prefixed routine in libc.a and in libdl.a just call it. * dlfcn/dladdr1.c: Likewise. * dlfcn/dlclose.c: Likewise. * dlfcn/dlerror.c: Likewise. * dlfcn/dlinfo.c: Likewise. * dlfcn/dlmopen.c: Likewise. * dlfcn/dlopen.c: Likewise. * dlfcn/dlopenold.c: Likewise. * dlfcn/dlsym.c: Likewise. * dlfcn/dlvsym.c: Likewise. * dlfcn/sdladdr.c: New file. * dlfcn/sdladdr1.c: New file. * dlfcn/sdlclose.c: New file. * dlfcn/sdlerror.c: New file. * dlfcn/sdlinfo.c: New file. * dlfcn/sdlopen.c: New file. * dlfcn/sdlsym.c: New file. * dlfcn/sdlvsym.c: New file. * dlfcn/Versions (libdl): Export _dlfcn_hook@GLIBC_PRIVATE. * include/dlfcn.h (DL_CALLER_DECL, DL_CALLER RETURN_ADDRESS): Define. (struct dlfcn_hook): New type. (_dlfcn_hook): New extern decl. (__dlopen, __dlclose, __dlsym, __dlerror, __dladdr, __dladdr1, __dlinfo, __dlmopen, __libc_dlsym_private, __libc_register_dl_open_hook, __libc_register_dlfcn_hook): New prototypes. (__dlvsym): Use DL_CALLER_DECL. * include/libc-symbols.h: Define libdl_hidden_proto and friends. * malloc/arena.c (_dl_open_hook): Extern decl. (ptmalloc_init): Don't call _dl_addr when dlopened from statically linked programs but don't use brk for them either.
81 lines
2.0 KiB
C
81 lines
2.0 KiB
C
/* Look up a symbol in a shared object loaded by `dlopen'.
|
|
Copyright (C) 1995-2000, 2004 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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <dlfcn.h>
|
|
#include <stddef.h>
|
|
|
|
#include <ldsodefs.h>
|
|
|
|
#if !defined SHARED && defined IS_IN_libdl
|
|
|
|
void *
|
|
dlsym (void *handle, const char *name)
|
|
{
|
|
return __dlsym (handle, name, RETURN_ADDRESS (0));
|
|
}
|
|
|
|
#else
|
|
|
|
struct dlsym_args
|
|
{
|
|
/* The arguments to dlsym_doit. */
|
|
void *handle;
|
|
const char *name;
|
|
void *who;
|
|
|
|
/* The return value of dlsym_doit. */
|
|
void *sym;
|
|
};
|
|
|
|
static void
|
|
dlsym_doit (void *a)
|
|
{
|
|
struct dlsym_args *args = (struct dlsym_args *) a;
|
|
|
|
args->sym = _dl_sym (args->handle, args->name, args->who);
|
|
}
|
|
|
|
|
|
void *
|
|
__dlsym (void *handle, const char *name DL_CALLER_DECL)
|
|
{
|
|
# ifdef SHARED
|
|
if (__builtin_expect (_dlfcn_hook != NULL, 0))
|
|
return _dlfcn_hook->dlsym (handle, name, DL_CALLER);
|
|
# endif
|
|
|
|
struct dlsym_args args;
|
|
args.who = DL_CALLER;
|
|
args.handle = handle;
|
|
args.name = name;
|
|
|
|
/* Protect against concurrent loads and unloads. */
|
|
__rtld_lock_lock_recursive (GL(dl_load_lock));
|
|
|
|
void *result = (_dlerror_run (dlsym_doit, &args) ? NULL : args.sym);
|
|
|
|
__rtld_lock_unlock_recursive (GL(dl_load_lock));
|
|
|
|
return result;
|
|
}
|
|
# ifdef SHARED
|
|
strong_alias (__dlsym, dlsym)
|
|
# endif
|
|
#endif
|