diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2020-01-11 09:08:02 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2020-01-11 09:08:02 +0000 |
| commit | 1021c8d70594ee2afc4e07e48e833ff21432240e (patch) | |
| tree | 257ea869bf1db633a5ba5f3742d90da1f6e42512 /libexec | |
| parent | 727d995c7d7b98aad8a5decdfab1c495719f8592 (diff) | |
| download | src-1021c8d70594ee2afc4e07e48e833ff21432240e.tar.gz src-1021c8d70594ee2afc4e07e48e833ff21432240e.zip | |
Stop prepending prefix to the result of realpath(3).
The path is already absolute.
Noted and reviewed by: rstone
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Differential revision: https://reviews.freebsd.org/D23121
Notes
Notes:
svn path=/head/; revision=356630
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 4c3846abf88d..9c8140295412 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5524,7 +5524,7 @@ static int open_binary_fd(const char *argv0, bool search_in_path, const char **binpath_res) { - char *abspath, *absres, *binpath, *pathenv, *pe, *res1; + char *binpath, *pathenv, *pe, *res1; const char *res; int fd; @@ -5569,31 +5569,16 @@ open_binary_fd(const char *argv0, bool search_in_path, rtld_die(); } if (res != NULL && res[0] != '/') { - abspath = getcwd(NULL, 0); - if (abspath != NULL) { - res1 = xmalloc(PATH_MAX); - if (realpath(res, res1) != NULL) { - if (res != argv0) - free(__DECONST(char *, res)); - res = res1; - } else { - free(res1); - } - absres = xmalloc(strlen(abspath) + - strlen(res) + 2); - strcpy(absres, abspath); - strcat(absres, "/"); - strcat(absres, res); - free(abspath); + res1 = xmalloc(PATH_MAX); + if (realpath(res, res1) != NULL) { if (res != argv0) free(__DECONST(char *, res)); - *binpath_res = absres; + res = res1; } else { - *binpath_res = res; + free(res1); } - } else { - *binpath_res = res; } + *binpath_res = res; return (fd); } |