From dc5efe83c0252ad45337ab98eff6c26fdb29b0a9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 5 May 1999 23:29:18 +0000 Subject: 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. --- sysdeps/generic/dl-origin.c | 54 ++++++++++++++++++++++++++ sysdeps/generic/dl-origin.h | 47 ----------------------- sysdeps/unix/sysv/linux/dl-origin.c | 75 +++++++++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/dl-origin.h | 67 --------------------------------- 4 files changed, 129 insertions(+), 114 deletions(-) create mode 100644 sysdeps/generic/dl-origin.c delete mode 100644 sysdeps/generic/dl-origin.h create mode 100644 sysdeps/unix/sysv/linux/dl-origin.c delete mode 100644 sysdeps/unix/sysv/linux/dl-origin.h (limited to 'sysdeps') diff --git a/sysdeps/generic/dl-origin.c b/sysdeps/generic/dl-origin.c new file mode 100644 index 0000000000..b10fee2d57 --- /dev/null +++ b/sysdeps/generic/dl-origin.c @@ -0,0 +1,54 @@ +/* Find path of executable. + Copyright (C) 1998, 1999 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. */ + +#include +#include +#include +#include + +#include + +/* 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; + +const char * +_dl_get_origin (void) +{ + char *result = (char *) -1; + /* We use the 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 + 1 && cp[-1] == '/') + --cp; + *cp = '\0'; + } + } + + return result; +} diff --git a/sysdeps/generic/dl-origin.h b/sysdeps/generic/dl-origin.h deleted file mode 100644 index 495df60296..0000000000 --- a/sysdeps/generic/dl-origin.h +++ /dev/null @@ -1,47 +0,0 @@ -/* 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 the 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 + 1 && cp[-1] == '/') - --cp; - *cp = '\0'; - } - } - - return result; -} diff --git a/sysdeps/unix/sysv/linux/dl-origin.c b/sysdeps/unix/sysv/linux/dl-origin.c new file mode 100644 index 0000000000..a69684d99e --- /dev/null +++ b/sysdeps/unix/sysv/linux/dl-origin.c @@ -0,0 +1,75 @@ +/* Find path of executable. + Copyright (C) 1998, 1999 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. */ + +#include +#include +#include +#include +#include + +#include + +/* 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; + +const char * +_dl_get_origin (void) +{ + char linkval[PATH_MAX]; + char *result; + + if (readlink ("/proc/self/exe", linkval, PATH_MAX) != -1 + && linkval[0] != '[') + { + /* We can use this value. */ + char *last_slash = strrchr (linkval, '/'); + result = (char *) malloc (last_slash - linkval + 1); + if (result == NULL) + result = (char *) -1; + else if (last_slash == linkval) + memcpy (result, "/", 2); + else + *((char *) __mempcpy (result, linkval, last_slash - linkval)) = '\0'; + } + else + { + result = (char *) -1; + /* We use the 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 + 1 && cp[-1] == '/') + --cp; + *cp = '\0'; + } + } + } + + return result; +} diff --git a/sysdeps/unix/sysv/linux/dl-origin.h b/sysdeps/unix/sysv/linux/dl-origin.h deleted file mode 100644 index 5654b42a2f..0000000000 --- a/sysdeps/unix/sysv/linux/dl-origin.h +++ /dev/null @@ -1,67 +0,0 @@ -/* 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 - && linkval[0] != '[') - { - /* We can use this value. */ - char *last_slash = strrchr (linkval, '/'); - result = (char *) malloc (last_slash - linkval + 1); - if (result == NULL) - result = (char *) -1; - else if (last_slash == linkval) - memcpy (result, "/", 2); - else - *((char *) __mempcpy (result, linkval, last_slash - linkval)) = '\0'; - } - else - { - result = (char *) -1; - /* We use the 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 + 1 && cp[-1] == '/') - --cp; - *cp = '\0'; - } - } - } - - return result; -} -- cgit 1.4.1