diff options
author | Ulrich Drepper <drepper@redhat.com> | 2004-03-05 10:29:47 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2004-03-05 10:29:47 +0000 |
commit | afdca0f2a3a18fb0dcfc334c205e0fb96e90e839 (patch) | |
tree | 59ba9a29d6174ebbbbe09258ea52e9f956e33c2e /sysdeps/unix/sysv/linux/dl-origin.c | |
parent | 20c37dfde1a836a139f6269e8617260f2b90bf52 (diff) | |
download | glibc-afdca0f2a3a18fb0dcfc334c205e0fb96e90e839.tar.gz glibc-afdca0f2a3a18fb0dcfc334c205e0fb96e90e839.tar.xz glibc-afdca0f2a3a18fb0dcfc334c205e0fb96e90e839.zip |
Update.
* sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/s390/s390-64/dl-machine.h: Likewise. * sysdeps/s390/s390-32/dl-machine.h: Likewise. * sysdeps/powerpc/powerpc64/dl-machine.h: Likewise. * sysdeps/powerpc/powerpc32/dl-machine.c: Likewise. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/arm/dl-machine.h: Likewise. * sysdeps/alpha/dl-machine.h: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/dl-origin.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/dl-origin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/dl-origin.c b/sysdeps/unix/sysv/linux/dl-origin.c index 3824681fa7..690492093d 100644 --- a/sysdeps/unix/sysv/linux/dl-origin.c +++ b/sysdeps/unix/sysv/linux/dl-origin.c @@ -1,5 +1,5 @@ /* Find path of executable. - Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -59,15 +59,15 @@ _dl_get_origin (void) result = (char *) -1; /* We use the environment variable LD_ORIGIN_PATH. If it is set make a copy and strip out trailing slashes. */ - if (GL(dl_origin_path) != NULL) + if (GLRO(dl_origin_path) != NULL) { - size_t len = strlen (GL(dl_origin_path)); + size_t len = strlen (GLRO(dl_origin_path)); result = (char *) malloc (len + 1); if (result == NULL) result = (char *) -1; else { - char *cp = __mempcpy (result, GL(dl_origin_path), len); + char *cp = __mempcpy (result, GLRO(dl_origin_path), len); while (cp > result + 1 && cp[-1] == '/') --cp; *cp = '\0'; |