d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC: r279364

Browse Source 
Use realpath(3) to properly expand $ORIGIN to its absolute path.
This commit is contained in:
jkim 2015-03-06 22:31:35 +00:00
parent b6bec41c3d
commit 88fa6bbce5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libexec/rtld-elf/rtld.c
View File

@ -3420,17 +3420,16 @@ rtld_dirname(const char *path, char *bname)
static int
rtld_dirname_abs(const char *path, char *base)
{
char base_rel[PATH_MAX];
char *last;
if (rtld_dirname(path, base) == -1)
if (realpath(path, base) == NULL)
return (-1);
if (base[0] == '/')
return (0);
if (getcwd(base_rel, sizeof(base_rel)) == NULL ||
strlcat(base_rel, "/", sizeof(base_rel)) >= sizeof(base_rel) ||
strlcat(base_rel, base, sizeof(base_rel)) >= sizeof(base_rel))
dbg("%s -> %s", path, base);
last = strrchr(base, '/');
if (last == NULL)
return (-1);
strcpy(base, base_rel);
if (last != base)
*last = '\0';
return (0);
}