aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-07-02 17:43:35 +0000
committerRoland McGrath <roland@gnu.org>1996-07-02 17:43:35 +0000
commitffee131630368bc2600747346d0b03025cbca6ee (patch)
tree4e496094645ba4e4d744868167cd0f79f118aa05 /elf
parenteb48c9632eb9b40b0855003d48e5547c542d2abe (diff)
downloadglibc-ffee131630368bc2600747346d0b03025cbca6ee.zip
glibc-ffee131630368bc2600747346d0b03025cbca6ee.tar.gz
glibc-ffee131630368bc2600747346d0b03025cbca6ee.tar.bz2
Tue Jul 2 10:44:37 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* pwd/fgetpwent.c: Don't include ../nss/nss_files/files-parse.c to define parse_line function. (parse_line): #define to _nss_files_parse_pwent and add extern decl for that. * nss/nss_files/files-XXX.c (internal_getent): Return NSS_STATUS_TRYAGAIN for ERANGE error. * sysdeps/i386/strtok.S (LreturnNULL): Save current state ptr instead of null, so next round returns null again instead of bombing. Fix from drepper. * nss/nss_files/files-parse.c (LINE_PARSER): Take new first arg EOLSET. Remove ; after `ENTDATA_DECL (data)'. Truncate line at strpbrk (line, EOLSET "\n"). (ENTDATA_DECL): Put ; at end. (MIDLINE_COMMENTS): Macro removed. * nss/nss_files/files-ethers.c: Pass new argument. * nss/nss_files/files-hosts.c: Likewise. * nss/nss_files/files-network.c: Likewise. * nss/nss_files/files-parse.c: Likewise. * nss/nss_files/files-proto.c: Likewise. * nss/nss_files/files-rpc.c: Likewise. * nss/nss_files/files-service.c: Likewise. * grp/fgetgrent.c: Likewise. * pwd/fgetpwent.c: Likewise. * nss/nss_files/files-pwd.c: Get parse_line with extern decl, since fgetpwent.c already defines it. * nss/nss_files/files-grp.c: Likewise. * elf/dl-load.c (_dl_map_object): Use any object with matching l_name as well as any matching with l_libname. Fix DT_SONAME lookup to use string table properly. * elf/rtld.c (dl_main): Set _dl_rtld_map.l_name from _dl_argv[0] when invoked directly, and l_libname from that if PT_INTERP missing. Set l_name from l_libname only if not set from argv. * time/europe, time/northamerica: Updated from ADO 96i. * stdio-common/tst-ungetc.c: Include unistd.h.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c4
-rw-r--r--elf/rtld.c18
2 files changed, 15 insertions, 7 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index c19ebe7..ff7f5cf 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -460,11 +460,13 @@ _dl_map_object (struct link_map *loader, const char *name, int type)
/* Look for this name among those already loaded. */
for (l = _dl_loaded; l; l = l->l_next)
if (! strcmp (name, l->l_libname) || /* NAME was requested before. */
+ ! strcmp (name, l->l_name) || /* NAME was found before. */
/* If the requested name matches the soname of a loaded object,
use that object. */
(l->l_info[DT_SONAME] &&
! strcmp (name, (const char *) (l->l_addr +
- l->l_info[DT_SONAME]->d_un.d_ptr))))
+ l->l_info[DT_STRTAB]->d_un.d_ptr +
+ l->l_info[DT_SONAME]->d_un.d_val))))
{
/* The object is already loaded.
Just bump its reference count and return it. */
diff --git a/elf/rtld.c b/elf/rtld.c
index f20602d..1cabe82 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -117,7 +117,6 @@ dl_main (const ElfW(Phdr) *phdr,
{
const ElfW(Phdr) *ph;
struct link_map *l;
- const char *interpreter_name;
int lazy;
int list_only = 0;
@@ -154,7 +153,8 @@ file you run. This is mostly of use for maintainers to test new versions\n\
of this helper program; chances are you did not intend to run this program.\n",
NULL);
- interpreter_name = _dl_argv[0];
+ /* Note the place where the dynamic linker actually came from. */
+ _dl_rtld_map.l_name = _dl_argv[0];
if (! strcmp (_dl_argv[1], "--list"))
{
@@ -182,7 +182,6 @@ of this helper program; chances are you did not intend to run this program.\n",
l = _dl_new_object ((char *) "", "", lt_library);
l->l_phdr = phdr;
l->l_phnum = phent;
- interpreter_name = 0;
l->l_entry = *user_entry;
}
@@ -216,10 +215,14 @@ of this helper program; chances are you did not intend to run this program.\n",
dlopen call or DT_NEEDED entry, for something that wants to link
against the dynamic linker as a shared library, will know that
the shared object is already loaded. */
- interpreter_name = (void *) l->l_addr + ph->p_vaddr;
+ _dl_rtld_map.l_libname = (const char *) l->l_addr + ph->p_vaddr;
break;
}
- assert (interpreter_name); /* How else did we get here? */
+ if (! _dl_rtld_map.l_libname && _dl_rtld_map.l_name)
+ /* We were invoked directly, so the program might not have a PT_INTERP. */
+ _dl_rtld_map.l_libname = _dl_rtld_map.l_name;
+ else
+ assert (_dl_rtld_map.l_libname); /* How else did we get here? */
/* Extract the contents of the dynamic section for easy access. */
elf_get_dynamic_info (l->l_ld, l->l_info);
@@ -229,7 +232,10 @@ of this helper program; chances are you did not intend to run this program.\n",
/* Put the link_map for ourselves on the chain so it can be found by
name. */
- _dl_rtld_map.l_name = (char *) _dl_rtld_map.l_libname = interpreter_name;
+ if (! _dl_rtld_map.l_name)
+ /* If not invoked directly, the dynamic linker shared object file was
+ found by the PT_INTERP name. */
+ _dl_rtld_map.l_name = (char *) _dl_rtld_map.l_libname;
_dl_rtld_map.l_type = lt_library;
while (l->l_next)
l = l->l_next;