lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

* sysdeps/unix/sysv/linux/dl-origin.c (_dl_get_origin): We cannot

Browse Source 
use the AT_EXECFN value if it is no absolute path.
	* sysdeps/unix/sysv/linux/kernel-features.h: Never define
	__ASSUME_AT_EXECFN.
This commit is contained in:
Ulrich Drepper
2008-08-01 18:03:57 +00:00
parent cd5743fdec
commit 42fa1f67d4
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sysdeps/unix/sysv/linux/dl-origin.c
View File

@ -35,16 +35,13 @@
const char *
_dl_get_origin (void)
{
#ifndef __ASSUME_AT_EXECFN
char linkval[PATH_MAX];
#endif
const char *str;
char *result = (char *) -1l;
int len;
str = GLRO(dl_execfn);
#ifndef __ASSUME_AT_EXECFN
if (str == NULL)
if (str == NULL || str[0] != '/')
{
INTERNAL_SYSCALL_DECL (err);
@ -53,12 +50,12 @@ _dl_get_origin (void)
if (! INTERNAL_SYSCALL_ERROR_P (len, err)
&& len > 0 && linkval[0] != '[')
str = linkval;
else
str = NULL;
}
else
#endif
len = strlen (str);
#ifndef __ASSUME_AT_EXECFN
if (str == NULL)
{
/* We use the environment variable LD_ORIGIN_PATH. If it is set make
@ -79,7 +76,6 @@ _dl_get_origin (void)
}
}
else
#endif
{
/* We can use this value. */
assert (str[0] == '/');