aboutsummaryrefslogtreecommitdiff
path: root/scripts/rellns-sh
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-12-19 00:04:05 +0000
committerUlrich Drepper <drepper@redhat.com>1999-12-19 00:04:05 +0000
commit63a34b0f0196ec397b79cecd8bac4b1612981ad0 (patch)
tree0799c3cd8f2cdf73f76662ff4fdf1ec99180a298 /scripts/rellns-sh
parentb85697f61d8aeeaeb8b91d50ab2c668b7fcbbd8a (diff)
downloadglibc-63a34b0f0196ec397b79cecd8bac4b1612981ad0.zip
glibc-63a34b0f0196ec397b79cecd8bac4b1612981ad0.tar.gz
glibc-63a34b0f0196ec397b79cecd8bac4b1612981ad0.tar.bz2
Update.
1999-12-18 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/i386/setrlimit.c: Declare local variable result if necessary. * sysdeps/unix/sysv/linux/i386/bits/resource.h: Don't depend on the unreliable kernel headers. * sysdeps/unix/sysv/linux/bits/resource.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/resource.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/resource.h: New file. * sysdeps/unix/sysv/linux/mips/bits/resource.h: New file. 1999-12-18 Andreas Jaeger <aj@suse.de> * config.make.in (datadir): Added. Closes PR libc/1491. Patch by dervishd@jazzfree.com. 1999-12-18 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/ftruncate64.c (ftruncate64): Save and set errno. * sysdeps/unix/sysv/linux/truncate64.c (truncate64): Likewise. 1999-12-18 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/fxstat64.c: Rewrite to use fstat64 syscall if available. * sysdeps/unix/sysv/linux/lxstat64.c: Likewise for lstat64. * sysdeps/unix/sysv/linux/xstat64.c: Likewise for stat64. * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_STAT64_SYSCALL): New. 1999-12-17 Scott Bambrough <scottb@netwinder.org> * sysdeps/arm/dl-machine.h (CLEAR_CACHE): New macro to force a cache flush. * elf/dl-reloc.c (_dl_relocate_object): Add call to flush cache after .text segment fixups. 1999-12-16 Andreas Jaeger <aj@suse.de> * rt/aio.h: Remove erroneous __restrict declarations. 1999-12-18 Ulrich Drepper <drepper@cygnus.com> * scripts/rellns-sh: Find pwd program also in /usr/bin and let shell do the job if it is there neither. Patch by David R. Conrad <drc@adni.net> (PR libc/1485). 1999-12-16 Andreas Jaeger <aj@suse.de> * sysdeps/ieee754/bits/nan.h (NAN): Rename union to avoid duplicate definition with function __nan. Closes PR libc/1487 reported by <diana@kai.com>. * string/bits/string2.h (__strsep): Help gcc optimizing string access.
Diffstat (limited to 'scripts/rellns-sh')
-rwxr-xr-xscripts/rellns-sh18
1 files changed, 13 insertions, 5 deletions
diff --git a/scripts/rellns-sh b/scripts/rellns-sh
index 890f4ee..e4626ce 100755
--- a/scripts/rellns-sh
+++ b/scripts/rellns-sh
@@ -22,15 +22,23 @@ if test $# -ne 2; then
exit 1
fi
+if test -x /bin/pwd; then
+ pwd=/bin/pwd
+elif test -x /usr/bin/pwd; then
+ pwd=/usr/bin/pwd
+else
+ pwd='pwd'
+fi
+
# Make both paths absolute.
if test -d $1; then
- to=`cd $1 && /bin/pwd`
+ to=`cd $1 && $pwd`
else
temp=`echo $1 | sed 's%/*[^/]*$%%'`
if test -z "$temp"; then
- to=`/bin/pwd`
+ to=`$pwd`
else
- to=`cd $temp && /bin/pwd`
+ to=`cd $temp && $pwd`
fi
to="$to/`echo $1 | sed 's%.*/\([^/][^/]*\)$%\1%'`"
fi
@@ -43,9 +51,9 @@ else
fi
if test -z "$from"; then
- from=`/bin/pwd | sed 's%^/%%'`
+ from=`$pwd | sed 's%^/%%'`
else
- from=`cd $from && /bin/pwd | sed 's%^/%%'`
+ from=`cd $from && $pwd | sed 's%^/%%'`
fi
while test -n "$to" && test -n "$from"; do