From f787edde1dcd0f35feff9c8fd6384bd564558180 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 27 Aug 1998 20:08:32 +0000 Subject: Update. 1998-08-27 19:42 Ulrich Drepper * elf/Makefile (distribute): Add dl-origin.h. * sysdeps/generic/dl-origin.h: New file. * sysdeps/unix/sysv/linux/dl-origin.h: New file. * elf/link.h (struct link_map): Add l_origin field. * elf/dl-load.c (expand_dynamic_string_token): New function. (decompose_path): Remove WHERE argument, take link map pointer instead. Call expand_dynamic_string_token instead of local_strdup to make copy of rpath. (_dl_init_paths): Call decompose_path with correct argument. (_dl_map_object_from_fd): Define static is EXTERNAL_MAP_FROM_FD is not defined. Check EI_OSABI and EI_ABIVERSION fields in header. (_dl_map_object): Call decompose_path with correct argument. Call expand_dynamic_string_token instead of local_strdup to also expand DST. * elf/dl-object.c (_dl_new_object): Determine l_origin for all maps but the main one. * elf/dl-support.c: Define _dl_origin_path. * elf/rtld.c: Likewise. Set _dl_origin_path based on LD_ORIGIN_PATH. * elf/dl-close (_dl_close): Free l_name and l_origin. * sysdeps/i386/useldt.h (THREAD_GETMEM, THREAD_SETMEM): Use P modifier in asm, not c. * sysdeps/mach/hurd/Makefile [subdirs==elf]: Define CFLAGS-dl-load.c to -DEXTERNAL_MAP_FROM_FD to make _dl_map_object_from_fd extern. --- sysdeps/generic/dl-origin.h | 47 ++++++++++++++++++++++++++ sysdeps/mach/hurd/Makefile | 2 ++ sysdeps/unix/sysv/linux/dl-origin.h | 67 +++++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+) create mode 100644 sysdeps/generic/dl-origin.h create mode 100644 sysdeps/unix/sysv/linux/dl-origin.h (limited to 'sysdeps') diff --git a/sysdeps/generic/dl-origin.h b/sysdeps/generic/dl-origin.h new file mode 100644 index 0000000000..6d5a8da52e --- /dev/null +++ b/sysdeps/generic/dl-origin.h @@ -0,0 +1,47 @@ +/* Find path of executable. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1998. + + 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. */ + +/* 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) +{ + char *result = (char *) -1; + /* We use te environment variable LD_ORIGIN_PATH. If it is set make + a copy and strip out trailing slashes. */ + if (_dl_origin_path != NULL) + { + size_t len = strlen (_dl_origin_path); + result = malloc (len + 1); + if (result == NULL) + result = (char *) -1; + else + { + char *cp = __mempcpy (result, _dl_origin_path, len); + while (cp > result && cp[-1] == '/') + --cp; + *cp = '\0'; + } + } + + return result; +} diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index afd8473540..42e9a79e7b 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -124,6 +124,8 @@ $(inst_libdir)/libc.so: $(rpcuserlibs) # objects directly into the shared object. ifeq (elf,$(subdir)) $(objpfx)librtld.os: $(rpcuserlibs:.so=_pic.a) + +CFLAGS-dl-load.c = -DEXTERNAL_MAP_FROM_FD endif # We need these libs to link static programs in the libc source tree, too. diff --git a/sysdeps/unix/sysv/linux/dl-origin.h b/sysdeps/unix/sysv/linux/dl-origin.h new file mode 100644 index 0000000000..eef067814a --- /dev/null +++ b/sysdeps/unix/sysv/linux/dl-origin.h @@ -0,0 +1,67 @@ +/* Find path of executable. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1998. + + 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. */ + +/* On Linux >= 2.1 systems which have the dcache implementation we can get + the path of the application from the /proc/self/exe symlink. Try this + first and fall back on the generic method if necessary. */ +extern const char *_dl_origin_path; + +static inline const char * +get_origin (void) +{ + char linkval[PATH_MAX]; + char *result; + + if (readlink ("/proc/self/exe", linkval, PATH_MAX) != -1 + && result[0] != '[') + { + /* We can use this value. */ + char *last_slash = strrchr (linkval, '/'); + result = (char *) malloc (linkval - last_slash + 1); + if (result == NULL) + result = (char *) -1; + else + *((char *) __mempcpy (result, linkval, linkval - last_slash)) = '\0'; + } + else + { + size_t len = 0; + + result = (char *) -1; + /* We use te environment variable LD_ORIGIN_PATH. If it is set make + a copy and strip out trailing slashes. */ + if (_dl_origin_path != NULL) + { + size_t len = strlen (_dl_origin_path); + result = malloc (len + 1); + if (result == NULL) + result = (char *) -1; + else + { + char *cp = __mempcpy (result, _dl_origin_path, len); + while (cp > result && cp[-1] == '/') + --cp; + *cp = '\0'; + } + } + } + + return result; +} -- cgit 1.4.1