Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so n dl_iterate_phdr return the path not the ...



details:   https://anonhg.NetBSD.org/src/rev/36b14f60c8ec
branches:  trunk
changeset: 819379:36b14f60c8ec
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Dec 01 18:21:39 2016 +0000

description:
n dl_iterate_phdr return the path not the name.

diffstat:

 libexec/ld.elf_so/rtld.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 9eb614a10e02 -r 36b14f60c8ec libexec/ld.elf_so/rtld.c
--- a/libexec/ld.elf_so/rtld.c  Thu Dec 01 18:20:25 2016 +0000
+++ b/libexec/ld.elf_so/rtld.c  Thu Dec 01 18:21:39 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.c,v 1.181 2016/12/01 14:29:15 christos Exp $       */
+/*     $NetBSD: rtld.c,v 1.182 2016/12/01 18:21:39 christos Exp $       */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.181 2016/12/01 14:29:15 christos Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.182 2016/12/01 18:21:39 christos Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -1402,8 +1402,7 @@
        for (obj = _rtld_objlist;  obj != NULL;  obj = obj->next) {
                phdr_info.dlpi_addr = (Elf_Addr)obj->relocbase;
                /* XXX: wrong but not fixing it yet */
-               phdr_info.dlpi_name = SIMPLEQ_FIRST(&obj->names) ?
-                   SIMPLEQ_FIRST(&obj->names)->name : obj->path;
+               phdr_info.dlpi_name = obj->path;
                phdr_info.dlpi_phdr = obj->phdr;
                phdr_info.dlpi_phnum = obj->phsize / sizeof(obj->phdr[0]);
 #if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)



Home | Main Index | Thread Index | Old Index