mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

elf: Record whether paths come from LD_LIBRARY_PATH or --library-path

Browse Source 
This allows more precise LD_DEBUG diagnostics.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2020-10-08 10:57:10 +02:00
parent 9590a71adc
commit 27316f4a23
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elf/dl-load.c
View File

@ -682,7 +682,7 @@ cache_rpath (struct link_map *l,
void
_dl_init_paths (const char *llp)
_dl_init_paths (const char *llp, const char *source)
{
size_t idx;
const char *strp;
@ -820,7 +820,7 @@ _dl_init_paths (const char *llp)
}
(void) fillin_rpath (llp_tmp, env_path_list.dirs, ":;",
"LD_LIBRARY_PATH", NULL, l);
source, NULL, l);
if (env_path_list.dirs[0] == NULL)
{

5
elf/dl-main.h
View File

@ -74,6 +74,9 @@ struct dl_main_state
/* The library search path. */
const char *library_path;
/* Where library_path comes from. LD_LIBRARY_PATH or --library-path. */
const char *library_path_source;
/* The list preloaded objects from LD_PRELOAD. */
const char *preloadlist;
@ -94,7 +97,7 @@ struct dl_main_state
static inline void
call_init_paths (const struct dl_main_state *state)
{
_dl_init_paths (state->library_path);
_dl_init_paths (state->library_path, state->library_path_source);
}
/* Print ld.so usage information and exit. */

2
elf/dl-support.c
View File

@ -323,7 +323,7 @@ _dl_non_dynamic_init (void)
/* Initialize the data structures for the search paths for shared
objects. */
_dl_init_paths (getenv ("LD_LIBRARY_PATH"));
_dl_init_paths (getenv ("LD_LIBRARY_PATH"), "LD_LIBRARY_PATH");
/* Remember the last search directory added at startup. */
_dl_init_all_dirs = GL(dl_all_dirs);

3
elf/rtld.c
View File

@ -286,6 +286,7 @@ dl_main_state_init (struct dl_main_state *state)
{
audit_list_init (&state->audit_list);
state->library_path = NULL;
state->library_path_source = NULL;
state->preloadlist = NULL;
state->preloadarg = NULL;
state->mode = rtld_mode_normal;
@ -1203,6 +1204,7 @@ dl_main (const ElfW(Phdr) *phdr,
&& _dl_argc > 2)
{
state.library_path = _dl_argv[2];
state.library_path_source = "--library-path";
_dl_skip_args += 2;
_dl_argc -= 2;
@ -2655,6 +2657,7 @@ process_envvars (struct dl_main_state *state)
&& memcmp (envline, "LIBRARY_PATH", 12) == 0)
{
state->library_path = &envline[13];
state->library_path_source = "LD_LIBRARY_PATH";
break;
}

6
sysdeps/generic/ldsodefs.h
View File

@ -1046,8 +1046,10 @@ rtld_hidden_proto (_dl_debug_state)
extern struct r_debug *_dl_debug_initialize (ElfW(Addr) ldbase, Lmid_t ns)
attribute_hidden;
/* Initialize the basic data structure for the search paths. */
extern void _dl_init_paths (const char *library_path) attribute_hidden;
/* Initialize the basic data structure for the search paths. SOURCE
is either "LD_LIBRARY_PATH" or "--library-path". */
extern void _dl_init_paths (const char *library_path, const char *source)
attribute_hidden;
/* Gather the information needed to install the profiling tables and start
the timers. */