summaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-12-02 23:58:15 -0500
committerCarlos O'Donell <carlos@systemhalted.org>2015-12-02 23:58:15 -0500
commitdb340c904dd519142025a09190bf48ad28152ab9 (patch)
tree9e206d2550232fbcb418b42cdc42df548993be94 /io
parent4de3b51e08cd7585926406b06da113d1173075c3 (diff)
downloadglibc-db340c904dd519142025a09190bf48ad28152ab9.tar.gz
Use shell's builtin pwd.
Insisting on /bin/pwd is unnecessary nowadays. Autoconf-generated scripts have been using the shell's built-in "pwd" for a long time.`
Diffstat (limited to 'io')
-rw-r--r--io/ftwtest-sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/io/ftwtest-sh b/io/ftwtest-sh
index 8669eab485..f3e35978c2 100644
--- a/io/ftwtest-sh
+++ b/io/ftwtest-sh
@@ -135,7 +135,7 @@ $testprogram --chdir $tmpdir |
sort > $testout
# perhaps $tmp involves some symlinks...
-tmpreal=`cd $tmp; /bin/pwd 2>/dev/null || /usr/bin/pwd`
+tmpreal=`cd $tmp; pwd -P 2>/dev/null`
cat <<EOF | cmp $testout - || exit 1
base = "$tmp/", file = "ftwtest.d", flag = FTW_D, cwd = $tmpreal, level = 0
@@ -153,7 +153,7 @@ base = "$tmp/ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F, cwd
EOF
rm $testout
-curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd`
+curwd=`pwd -P 2>/dev/null`
cd "$tmp"
$testprogram --chdir ftwtest.d |
sort > $testout
@@ -175,7 +175,7 @@ base = "ftwtest.d/foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F, cwd = $tm
EOF
rm $testout
-curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd`
+curwd=`pwd -P`
cd "$tmp"
$testprogram --chdir ftwtest.d/. |
sort > $testout
@@ -197,7 +197,7 @@ base = "ftwtest.d/./foo/lvl1/lvl2/lvl3/", file = "file@3", flag = FTW_F, cwd = $
EOF
rm $testout
-curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd`
+curwd=`pwd -P 2>/dev/null`
cd "$tmp"
$testprogram --chdir ftwtest.d/foo/lvl1/link@1 |
sort > $testout