Date: Fri, 4 Jun 2021 00:44:27 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 59a876238f66 - stable/13 - rtld: Rename -t option to -u (ignore LD_ vars) Message-ID: <202106040044.1540iRHK020553@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=59a876238f66ccd682336e6a33826ec0f271acc1 commit 59a876238f66ccd682336e6a33826ec0f271acc1 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2021-06-02 22:50:49 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2021-06-04 00:32:50 +0000 rtld: Rename -t option to -u (ignore LD_ vars) (cherry picked from commit e3149e0a02d6d09fb4c3acd085da2509dbab7320) --- libexec/rtld-elf/rtld.1 | 6 +++--- libexec/rtld-elf/rtld.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 522382d24b16..41b010a2376c 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 24, 2021 +.Dd June 2, 2021 .Dt RTLD 1 .Os .Sh NAME @@ -306,7 +306,7 @@ The syntax of the direct invocation is .Op Fl b Ar exe .Op Fl f Ar fd .Op Fl p -.Op Fl t +.Op Fl u .Op Fl v .Op Fl - .Pa image_path @@ -348,7 +348,7 @@ character, uses the search path provided by the environment variable .Dv PATH to find the binary to execute. -.It Fl t +.It Fl u Ignore all .Ev LD_ environment variables that otherwise affect the dynamic diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index ae74f7b9a543..34c42969c779 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5773,7 +5773,7 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp, break; } else if (opt == 'p') { *use_pathp = true; - } else if (opt == 't') { + } else if (opt == 'u') { trust = false; } else if (opt == 'v') { machine[0] = '\0'; @@ -5845,7 +5845,7 @@ print_usage(const char *argv0) " -b <exe> Execute <exe> instead of <binary>, arg0 is <binary>\n" " -f <FD> Execute <FD> instead of searching for <binary>\n" " -p Search in PATH for named binary\n" - " -t Ignore LD_ environment variables\n" + " -u Ignore LD_ environment variables\n" " -v Display identification information\n" " -- End of RTLD options\n" " <binary> Name of process to execute\n"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106040044.1540iRHK020553>