diff mbox series

[10/30] elf: Implement ld.so --version

Message ID	42feb79bf0e16be128a0295f3707264816eaf09c.1592836143.git.fweimer@redhat.com
State	Superseded
Headers	DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C39073890436 To: libc-alpha@sourceware.org Subject: [PATCH 10/30] elf: Implement ld.so --version In-Reply-To: <cover.1592836143.git.fweimer@redhat.com> References: <cover.1592836143.git.fweimer@redhat.com> Message-Id: <42feb79bf0e16be128a0295f3707264816eaf09c.1592836143.git.fweimer@redhat.com> Date: Mon, 22 Jun 2020 17:13:54 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: list From: Florian Weimer via Libc-alpha <libc-alpha@sourceware.org> Reply-To: Florian Weimer <fweimer@redhat.com> Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces@sourceware.org>
Series	RFC: elf: glibc-hwcaps support \| [00/30] RFC: elf: glibc-hwcaps support [01/30] elf: Include <stdbool.h> in <dl-tunables.h> because bool is used [02/30] elf: Include <stddef.h> (for size_t), <sys/stat.h> in <ldconfig.h> [03/30] elf: Do not search HWCAP subdirectories in statically linked binaries [04/30] elf: Implement __rtld_malloc_is_full [05/30] elf: Implement _dl_write [06/30] elf: Extract command-line/environment variables state from rtld.c [07/30] elf: Move ld.so error/help output to _dl_usage [08/30] elf: Record whether paths come from LD_LIBRARY_PATH or --library-path [09/30] elf: Implement ld.so --help [10/30] elf: Implement ld.so --version [11/30] scripts/update-copyrights: Update csu/version.c, elf/dl-usage.c [12/30] elf: Use the term "program interpreter" in the ld.so help message [13/30] elf: Print the full name of the dynamic loader in the ld.so help message [14/30] elf: Make __rtld_env_path_list and __rtld_search_dirs global variables [15/30] elf: Add library search path information to ld.so --help [16/30] elf: Enhance ld.so --help to print HWCAP subdirectories [17/30] elf: Do not pass GLRO(dl_platform), GLRO(dl_platformlen) to _dl_important_hwcaps [18/30] elf: Add glibc-hwcaps support for LD_LIBRARY_PATH [19/30] x86_64: Add glibc-hwcaps support [20/30] powerpc64le: Add glibc-hwcaps support [21/30] s390x: Add Add glibc-hwcaps support [22/30] aarch64: Add glibc-hwcaps support [23/30] elf: Add endianness markup to ld.so.cache [24/30] elf: Add extension mechanism to ld.so.cache [25/30] elf: Unify old and new format cache handling code in ld.so [26/30] elf: Implement a string table for ldconfig, with tail merging [27/30] elf: Implement tail merging of strings in ldconfig [28/30] elf: In ldconfig, extract the new_sub_entry function from search_dir [29/30] elf: Process glibc-hwcaps subdirectories in ldconfig [30/30] elf: Add glibc-hwcaps subdirectory support to ld.so cache processing

Commit Message

Florian Weimer June 22, 2020, 3:13 p.m. UTC

  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).
---
 elf/dl-main.h  |  3 +++
 elf/dl-usage.c | 15 +++++++++++++++
 elf/rtld.c     |  2 ++
 3 files changed, 20 insertions(+)

diff mbox series

Patch

diff --git a/elf/dl-main.h b/elf/dl-main.h
index 71ca5114de..0df849d3cd 100644
--- a/elf/dl-main.h
+++ b/elf/dl-main.h
@@ -101,6 +101,9 @@  call_init_paths (const struct dl_main_state *state)
 void _dl_usage (const char *argv0, const char *wrong_option)
   attribute_hidden __attribute__ ((__noreturn__));
 
+/* Print ld.so version information and exit.  */
+void _dl_version (void) attribute_hidden __attribute__ ((__noreturn__));
+
 /* Print ld.so --help output and exit.  */
 void _dl_help (const char *argv0, struct dl_main_state *state)
   attribute_hidden __attribute__ ((__noreturn__));
diff --git a/elf/dl-usage.c b/elf/dl-usage.c
index e1dc5d33b2..c8d182c442 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)
@@ -32,6 +33,19 @@  _dl_usage (const char *argv0, const char *wrong_option)
   _exit (1);
 }
 
+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 (0);
+}
+
 void
 _dl_help (const char *argv0, struct dl_main_state *state)
 {
@@ -60,6 +74,7 @@  of this helper program; chances are you did not intend to run this program.\n\
   --audit LIST          use objects named in LIST as auditors\n\
   --preload LIST        preload objects named in LIST\n\
   --help                display this help and exit\n\
+  --version             output version information and exit\n\
 ",
               argv0);
   _exit (0);
diff --git a/elf/rtld.c b/elf/rtld.c
index 610203d5d2..06bc8eca9a 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1224,6 +1224,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')