diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-05-05 23:29:18 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-05-05 23:29:18 +0000 |
| commit | dc5efe83c0252ad45337ab98eff6c26fdb29b0a9 (patch) | |
| tree | d7045a782818d82ee49fc8503df674026e1b0588 /sysdeps/generic | |
| parent | 4f8dbcb126883c92d33d49c86365a1fb1e54696a (diff) | |
| download | glibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.tar.gz glibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.tar.xz glibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.zip | |
Update.
* 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.
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/dl-origin.c (renamed from sysdeps/generic/dl-origin.h) | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sysdeps/generic/dl-origin.h b/sysdeps/generic/dl-origin.c index 495df60296..b10fee2d57 100644 --- a/sysdeps/generic/dl-origin.h +++ b/sysdeps/generic/dl-origin.c @@ -1,5 +1,5 @@ /* Find path of executable. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -18,12 +18,19 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <stdlib.h> +#include <string.h> +#include <sys/param.h> +#include <elf/ldsodefs.h> + +#include <dl-dst.h> + /* Generally it is not possible to implement this. We have to fall back on a solution where the user provides the information. */ extern const char *_dl_origin_path; -static inline const char * -get_origin (void) +const char * +_dl_get_origin (void) { char *result = (char *) -1; /* We use the environment variable LD_ORIGIN_PATH. If it is set make |