d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Correct criterion for using CDPATH in cd.

Browse Source 
CDPATH should be ignored not only for pathnames starting with '/' but also
for pathnames whose first component is '.' or '..'.

The man page already describes this behaviour.
This commit is contained in:
Jilles Tjoelker 2011-05-27 20:01:46 +00:00
parent 7e2548ae0a
commit 64fa41f3e1
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/sh/cd.c
View File

@ -123,7 +123,10 @@ cdcmd(int argc, char **argv)
else
dest = ".";
}
if (*dest == '/' || (path = bltinlookup("CDPATH", 1)) == NULL)
if (dest[0] == '/' ||
(dest[0] == '.' && (dest[1] == '/' || dest[1] == '\0')) ||
(dest[0] == '.' && dest[1] == '.' && (dest[2] == '/' || dest[2] == '\0')) ||
(path = bltinlookup("CDPATH", 1)) == NULL)
path = nullstr;
while ((p = padvance(&path, dest)) != NULL) {
if (stat(p, &statb) >= 0 && S_ISDIR(statb.st_mode)) {

10
tools/regression/bin/sh/builtins/cd6.0 Normal file
View File

@ -0,0 +1,10 @@
# $FreeBSD$
set -e
cd -P /bin
d=$PWD
CDPATH=/:
cd -P .
[ "$d" = "$PWD" ]
cd -P ./
[ "$d" = "$PWD" ]

15
tools/regression/bin/sh/builtins/cd7.0 Normal file
View File

@ -0,0 +1,15 @@
# $FreeBSD$
set -e
cd /usr/bin
[ "$PWD" = /usr/bin ]
CDPATH=/:
cd .
[ "$PWD" = /usr/bin ]
cd ./
[ "$PWD" = /usr/bin ]
cd ..
[ "$PWD" = /usr ]
cd /usr/bin
cd ../
[ "$PWD" = /usr ]