From 88794e308552d6051453544f8790986314fd9e1c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 2 Feb 2002 20:17:54 +0000 Subject: 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 '/'. --- elf/dl-object.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'elf/dl-object.c') 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; -- cgit v1.2.3