source: freewrt/package/mksh/patches/patch-dot_mkshrc@ ec960dd

$FreeWRT$

        • bring mksh to the level of 2007/09/26
        • FreeWRT patches:
          – no hostname(1)
          – ls has no -o
          – yofuh doesn’t like $? in $PS1

--- mksh.orig/dot.mkshrc        2007-09-03 09:25:28.000000000 +0000
+++ mksh/dot.mkshrc     2007-09-26 17:52:20.000000000 +0000
@@ -1,8 +1,41 @@
-: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)}
+# $MirOS: src/bin/mksh/dot.mkshrc,v 1.22 2007/09/25 22:36:36 tg Stab $
+#-
+# Copyright (c) 2007
+#      Thorsten Glaser <tg@mirbsd.de>
+#
+# Provided that these terms and disclaimer and all copyright notices
+# are retained or reproduced in an accompanying document, permission
+# is granted to deal in this work without restriction, including un-
+# limited rights to use, publicly perform, distribute, sell, modify,
+# merge, give away, or sublicence.
+#
+# Advertising materials mentioning features or use of this work must
+# display the following acknowledgement:
+#      This product includes material provided by Thorsten Glaser.
+#
+# This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to
+# the utmost extent permitted by applicable law, neither express nor
+# implied; without malicious intent or gross negligence. In no event
+# may a licensor, author or contributor be held liable for indirect,
+# direct, other damage, loss, or other issues arising in any way out
+# of dealing in the work, even if advised of the possibility of such
+# damage or existence of a defect, except proven that it results out
+# of said person's immediate fault when using the work as intended.
+#-
+# sample mksh initialisation file for interactive shells
+
+: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(</proc/sys/kernel/hostname)}
 [[ $HOSTNAME = @(localhost|*([  ])) ]] && HOSTNAME=$(ulimit -c 0;hostname 2>&-)
 : ${HOSTNAME:=nil}; PS1='#'; [[ "$(ulimit -c 0; id -u 2>&-)" -eq 0 ]] || PS1='$'
