lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

* elf/dl-load.c (_dl_dst_count, _dl_dst_substitute): Handle $LIB

Browse Source 
dynamic string tag.
	* elf/Makefile ($(objpfx)trusted-dirs.st): Make the output define
	DL_DST_LIB based on $(slibdir).
This commit is contained in:
Roland McGrath
2002-10-14 01:06:59 +00:00
parent 747bf98ea9
commit 27af537248
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2002-09-26 Roland McGrath <roland@redhat.com>
* elf/dl-load.c (_dl_dst_count, _dl_dst_substitute): Handle $LIB
dynamic string tag.
* elf/Makefile ($(objpfx)trusted-dirs.st): Make the output define
DL_DST_LIB based on $(slibdir).
2002-10-13 Roland McGrath <roland@frob.com> 2002-10-13 Roland McGrath <roland@frob.com>
* elf/rtld-Rules ($(objpfx)rtld-libc.a): Use $(verbose) in ar command. * elf/rtld-Rules ($(objpfx)rtld-libc.a): Use $(verbose) in ar command.

9
elf/dl-load.c
View File

@@ -202,8 +202,8 @@ _dl_dst_count (const char *name, int is_path)
++name; ++name;
if ((len = is_dst (start, name, "ORIGIN", is_path, if ((len = is_dst (start, name, "ORIGIN", is_path,
INTUSE(__libc_enable_secure))) != 0 INTUSE(__libc_enable_secure))) != 0
|| ((len = is_dst (start, name, "PLATFORM", is_path, 0)) || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0
!= 0)) || (len = is_dst (start, name, "LIB", is_path, 0)) != 0)
++cnt; ++cnt;
name = strchr (name + len, '$'); name = strchr (name + len, '$');
@@ -239,9 +239,10 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
if ((len = is_dst (start, name, "ORIGIN", is_path, if ((len = is_dst (start, name, "ORIGIN", is_path,
INTUSE(__libc_enable_secure))) != 0) INTUSE(__libc_enable_secure))) != 0)
repl = l->l_origin; repl = l->l_origin;
else if ((len = is_dst (start, name, "PLATFORM", is_path, else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0)
0)) != 0)
repl = GL(dl_platform); repl = GL(dl_platform);
else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0)
repl = DL_DST_LIB;
if (repl != NULL && repl != (const char *) -1) if (repl != NULL && repl != (const char *) -1)
{ {