From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by sourceware.org (Postfix) with ESMTPS id 28A783858D35 for ; Wed, 7 Oct 2020 18:38:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 28A783858D35 Received: by mail-qk1-x743.google.com with SMTP id z6so4083707qkz.4 for ; Wed, 07 Oct 2020 11:38:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=0av7IZCNRL7f0DKxQKCOZ6ne3Xg6hH4LabCV9xxg2AE=; b=VbYzujXirgzBzdRI5f1fdqtNo52JCK7XoaWNIgMTPtu0/KXBKen8s849rj564mD+r9 od314s2OOVU4qXF2TBPFGP5yhsQCShkRW4sUwL/Hlzn5LQzHgnmTsKAVWphkTUrMl1wO eIxdo9/zeuML6un19FTaDX2+Sena4iWMUCHlxS5ejod+Hr/K22ytEEdbY/0WNG5IxxcT jig7tuEXkQzK3kFc765EsjCLYlcUl9U9nH/moImsz0fl/GeLnpLJbMvoQdoy+YfWIh5B +qMbwsM6uo/qt8E5QfubsjSerz4yIJbtpShnJt3ZuE5gh1YPQEI6cXImVLEDeI4jGmri a8mw== X-Gm-Message-State: AOAM53219N2JIaGdkWTpje3rU0bniulRIjVBNpN+uYPKShG7Pb9wOxeR Za3g1aO9DGbgsMQVh85rxtkvNZt2OYE8JA== X-Google-Smtp-Source: ABdhPJwJuZn2iuXQhjmOD37YJTtiCmRVys1U37GB1SU0dBfGOxzAL5ZQhh922SQf03gFDOyGTihBQQ== X-Received: by 2002:a37:5ca:: with SMTP id 193mr4350765qkf.44.1602095897310; Wed, 07 Oct 2020 11:38:17 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id p77sm394119qke.39.2020.10.07.11.38.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 07 Oct 2020 11:38:17 -0700 (PDT) Subject: Re: [PATCH 08/28] elf: Implement ld.so --version From: Adhemerval Zanella To: libc-alpha@sourceware.org References: <7333a9c583135f6660716d67c05da78a65df0aea.1601569371.git.fweimer@redhat.com> <0622aa62-11bd-eff2-3966-e7753a5f04f0@linaro.org> Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <793733db-05d5-f450-181d-a56791252363@linaro.org> Date: Wed, 7 Oct 2020 15:38:14 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <0622aa62-11bd-eff2-3966-e7753a5f04f0@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Oct 2020 18:38:19 -0000 On 07/10/2020 15:36, Adhemerval Zanella wrote: > > > On 01/10/2020 13:32, Florian Weimer via Libc-alpha wrote: >> 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). > > Some comments below. > >> --- >> elf/dl-main.h | 3 +++ >> elf/dl-usage.c | 15 +++++++++++++++ >> elf/rtld.c | 2 ++ >> 3 files changed, 20 insertions(+) >> >> 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__)); >> + > > Maybe _Noreturn here? > >> /* 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 72ff99e70f..7355b094a5 100644 >> --- a/elf/dl-usage.c >> +++ b/elf/dl-usage.c >> @@ -20,6 +20,7 @@ >> #include >> #include >> #include >> +#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); >> +} >> + > > I think we will need a way to embedded the Copyright year using a macro > to avoid need to manually update it on each year. And I just noted you are handling on the scripts/update-copyrights, so this should be ok. Reviewed-by: Adhemerval Zanella > >> void >> _dl_help (const char *argv0, struct dl_main_state *state) >> { >> @@ -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 (0); >> diff --git a/elf/rtld.c b/elf/rtld.c >> index 5cdab3c99c..e0e8e98c2f 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') >> > > Ok. >