mirror of
git://slackware.nl/current.git
synced 2025-02-05 20:46:11 +01:00
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
|
2009-11-08 Aurelien Jarno <aurelien@aurel32.net>
|
||
|
|
|
||
|
|
* elf/ldd.bash.in: also handle error code 126 (ld.so non
|
||
|
|
executable). Always trace dynamic library dependencies through
|
||
|
|
the dynamic linker.
|
||
|
|
|
||
|
|
--- a/elf/ldd.bash.in
|
||
|
|
+++ b/elf/ldd.bash.in
|
||
|
|
@@ -153,8 +153,6 @@ for file do
|
||
|
|
echo "ldd: ${file}:" $"not regular file" >&2
|
||
|
|
result=1
|
||
|
|
elif test -r "$file"; then
|
||
|
|
- test -x "$file" || echo 'ldd:' $"\
|
||
|
|
-warning: you do not have execution permission for" "\`$file'" >&2
|
||
|
|
RTLD=
|
||
|
|
ret=1
|
||
|
|
for rtld in ${RTLDLIST}; do
|
||
|
|
@@ -167,28 +165,16 @@ warning: you do not have execution permission for" "\`$file'" >&2
|
||
|
|
fi
|
||
|
|
done
|
||
|
|
case $ret in
|
||
|
|
- 0)
|
||
|
|
- # If the program exits with exit code 5, it means the process has been
|
||
|
|
- # invoked with __libc_enable_secure. Fall back to running it through
|
||
|
|
- # the dynamic linker.
|
||
|
|
- try_trace "$file"
|
||
|
|
- rc=$?
|
||
|
|
- if [ $rc = 5 ]; then
|
||
|
|
- try_trace "$RTLD" "$file"
|
||
|
|
- rc=$?
|
||
|
|
- fi
|
||
|
|
- [ $rc = 0 ] || result=1
|
||
|
|
+ 0|2)
|
||
|
|
+ try_trace "$RTLD" "$file" || result=1
|
||
|
|
;;
|
||
|
|
- 1)
|
||
|
|
+ 1|126)
|
||
|
|
# This can be a non-ELF binary or no binary at all.
|
||
|
|
nonelf "$file" || {
|
||
|
|
echo $" not a dynamic executable"
|
||
|
|
result=1
|
||
|
|
}
|
||
|
|
;;
|
||
|
|
- 2)
|
||
|
|
- try_trace "$RTLD" "$file" || result=1
|
||
|
|
- ;;
|
||
|
|
*)
|
||
|
|
echo 'ldd:' ${RTLD} $"exited with unknown exit code" "($ret)" >&2
|
||
|
|
exit 1
|