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

rtld: Add -v switch to print some useful information about the rtld binary.

Browse Source 
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2020-05-31 21:53:15 +00:00
parent 08bc040214
commit c8dd6c0599
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=361675
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libexec/rtld-elf/rtld.1
View File

@ -333,6 +333,8 @@ character,
uses the search path provided by the environment variable
.Dv PATH
to find the binary to execute.
.It Fl v
Display information about this run-time linker binary, then exit.
.It Fl -
Ends the
.Nm

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

@ -5613,7 +5613,9 @@ static int
parse_args(char* argv[], int argc, bool *use_pathp, int *fdp)
{
const char *arg;
int fd, i, j, arglen;
char machine[64];
size_t sz;
int arglen, fd, i, j, mib[2];
char opt;
dbg("Parsing command-line arguments");
@ -5672,6 +5674,24 @@ parse_args(char* argv[], int argc, bool *use_pathp, int *fdp)
break;
} else if (opt == 'p') {
*use_pathp = true;
} else if (opt == 'v') {
machine[0] = '\0';
mib[0] = CTL_HW;
mib[1] = HW_MACHINE;
sz = sizeof(machine);
sysctl(mib, nitems(mib), machine, &sz, NULL, 0);
rtld_printf(
"FreeBSD ld-elf.so.1 %s\n"
"FreeBSD_version %d\n"
"Default lib path %s\n"
"Env prefix %s\n"
"Hint file %s\n"
"libmap file %s\n",
machine,
__FreeBSD_version, ld_standard_library_path,
ld_env_prefix, ld_elf_hints_default,
ld_path_libmap_conf);
_exit(0);
} else {
_rtld_error("Invalid argument: '%s'", arg);
print_usage(argv[0]);
@ -5720,6 +5740,7 @@ print_usage(const char *argv0)
" -h Display this help message\n"
" -f <FD> Execute <FD> instead of searching for <binary>\n"
" -p Search in PATH for named binary\n"
" -v Display identification information\n"
" -- End of RTLD options\n"
" <binary> Name of process to execute\n"
" <args> Arguments to the executed process\n", argv0);