mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-02-24 23:14:14 +00:00
6109f54a5e
'cd' with no argument is supposed to go to your home directory, but
in this override function it produced an error due to an incorrect
use of $@ within another parameter substitution, preventing $@ from
expanding to zero words.
Ref.: https://groups.google.com/d/msgid/korn-shell/781ed34b-6860-5d47-dfe8-be21280a6b31%40inlv.org
src/cmd/ksh93/fun/dirs: _cd():
- Fix the bug by setting a positional parameter if needed,
then using a normal and correct "$@" expansion for \cd.
- While we're here, restore a historic comment about using
'command' to bypass aliases that exists in the listing of this
function in the official 1995 KornShell book (pp. 274-276).
Presumably, that comment was deleted when they decided to add the
obnoxious and broken default alias command='command ', whenever
that was. This branch got rid of that default alias in 61d9bca5.
112 lines
2.4 KiB
Text
Executable file
112 lines
2.4 KiB
Text
Executable file
#
|
|
# DIRECTORY MANIPULATION FUNCTIONS, REPLACES CD
|
|
#
|
|
# Uses global parameters _push_max _push_top _push_stack
|
|
integer _push_max=${CDSTACK-32} _push_top=${CDSTACK-32}
|
|
unalias cd
|
|
alias cd=_cd
|
|
# Display directory stack -- $HOME displayed as ~
|
|
function dirs
|
|
{
|
|
typeset dir="${PWD#$HOME/}"
|
|
case $dir in
|
|
$HOME)
|
|
dir=\~
|
|
;;
|
|
/*) ;;
|
|
*) dir=\~/$dir
|
|
esac
|
|
PS3=
|
|
select i in "$dir" "${_push_stack[@]}"
|
|
do :
|
|
done < /dev/null
|
|
}
|
|
|
|
# Change directory and put directory on front of stack
|
|
function _cd
|
|
{
|
|
typeset dir=
|
|
integer n=0 type=4
|
|
case $1 in
|
|
-|-1|2) # \cd -
|
|
n=_push_top type=1
|
|
;;
|
|
-[1-9]*([0-9])) # \cd -n
|
|
n=_push_top+${1#-}-1 type=2
|
|
;;
|
|
1) # keep present directory
|
|
print -r - "$PWD"
|
|
return
|
|
;;
|
|
[1-9]*([0-9])) # \cd n
|
|
n=_push_top+${1}-2 type=2
|
|
;;
|
|
*) if ((_push_top <= 0))
|
|
then type=3 n=_push_max
|
|
fi
|
|
esac
|
|
if ((type<3))
|
|
then if ((n >= _push_max+1))
|
|
then print -u2 cd: Directory stack not that deep.
|
|
return 1
|
|
else dir=${_push_stack[n]}
|
|
fi
|
|
fi
|
|
case $dir in
|
|
\~*) dir=$HOME${dir#\~}
|
|
esac
|
|
# If there are no arguments, use $dir if non-empty.
|
|
(($#)) || set -- ${dir:+"$dir"}
|
|
# \cd prevents alias substitution.
|
|
# You can use command cd with 12/28/93 and newer.
|
|
\cd "$@" >| /dev/null || return 1
|
|
dir=${OLDPWD#$HOME/}
|
|
case $TERM in
|
|
630)
|
|
print "\033[?${#PWD};2v$PWD\c"
|
|
;;
|
|
esac
|
|
case $dir in
|
|
$HOME)
|
|
dir=\~
|
|
;;
|
|
/*) ;;
|
|
*) dir=\~/$dir
|
|
esac
|
|
case $type in
|
|
1) # swap first two elements
|
|
_push_stack[_push_top]=$dir
|
|
;;
|
|
2|3) # put $dir on top and shift down by one until top
|
|
integer i=_push_top
|
|
for dir in "$dir" "${_push_stack[@]}"
|
|
do ((i > n)) && break
|
|
_push_stack[i]=$dir
|
|
i=i+1
|
|
done
|
|
;;
|
|
4) # push name
|
|
_push_stack[_push_top=_push_top-1]=$dir
|
|
;;
|
|
esac
|
|
print -r - "$PWD"
|
|
}
|
|
|
|
# Menu driven change directory command
|
|
function mcd
|
|
{
|
|
typeset dir="${PWD#$HOME/}"
|
|
case $dir in
|
|
$HOME)
|
|
dir=\~
|
|
;;
|
|
/*) ;;
|
|
*) dir=\~/$dir
|
|
esac
|
|
PS3='Select by number or enter a name: '
|
|
select dir in "$dir" "${_push_stack[@]}"
|
|
do if _cd $REPLY
|
|
then return
|
|
fi
|
|
done
|
|
}
|