diff options
| author | Florian Weimer <fweimer@redhat.com> | 2020-10-08 15:33:00 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-10-08 15:33:00 +0200 |
| commit | 542923d949e8b2480e48bd85fea13cf5d00d30b7 (patch) | |
| tree | 1b53929678625fd6e434b414b3680b65a845740c | |
| parent | addff78f1f6729408a88d7452b16b8f5ee7e6878 (diff) | |
| download | glibc-542923d949e8b2480e48bd85fea13cf5d00d30b7.tar.gz glibc-542923d949e8b2480e48bd85fea13cf5d00d30b7.tar.xz glibc-542923d949e8b2480e48bd85fea13cf5d00d30b7.zip | |
elf: Implement ld.so --version
This prints out version information for the dynamic loader and exits immediately, without further command line processing (which seems to match what some GNU tools do). Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| -rw-r--r-- | elf/dl-main.h | 3 | ||||
| -rw-r--r-- | elf/dl-usage.c | 15 | ||||
| -rw-r--r-- | elf/rtld.c | 2 |
3 files changed, 20 insertions, 0 deletions
diff --git a/elf/dl-main.h b/elf/dl-main.h index ac7249a580..b51256d3b4 100644 --- a/elf/dl-main.h +++ b/elf/dl-main.h @@ -105,6 +105,9 @@ call_init_paths (const struct dl_main_state *state) _Noreturn void _dl_usage (const char *argv0, const char *wrong_option) attribute_hidden; +/* Print ld.so version information and exit. */ +_Noreturn void _dl_version (void) attribute_hidden; + /* Print ld.so --help output and exit. */ _Noreturn void _dl_help (const char *argv0, struct dl_main_state *state) attribute_hidden; diff --git a/elf/dl-usage.c b/elf/dl-usage.c index c1820dca2f..f3c5ac76d3 100644 --- a/elf/dl-usage.c +++ b/elf/dl-usage.c @@ -20,6 +20,7 @@ #include <dl-main.h> #include <ldsodefs.h> #include <unistd.h> +#include "version.h" void _dl_usage (const char *argv0, const char *wrong_option) @@ -33,6 +34,19 @@ _dl_usage (const char *argv0, const char *wrong_option) } void +_dl_version (void) +{ + _dl_printf ("\ +ld.so " PKGVERSION RELEASE " release version " VERSION ".\n\ +Copyright (C) 2020 Free Software Foundation, Inc.\n\ +This is free software; see the source for copying conditions.\n\ +There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\ +PARTICULAR PURPOSE.\n\ +"); + _exit (EXIT_SUCCESS); +} + +void _dl_help (const char *argv0, struct dl_main_state *state) { _dl_printf ("\ @@ -61,6 +75,7 @@ of this helper program; chances are you did not intend to run this program.\n\ --preload LIST preload objects named in LIST\n\ --argv0 STRING set argv[0] to STRING before running\n\ --help display this help and exit\n\ + --version output version information and exit\n\ ", argv0); _exit (EXIT_SUCCESS); diff --git a/elf/rtld.c b/elf/rtld.c index 2eeec981a5..fcf4bb70b1 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1254,6 +1254,8 @@ dl_main (const ElfW(Phdr) *phdr, --_dl_argc; ++_dl_argv; } + else if (strcmp (_dl_argv[1], "--version") == 0) + _dl_version (); else if (_dl_argv[1][0] == '-' && _dl_argv[1][1] == '-') { if (_dl_argv[1][1] == '\0') |