AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* elf/dl-load.c (_dl_map_object): Implement handling of
	DF_1_NODEFLIB.
This commit is contained in:
Ulrich Drepper 2000-07-21 05:07:54 +00:00
parent 2cb8cefbd4
commit 266bb989e0
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2000-07-20 Ulrich Drepper <drepper@redhat.com>
* elf/dl-load.c (_dl_map_object): Implement handling of
DF_1_NODEFLIB.
* elf/Makefile: Add no modules for nodelete test.
* elf/nodelmod3.c: New file.
* elf/nodelmod4.c: New file.

41
elf/dl-load.c
View File

@ -1467,21 +1467,48 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
const char *cached = _dl_load_cache_lookup (name);
if (cached)
{
fd = __open (cached, O_RDONLY);
if (fd != -1)
/* If the loader has the DF_1_NODEFLIB flag set we must not
use a cache entry from any of these directories. */
if (__builtin_expect (loader->l_flags_1 & DF_1_NODEFLIB, 0))
{
realname = local_strdup (cached);
if (realname == NULL)
const char *dirp = system_dirs;
int cnt = 0;
do
{
__close (fd);
fd = -1;
if (memcmp (cached, dirp, system_dirs_len[cnt]) == 0)
{
/* The prefix matches. Don't use the entry. */
cached = NULL;
break;
}
dirp += system_dirs_len[cnt] + 1;
++cnt;
}
while (cnt < (sizeof (system_dirs_len)
/ sizeof (system_dirs_len[0])));
}
if (cached)
{
fd = __open (cached, O_RDONLY);
if (fd != -1)
{
realname = local_strdup (cached);
if (realname == NULL)
{
__close (fd);
fd = -1;
}
}
}
}
}
/* Finally, try the default path. */
if (fd == -1)
if (fd == -1
&& __builtin_expect (!(loader->l_flags_1 & DF_1_NODEFLIB), 1))
fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
&realname);