diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/dl-origin.c (renamed from sysdeps/generic/dl-origin.h) | 13 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-origin.c (renamed from sysdeps/unix/sysv/linux/dl-origin.h) | 14 |
2 files changed, 21 insertions, 6 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 diff --git a/sysdeps/unix/sysv/linux/dl-origin.h b/sysdeps/unix/sysv/linux/dl-origin.c index 5654b42a2f..a69684d99e 100644 --- a/sysdeps/unix/sysv/linux/dl-origin.h +++ b/sysdeps/unix/sysv/linux/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,13 +18,21 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/param.h> +#include <elf/ldsodefs.h> + +#include <dl-dst.h> + /* 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) +const char * +_dl_get_origin (void) { char linkval[PATH_MAX]; char *result; |