JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

if $HOME is / or empty, bash-style tilde replacement yielded funny results

Browse Source
This commit is contained in:
tg
2008-05-16 22:19:11 +00:00
parent 6be5205b36
commit 8cf7c94908
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dot.mkshrc
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/dot.mkshrc,v 1.34 2008/05/15 15:24:09 tg Exp $ # $MirOS: src/bin/mksh/dot.mkshrc,v 1.35 2008/05/16 22:19:11 tg Exp $
#- #-
# ~/.mkshrc: mksh initialisation file for interactive shells # ~/.mkshrc: mksh initialisation file for interactive shells
@ -13,7 +13,7 @@ function precmd {
PS1='$(precmd)${USER:=$(ulimit -c 0;id -un 2>&- || print \?)}@${HOSTNAME%%.*}:$( PS1='$(precmd)${USER:=$(ulimit -c 0;id -un 2>&- || print \?)}@${HOSTNAME%%.*}:$(
typeset pfx=~ wd=${PWD:-?} typeset pfx=~ wd=${PWD:-?}
typeset -i n=${COLUMNS:-80}/3; (( n = n < 7 ? 7 : n )) typeset -i n=${COLUMNS:-80}/3; (( n = n < 7 ? 7 : n ))
wd=${wd/#$pfx/~} [[ $pfx = ?(/) ]] || wd=${wd/#$pfx/~}
pfx=; while (( (${#pfx} + ${#wd}) > n )); do pfx=; while (( (${#pfx} + ${#wd}) > n )); do
if [[ $wd = */* ]]; then if [[ $wd = */* ]]; then
pfx=.../ pfx=.../
@ -46,7 +46,8 @@ DIRSTACKBASE=$(readlink -nf ~/. 2>&- || print -nr -- "$HOME")
set -A DIRSTACK set -A DIRSTACK
function chpwd { function chpwd {
DIRSTACK[0]=$(readlink -nf . 2>&- || print -r -- "$PWD") DIRSTACK[0]=$(readlink -nf . 2>&- || print -r -- "$PWD")
DIRSTACK[0]=${DIRSTACK[0]/#$DIRSTACKBASE/~} [[ $DIRSTACKBASE = ?(/) ]] || \
DIRSTACK[0]=${DIRSTACK[0]/#$DIRSTACKBASE/~}
: :
} }
chpwd . chpwd .