From c10700f8444a9f6ac2f32ad0e9038197fd5545c0 Mon Sep 17 00:00:00 2001 From: jkim Date: Fri, 6 Mar 2015 22:31:35 +0000 Subject: [PATCH] MFC: r279364 Use realpath(3) to properly expand $ORIGIN to its absolute path. git-svn-id: svn://svn.freebsd.org/base/stable/10@279713 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- libexec/rtld-elf/rtld.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 0d1a73824..f5a6a17b4 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -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); } -- 2.42.0