From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by sourceware.org (Postfix) with ESMTPS id F06EA3857036 for ; Thu, 8 Oct 2020 16:22:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F06EA3857036 Received: by mail-qk1-x744.google.com with SMTP id s4so7611132qkf.7 for ; Thu, 08 Oct 2020 09:22:48 -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:to:references:from:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=zY2ffbob80teTjJrNV7XMdG3oHnRoelt6l8I/Go0QC8=; b=YlGvzHCIB4QdwykP3+9VAQVk8VO9/mhXwA7erzEZpbrlEpxaZDv5Cm/J40lUoh4tgK F3fkefAdjz7ZKt749f5bLeGX+LU2mKB5KqwYfvzCMYT1NY9bCxDeMuxuiftXA4Hnmhjo Twa5rfAqbgepB1FUO5FU47jLPdD3Ok/NBfLgaPyq0sHZFjjOw8urPtDneHBpHzl4fu/E xBbcUXGvdRl+MAcvb9F7IMTGwTsTkZSCY/28MmHchWJWt/UBq84F2U4BWNr2vDvBcfhf +MA/QY/lloKoy61neL0pAryyjQyvfZP8OxKRvya669JZqScpxJoDYac/JJfsL9qOUWdh 1TMg== X-Gm-Message-State: AOAM533R9PV9U5DzbqPUVssvT13sV0I2siFPhYS9CCCx3jxx7oPK2brs mSiwfieyYMmh6qb02Q0+tZThur3eGFjzLw== X-Google-Smtp-Source: ABdhPJxMb0D016/xNPnWc5XAmS7qAnHrRI4GlGcBNqwhIEJ1w3XCnt/Pzco+IcpDgjLhXehX2OI/Qg== X-Received: by 2002:ae9:e513:: with SMTP id w19mr9378037qkf.296.1602174168288; Thu, 08 Oct 2020 09:22:48 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id 198sm4319604qki.117.2020.10.08.09.22.47 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Oct 2020 09:22:47 -0700 (PDT) Subject: Re: [PATCH 13/28] elf: Add library search path information to ld.so --help To: libc-alpha@sourceware.org References: From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: Date: Thu, 8 Oct 2020 13:22:45 -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: 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: Thu, 08 Oct 2020 16:22:50 -0000 LGTM, thanks. Reviewed-by: Adhemerval Zanella On 01/10/2020 13:32, Florian Weimer via Libc-alpha wrote: > --- > elf/dl-usage.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 56 insertions(+) > > diff --git a/elf/dl-usage.c b/elf/dl-usage.c > index 0a62e8f7cf..20aa715cb1 100644 > --- a/elf/dl-usage.c > +++ b/elf/dl-usage.c > @@ -46,6 +46,61 @@ PARTICULAR PURPOSE.\n\ > _exit (0); > } > > +/* Print part of the library search path (from a single source). */ > +static void > +print_search_path_for_help_1 (struct r_search_path_elem **list) > +{ > + if (list == NULL || list == (void *) -1) > + /* Path is missing or marked as inactive. */ > + return; > + > + for (; *list != NULL; ++list) > + { > + (void) _dl_write (STDOUT_FILENO, " ", 2); > + const char *name = (*list)->dirname; > + size_t namelen = (*list)->dirnamelen; > + if (namelen == 0) > + { > + /* The empty string denotes the current directory. */ > + name = "."; > + namelen = 1; > + } > + else if (namelen > 1) > + /* Remove the trailing slash. */ > + --namelen; > + (void) _dl_write (STDOUT_FILENO, name, namelen); > + _dl_printf (" (%s)\n", (*list)->what); > + } > +} > + Do we need the (void) casts? > +/* Prints the library search path. See _dl_init_paths in dl-load.c > + how this information is populated. */ > +static void > +print_search_path_for_help (struct dl_main_state *state) > +{ > + if (__rtld_search_dirs.dirs == NULL) > + /* The run-time search paths have not yet been initialized. */ > + _dl_init_paths (state->library_path, state->library_path_source); > + > + _dl_printf ("\nShared library search path:\n"); > + > + /* The print order should reflect the processing in > + _dl_map_object. */ > + > + struct link_map *map = GL(dl_ns)[LM_ID_BASE]._ns_loaded; > + if (map != NULL) > + print_search_path_for_help_1 (map->l_rpath_dirs.dirs); > + > + print_search_path_for_help_1 (__rtld_env_path_list.dirs); > + > + if (map != NULL) > + print_search_path_for_help_1 (map->l_runpath_dirs.dirs); > + > + _dl_printf (" (libraries located via %s)\n", LD_SO_CACHE); > + > + print_search_path_for_help_1 (__rtld_search_dirs.dirs); > +} > + > void > _dl_help (const char *argv0, struct dl_main_state *state) > { > @@ -80,5 +135,6 @@ setting environment variables (which would be inherted by subprocesses).\n\ > This program interpreter self-identifies as: " RTLD "\n\ > ", > argv0); > + print_search_path_for_help (state); > _exit (0); > } > Ok.