-PS1='$(((e = $?)) && print $e\|)${USER:=$(ulimit -c 0; id -un 2>&- || \
-    print nobody)}@${HOSTNAME%%.*}:$(typeset pfx=~ wd=${PWD:-?}
+function precmd {
+       typeset -i10 e=$?
+
+# enable this back if you want the errorlevel in your prompt
+# this is default in upstream mksh
+#      (( e )) && print -n -- "$e|"
+}
+PS1='$(precmd)${USER:=$(ulimit -c 0;id -un 2>&- || print \?)}@${HOSTNAME%%.*}:$(
+       typeset pfx=~ wd=${PWD:-?}
        typeset -i n=${COLUMNS:-80}/3; let n="n < 7 ? 7 : n"
        [[ ${wd#$pfx} = $wd || $pfx = ?(/) ]] || wd=\~${wd#$pfx}
        pfx=; while (( (${#pfx} + ${#wd}) > n )); do
@@ -18,7 +51,7 @@ export EDITOR HOSTNAME LESSHISTFILE=- MK
 alias l='/bin/ls -F'
 alias la='l -a'
 alias ll='l -l'
-alias lo='la -lo'
+alias lo='la -l'
 alias which='whence -p'
 whence -p rot13 >&- || alias rot13='tr [A-Za-z] [N-ZA-Mn-za-m]'
 whence -p hd >&- || function hd {
@@ -26,6 +59,162 @@ whence -p hd >&- || function hd {
            -e '"  |" "%_p"' -e '"|\n"' "$@"
 }
 
+# Berkeley C shell compatible dirs, popd, and pushd functions
+# Z shell compatible chpwd() hook, used to update DIRSTACK[0]
+DIRSTACKBASE=$(readlink -nf ~/. 2>&- || print -nr -- "$HOME")
+typeset -r DIRSTACKBASE
+set -A DIRSTACK
+function chpwd {
+       DIRSTACK[0]=$(readlink -nf . 2>&- || print -nr -- "$PWD")
+       [[ ${DIRSTACK[0]#$DIRSTACKBASE} = ${DIRSTACK[0]} ]] || \
+           DIRSTACK[0]=\~${DIRSTACK[0]#$DIRSTACKBASE}
+       :
+}
+chpwd .
+function cd {
+       builtin cd "$@"
+       chpwd "$@"
+}
+function cd_csh {
+       typeset d t=$1
+
+       [[ $t = ~* ]] && t=$DIRSTACKBASE${t#~}
+       if ! d=$(builtin cd "$t" 2>&1); then
+               print -u2 "${1}: ${d##*$t - }."
+               return 1
+       fi
+       cd "$t"
+}
+function dirs {
+       typeset d
+       typeset -i isnoglob=0 fl=0 fv=0 fn=0 cpos=0
+
+       [[ $(set +o) == *-o\ noglob* ]] && isnoglob=1
+       set -o noglob
+       while getopts ":lvn" d; do
+               case $d {
+               (l)     fl=1 ;;
+               (v)     fv=1 ;;
+               (n)     fn=1 ;;
+               (*)     print -u2 'Usage: dirs [-lvn].'
+                       return 1 ;;
+               }
+       done
+       shift $((OPTIND - 1))
+       if (( $# > 0 )); then
+               print -u2 'Usage: dirs [-lvn].'
+               return 1
+       fi
+       if (( fv )); then
+               fv=0
+               while (( fv < ${#DIRSTACK[*]} )); do
+                       d=${DIRSTACK[fv]}
+                       [[ $fl$d = 1~* ]] && d=$DIRSTACKBASE${d#~}
+                       print -r -- "$fv        $d"
+                       let fv++
+               done
+       else
+               fv=0
+               while (( fv < ${#DIRSTACK[*]} )); do
+                       d=${DIRSTACK[fv]}
+                       [[ $fl$d = 1~* ]] && d=$DIRSTACKBASE${d#~}
+                       if (( fn && (cpos+=${#d}+1) >= 79 && ${#d} < 80 )); then
+                               print
+                               (( cpos = ${#d} + 1 ))
+                       fi
+                       print -nr -- "$d "
+                       let fv++
+               done
+               print
+       fi
+       (( isnoglob )) || set +o noglob
+       return 0
+}
+function popd {
+       typeset d fa
+       typeset -i isnoglob=0 n=1
+
+       [[ $(set +o) == *-o\ noglob* ]] && isnoglob=1
+       set -o noglob
+       while getopts ":0123456789lvn" d; do
+               case $d {
+               (l|v|n) fa="$fa -$d" ;;
+               (+*)    n=2
+                       break ;;
+               (*)     print -u2 'Usage: popd [-lvn] [+<n>].'
+                       return 1 ;;
+               }
+       done
+       shift $((OPTIND - n))
+       n=0
+       if (( $# > 1 )); then
+               print -u2 popd: Too many arguments.
+               return 1
+       elif [[ $1 = ++([0-9]) && $1 != +0 ]]; then
+               if (( (n = ${1#+}) >= ${#DIRSTACK[*]} )); then
+                       print -u2 popd: Directory stack not that deep.
+                       return 1
+               fi
+       elif [[ -n $1 ]]; then
+               print -u2 popd: Bad directory.
+               return 1
+       fi
+       if (( ${#DIRSTACK[*]} < 2 )); then
+               print -u2 popd: Directory stack empty.
+               return 1
+       fi
+       unset DIRSTACK[n]
+       set -A DIRSTACK -- "${DIRSTACK[@]}"
+       cd_csh "${DIRSTACK[0]}" || return 1
+       (( isnoglob )) || set +o noglob
+       dirs $fa
+}
+function pushd {
+       typeset d fa
+       typeset -i isnoglob=0 n=1
+
+       [[ $(set +o) == *-o\ noglob* ]] && isnoglob=1
+       set -o noglob
+       while getopts ":0123456789lvn" d; do
+               case $d {
+               (l|v|n) fa="$fa -$d" ;;
+               (+*)    n=2
+                       break ;;
+               (*)     print -u2 'Usage: pushd [-lvn] [<dir>|+<n>].'
+                       return 1 ;;
+               }
+       done
+       shift $((OPTIND - n))
+       if (( $# == 0 )); then
+               if (( ${#DIRSTACK[*]} < 2 )); then
+                       print -u2 pushd: No other directory.
+                       return 1
+               fi
+               d=${DIRSTACK[1]}
+               DIRSTACK[1]=${DIRSTACK[0]}
+               cd_csh "$d" || return 1
+       elif (( $# > 1 )); then
+               print -u2 pushd: Too many arguments.
+               return 1
+       elif [[ $1 = ++([0-9]) && $1 != +0 ]]; then
+               if (( (n = ${1#+}) >= ${#DIRSTACK[*]} )); then
+                       print -u2 pushd: Directory stack not that deep.
+                       return 1
+               fi
+               while (( n-- )); do
+                       d=${DIRSTACK[0]}
+                       unset DIRSTACK[0]
+                       set -A DIRSTACK -- "${DIRSTACK[@]}" "$d"
+               done
+               cd_csh "${DIRSTACK[0]}" || return 1
+       else
+               set -A DIRSTACK -- placeholder "${DIRSTACK[@]}"
+               cd_csh "$1" || return 1
+       fi
+       (( isnoglob )) || set +o noglob
+       dirs $fa
+}
+
 # strip comments (and leading/trailing whitespace if IFS is set) from
 # any file(s) given as argument, or stdin if none, and spew to stdout
 function Lstripcom {
@@ -35,6 +224,4 @@ function Lstripcom {
        done; }
 }
 
-# place customisations between this line and the “: RCSID” line below
-
-: $MirOS: src/bin/mksh/dot.mkshrc,v 1.19 2007/09/03 09:25:05 tg Rel $
+: place customsations above this line!