aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-object.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-02-02 20:17:54 +0000
committerUlrich Drepper <drepper@redhat.com>2002-02-02 20:17:54 +0000
commit88794e308552d6051453544f8790986314fd9e1c (patch)
tree7811ea4e234dd21b1a49424ecfaaf95bda52e7b6 /elf/dl-object.c
parent1e823b7d2dcbffb793be1e48b397d7c1a1b19a52 (diff)
downloadglibc-88794e308552d6051453544f8790986314fd9e1c.tar
glibc-88794e308552d6051453544f8790986314fd9e1c.tar.gz
glibc-88794e308552d6051453544f8790986314fd9e1c.tar.bz2
glibc-88794e308552d6051453544f8790986314fd9e1c.zip
Update.
* elf/dl-object.c (_dl_new_object): Avoid using strrchr. We have more information. * elf/rtld.c (dl_main): Avoid strrchr. * sysdeps/unix/sysv/linux/dl-origin.c (_dl_get_origin): Use the result of readlink. Search from the back for '/'.
Diffstat (limited to 'elf/dl-object.c')
-rw-r--r--elf/dl-object.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/elf/dl-object.c b/elf/dl-object.c
index 0488e3230c..398628aa1b 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -150,15 +150,18 @@ _dl_new_object (char *realname, const char *libname, int type,
}
/* Add the real file name. */
- memcpy (cp, realname, realname_len);
+ cp = __mempcpy (cp, realname, realname_len);
- /* Now remove the filename and the slash. Leave the slash if it
+ /* Now remove the filename and the slash. Leave the slash if
the name is something like "/foo". */
- cp = strrchr (origin, '/');
+ do
+ --cp;
+ while (*cp != '/');
+
if (cp == origin)
- origin[1] = '\0';
- else
- *cp = '\0';
+ /* Keep the only slash which is the first character. */
+ ++cp;
+ *cp = '\0';
out:
new->l_origin = origin;