]>
Commit | Line | Data |
---|---|---|
742e361d ER |
1 | --- glibc-2.10.1/elf/ldd.bash.in 2009-06-08 23:02:27.663745478 +0300 |
2 | +++ glibc-2.10.1/elf/ldd.bash.in 2009-06-08 23:04:15.706861781 +0300 | |
3 | @@ -1,4 +1,4 @@ | |
4 | -#! @BASH@ | |
5 | +#! /bin/sh | |
48876fe6 | 6 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. |
742e361d ER |
7 | # This file is part of the GNU C Library. |
8 | ||
ccca7e27 | 9 | @@ -35,16 +35,16 @@ |
742e361d ER |
10 | case "$1" in |
11 | --vers | --versi | --versio | --version) | |
ccca7e27 | 12 | echo 'ldd @PKGVERSION@@VERSION@' |
742e361d ER |
13 | - printf $"Copyright (C) %s Free Software Foundation, Inc. |
14 | + printf "Copyright (C) %s Free Software Foundation, Inc. | |
15 | This is free software; see the source for copying conditions. There is NO | |
16 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | |
48876fe6 | 17 | " "2013" |
742e361d ER |
18 | - printf $"Written by %s and %s. |
19 | + printf "Written by %s and %s. | |
20 | " "Roland McGrath" "Ulrich Drepper" | |
21 | exit 0 | |
22 | ;; | |
23 | --h | --he | --hel | --help) | |
24 | - echo $"Usage: ldd [OPTION]... FILE... | |
25 | + echo "Usage: ldd [OPTION]... FILE... | |
26 | --help print this help and exit | |
27 | --version print version information and exit | |
28 | -d, --data-relocs process data relocations | |
ccca7e27 | 29 | @@ -52,7 +52,7 @@ |
742e361d ER |
30 | -u, --unused print unused direct dependencies |
31 | -v, --verbose print all information | |
32 | " | |
ccca7e27 AM |
33 | - printf $"For bug reporting instructions, please see:\\n%s.\\n" \ |
34 | + printf "For bug reporting instructions, please see:\\n%s.\\n" \ | |
35 | "@REPORT_BUGS_TO@" | |
742e361d | 36 | exit 0 |
ccca7e27 | 37 | ;; |
742e361d ER |
38 | @@ -79,15 +79,15 @@ |
39 | shift | |
40 | ;; | |
41 | --v | --ve | --ver) | |
42 | - echo >&2 $"ldd: option \`$1' is ambiguous" | |
43 | + echo >&2 "ldd: option \`$1' is ambiguous" | |
44 | exit 1 | |
45 | ;; | |
46 | --) # Stop option processing. | |
47 | shift; break | |
48 | ;; | |
49 | -*) | |
50 | - echo >&2 'ldd:' $"unrecognized option" "\`$1'" | |
51 | - echo >&2 $"Try \`ldd --help' for more information." | |
52 | + echo >&2 'ldd:' "unrecognized option" "\`$1'" | |
53 | + echo >&2 "Try \`ldd --help' for more information." | |
54 | exit 1 | |
55 | ;; | |
56 | *) | |
57 | @@ -112,20 +112,14 @@ | |
58 | # environments where the executed program might not have permissions | |
59 | # to write to the console/tty. But only bash 3.x supports the pipefail | |
60 | # option, and we don't bother to handle the case for older bash versions. | |
61 | -if set -o pipefail 2> /dev/null; then | |
62 | - try_trace() { | |
63 | - eval $add_env '"$@"' | cat | |
64 | - } | |
65 | -else | |
66 | - try_trace() { | |
67 | - eval $add_env '"$@"' | |
68 | - } | |
69 | -fi | |
70 | +try_trace() { | |
71 | + eval $add_env '"$@"' | |
72 | +} | |
73 | ||
74 | case $# in | |
75 | 0) | |
76 | - echo >&2 'ldd:' $"missing file arguments" | |
77 | - echo >&2 $"Try \`ldd --help' for more information." | |
78 | + echo >&2 'ldd:' "missing file arguments" | |
79 | + echo >&2 "Try \`ldd --help' for more information." | |
80 | exit 1 | |
81 | ;; | |
82 | 1) | |
83 | @@ -147,13 +141,13 @@ | |
84 | ;; | |
85 | esac | |
86 | if test ! -e "$file"; then | |
87 | - echo "ldd: ${file}:" $"No such file or directory" >&2 | |
88 | + echo "ldd: ${file}:" "No such file or directory" >&2 | |
89 | result=1 | |
90 | elif test ! -f "$file"; then | |
91 | - echo "ldd: ${file}:" $"not regular file" >&2 | |
92 | + echo "ldd: ${file}:" "not regular file" >&2 | |
93 | result=1 | |
94 | elif test -r "$file"; then | |
95 | - test -x "$file" || echo 'ldd:' $"\ | |
96 | + test -x "$file" || echo 'ldd:' "\ | |
97 | warning: you do not have execution permission for" "\`$file'" >&2 | |
98 | RTLD= | |
99 | ret=1 | |
100 | @@ -182,7 +176,7 @@ | |
101 | 1) | |
102 | # This can be a non-ELF binary or no binary at all. | |
103 | nonelf "$file" || { | |
104 | - echo $" not a dynamic executable" | |
105 | + echo " not a dynamic executable" | |
106 | result=1 | |
107 | } | |
108 | ;; | |
109 | @@ -190,12 +184,12 @@ | |
110 | try_trace "$RTLD" "$file" || result=1 | |
111 | ;; | |
112 | *) | |
113 | - echo 'ldd:' ${RTLD} $"exited with unknown exit code" "($ret)" >&2 | |
114 | + echo 'ldd:' ${RTLD} "exited with unknown exit code" "($ret)" >&2 | |
115 | exit 1 | |
116 | ;; | |
117 | esac | |
118 | else | |
119 | - echo 'ldd:' $"error: you do not have read permission for" "\`$file'" >&2 | |
120 | + echo 'ldd:' "error: you do not have read permission for" "\`$file'" >&2 | |
121 | result=1 | |
122 | fi | |
123 | done |