qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* elf/dl-load.c (_dl_init_paths): Expand DSTs.

This commit is contained in:
Ulrich Drepper 2006-08-29 01:44:27 +00:00
parent 4004a0a552
commit 950398e132
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2006-08-28 Ulrich Drepper <drepper@redhat.com> 2006-08-28 Ulrich Drepper <drepper@redhat.com>
* elf/dl-load.c (_dl_init_paths): Expand DSTs.
* elf/dl-open.c (dl_open_worker): Allow $LIB and $PLATFORM in * elf/dl-open.c (dl_open_worker): Allow $LIB and $PLATFORM in
dlopen parameters. dlopen parameters.

20
elf/dl-load.c
View File

@ -749,7 +749,25 @@ _dl_init_paths (const char *llp)
{ {
size_t nllp; size_t nllp;
const char *cp = llp; const char *cp = llp;
char *llp_tmp = strdupa (llp); char *llp_tmp;
#ifdef SHARED
/* Expand DSTs. */
size_t cnt = DL_DST_COUNT (llp, 1);
if (__builtin_expect (cnt == 0, 1))
llp_tmp = strdupa (llp);
else
{
/* Determine the length of the substituted string. */
size_t total = DL_DST_REQUIRED (l, llp, strlen (llp), cnt);
/* Allocate the necessary memory. */
llp_tmp = (char *) alloca (total + 1);
llp_tmp = _dl_dst_substitute (l, llp, llp_tmp, 1);
}
#else
llp_tmp = strdupa (llp);
#endif
/* Decompose the LD_LIBRARY_PATH contents. First determine how many /* Decompose the LD_LIBRARY_PATH contents. First determine how many
elements it has. */ elements it has. */