Skip to content
Snippets Groups Projects
Commit 26306424 authored by Christian Engwer's avatar Christian Engwer
Browse files

fix bug in canonicalname function

[[Imported from SVN: r4936]]
parent db45011f
Branches
Tags
No related merge requests found
......@@ -21,7 +21,19 @@ canonicalname(){
echo Usage: canonicalname path > /dev/stderr
return 1
fi
readlink $1 || echo "$(dirname $1)/$(basename $1)"
name="$1"
while test -L "$name"; do
if ! test -e "$name"; then
echo $name: file not found > /dev/stderr
return 1
fi
if newname="`readlink $name`"; then
name="$newname"
else
echo "$(dirname $name)/$(basename $name)"
fi
done
echo $name
}
canonicalpath(){
......
......@@ -14,7 +14,19 @@ canonicalname(){
echo Usage: canonicalname path > /dev/stderr
return 1
fi
readlink $1 || echo "$(dirname $1)/$(basename $1)"
name="$1"
while test -L "$name"; do
if ! test -e "$name"; then
echo $name: file not found > /dev/stderr
return 1
fi
if newname="`readlink $name`"; then
name="$newname"
else
echo "$(dirname $name)/$(basename $name)"
fi
done
echo $name
}
canonicalpath(){
......
......@@ -7,7 +7,19 @@ canonicalname(){
echo Usage: canonicalname path > /dev/stderr
return 1
fi
readlink $1 || echo "$(dirname $1)/$(basename $1)"
name="$1"
while test -L "$name"; do
if ! test -e "$name"; then
echo $name: file not found > /dev/stderr
return 1
fi
if newname="`readlink $name`"; then
name="$newname"
else
echo "$(dirname $name)/$(basename $name)"
fi
done
echo $name
}
canonicalpath(){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment