Skip to content

Commit

Permalink
Use shell's builtin pwd.
Browse files Browse the repository at this point in the history
Insisting on /bin/pwd is unnecessary nowadays.  Autoconf-generated
scripts have been using the shell's built-in "pwd" for a long time.`
  • Loading branch information
Ludovic Courtès authored and Carlos O'Donell committed Dec 3, 2015
1 parent 4de3b51 commit db340c9
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 19 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2015-12-02 Ludovic Courtès <ludo@gnu.org>

* configure.ac: Use 'pwd -P' instead of '/bin/pwd'.
* configure: Regenerate.
* io/ftwtest-sh: Use 'pwd -P' instead of '/bin/pwd'.
* scripts/rellns-sh: Likewise. Remove 'pwd' variable.

2015-12-02 Carlos O'Donell <carlos@redhat.com>

* iconvdata/ibm930.c: Add comment explaining encoding uses.
Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -3228,7 +3228,7 @@ if test $libc_cv_cxx_link_ok != yes; then :
CXX=
fi

if test "`cd $srcdir; /bin/pwd`" = "`/bin/pwd`"; then
if test "`cd $srcdir; pwd -P`" = "`pwd -P`"; then
as_fn_error $? "you must configure in a separate build directory" "$LINENO" 5
fi

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ LDFLAGS="$old_LDFLAGS"
AC_LANG_POP([C++])])
AS_IF([test $libc_cv_cxx_link_ok != yes], [CXX=])

if test "`cd $srcdir; /bin/pwd`" = "`/bin/pwd`"; then
if test "`cd $srcdir; pwd -P`" = "`pwd -P`"; then
AC_MSG_ERROR([you must configure in a separate build directory])
fi

Expand Down
8 changes: 4 additions & 4 deletions io/ftwtest-sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
18 changes: 5 additions & 13 deletions scripts/rellns-sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,15 @@ 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 && $pwd`
to=`cd $1 && pwd -P`
else
temp=`echo $1 | sed 's%/*[^/]*$%%'`
if test -z "$temp"; then
to=`$pwd`
to=`pwd -P`
else
to=`cd $temp && $pwd`
to=`cd $temp && pwd -P`
fi
to="$to/`echo $1 | sed 's%.*/\([^/][^/]*\)$%\1%'`"
fi
Expand All @@ -59,9 +51,9 @@ else
fi

if test -z "$from"; then
from=`$pwd | sed 's%^/%%'`
from=`pwd -P | sed 's%^/%%'`
else
from=`cd $from && $pwd | sed 's%^/%%'`
from=`cd $from && pwd -P | sed 's%^/%%'`
fi

while test -n "$to" && test -n "$from"; do
Expand Down

0 comments on commit db340c9

Please sign in to comment.