From e3149e0a02d6d09fb4c3acd085da2509dbab7320 Mon Sep 17 00:00:00 2001
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 3 Jun 2021 01:50:49 +0300
Subject: rtld: Rename -t option to -u (ignore LD_ vars)

Requested by:	arichardson
Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
---
 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 16466c7a853e..2d262f77aa13 100644
--- a/libexec/rtld-elf/rtld.1
+++ b/libexec/rtld-elf/rtld.1
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 29, 2021
+.Dd June 2, 2021
 .Dt RTLD 1
 .Os
 .Sh NAME
@@ -314,7 +314,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
@@ -356,7 +356,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 a517de83b8f5..9897248bffbb 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -5793,7 +5793,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';
@@ -5865,7 +5865,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"
-- 
cgit v1.2.3