mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
dc5efe83c0
* Versions.def (ld.so): Add GLIBC_2.1.1. * elf/Makefile (routines): Add dl-origin. (tests): Add origtest. Add dependencies for the program. * elf/Versions (ld.so) [GLIBC_2.1.1]: Add _dl_origin_path, _dl_platformlen, _dl_dst_count and _dl_dst_substitute. * elf/dl-deps.c (expand_dst): New macro. Expand DSTs in filename. (_dl_map_object_deps): Use expand_dst to expand DSTs in DT_NEEDED, DT_AUXILIARY, and DT_FILTER filenames. * elf/dl-load.c (expand_dynamic_string_token): Explode into two functions and three macros. (_dl_dst_count, _dl_dst_substitute): New functions. * elf/dl-dst.h: New file. * elf/dl-open.c (_dl_open): Take extra parameter with address of caller. Pass address in args structure. (dl_open_worker): Recognize and expand DSTs in filename. * elf/ldsodefs.h (_dl_open): Adapt prototype. * elf/dlopen.c (dlopen_doit): Pass caller address to _dl_open. (__dlopen_check): Pass caller address to dlopen_doit in args. * elf/dlopendoit.c: Likewise. * iconv/gconv_dl.c: Adapt call of _dl_open. * nss/nsswitch.c: Likewise. * elf/origtest.c: New file. * sysdeps/generic/dl-origin.h: Moved to... * sysdeps/generic/dl-origin.c: ...here. * sysdeps/unix/sysv/linux/dl-origin.h: Moved to... * sysdeps/unix/sysv/linux/dl-origin.c: ...here.
65 lines
1.9 KiB
C
65 lines
1.9 KiB
C
/* Load a shared object at run time.
|
|
Copyright (C) 1995, 1996, 1997, 1998, 1999 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 <stddef.h>
|
|
#include <elf/ldsodefs.h>
|
|
|
|
/* This file is for compatibility with glibc 2.0. Compile it only if
|
|
versioning is used. */
|
|
#if defined PIC && DO_VERSIONING
|
|
|
|
struct dlopen_args
|
|
{
|
|
/* The arguments for dlopen_doit. */
|
|
const char *file;
|
|
int mode;
|
|
/* The return value of dlopen_doit. */
|
|
struct link_map *new;
|
|
/* Address of the caller. */
|
|
const void *caller;
|
|
};
|
|
|
|
|
|
static void
|
|
dlopen_doit (void *a)
|
|
{
|
|
struct dlopen_args *args = (struct dlopen_args *) a;
|
|
|
|
args->new = _dl_open (args->file ?: "", args->mode, args->caller);
|
|
}
|
|
|
|
|
|
void *
|
|
__dlopen_nocheck (const char *file, int mode)
|
|
{
|
|
struct dlopen_args args;
|
|
args.file = file;
|
|
args.caller = __builtin_return_address (0);
|
|
|
|
if ((mode & RTLD_BINDING_MASK) == 0)
|
|
/* By default assume RTLD_LAZY. */
|
|
mode |= RTLD_LAZY;
|
|
args.mode = mode;
|
|
|
|
return _dlerror_run (dlopen_doit, &args) ? NULL : args.new;
|
|
}
|
|
symbol_version (__dlopen_nocheck, dlopen, GLIBC_2.0);
|
|
#endif
|