Customization/powerlevel10k
1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-12 08:10:07 +00:00
Code Releases Activity

defend against global IFS leaks from other code; for #146

Browse source
This commit is contained in:
romkatv 2019-08-02 07:07:23 +02:00
parent 99f631abb8
commit 0f00e5e9e2
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
internal/p10k.zsh
View file

@ -928,7 +928,7 @@ prompt_disk_usage() {
function _p9k_read_file() { function _p9k_read_file() {
_p9k_ret='' _p9k_ret=''
[[ -n $1 ]] && read -r _p9k_ret <$1 [[ -n $1 ]] && IFS='' read -r _p9k_ret <$1
[[ -n $_p9k_ret ]] [[ -n $_p9k_ret ]]
} }
@ -1674,9 +1674,11 @@ prompt_node_version() {
function _p9k_nvm_ls_default() { function _p9k_nvm_ls_default() {
local v=default local v=default
local -a seen=($v) local -a seen=($v)
local target while [[ -r $NVM_DIR/alias/$v ]]; do
while [[ -r $NVM_DIR/alias/$v ]] && read target <$NVM_DIR/alias/$v; do local target=
[[ -n $target && ${seen[(I)$target]} == 0 ]] || return IFS='' read -r target <$NVM_DIR/alias/$v
[[ -z $target ]] && break
(( $seen[(I)$target] )) && return
seen+=$target seen+=$target
v=$target v=$target
done done
@ -1886,9 +1888,8 @@ prompt_ram() {
function _p9k_read_rbenv_version_file() { function _p9k_read_rbenv_version_file() {
[[ -r $1 ]] || return [[ -r $1 ]] || return
local content local rest
read -r content <$1 2>/dev/null read _p9k_ret rest <$1 2>/dev/null
_p9k_ret="${${(A)=content}[1]}"
[[ -n $_p9k_ret ]] [[ -n $_p9k_ret ]]
} }
@ -2717,7 +2718,7 @@ prompt_virtualenv() {
function _p9k_read_pyenv_version_file() { function _p9k_read_pyenv_version_file() {
[[ -r $1 ]] || return [[ -r $1 ]] || return
local content local content
read -rd $'\0' content <$1 2>/dev/null IFS='' read -rd $'\0' content <$1 2>/dev/null
_p9k_ret=${${(j.:.)${(@)${=content}#python-}:-system}} _p9k_ret=${${(j.:.)${(@)${=content}#python-}:-system}}
} }
@ -3025,6 +3026,8 @@ function _p9k_build_segment() {
} }
function _p9k_set_prompt() { function _p9k_set_prompt() {
local ifs=$IFS
IFS=$' \t\n\0'
PROMPT=$_p9k_prompt_prefix_left PROMPT=$_p9k_prompt_prefix_left
RPROMPT= RPROMPT=
@ -3103,6 +3106,7 @@ function _p9k_set_prompt() {
_p9k_prompt_side= _p9k_prompt_side=
(( $#_p9k_cache < _POWERLEVEL9K_MAX_CACHE_SIZE )) || _p9k_cache=() (( $#_p9k_cache < _POWERLEVEL9K_MAX_CACHE_SIZE )) || _p9k_cache=()
IFS=$ifs
} }
function _p9k_update_prompt() { function _p9k_update_prompt() {
@ -3352,7 +3356,7 @@ _p9k_init_async_pump() {
cmd="$setsid zsh -dfxc ${(q)cmd} &!" cmd="$setsid zsh -dfxc ${(q)cmd} &!"
zsh -dfmxc $cmd </dev/null >&$_p9k_async_pump_fd 2>/dev/null &! zsh -dfmxc $cmd </dev/null >&$_p9k_async_pump_fd 2>/dev/null &!
read -t 5 -r -u $_p9k_async_pump_fd _p9k_async_pump_pid && (( _p9k_async_pump_pid )) IFS='' read -t 5 -r -u $_p9k_async_pump_fd _p9k_async_pump_pid && (( _p9k_async_pump_pid ))
_p9k_async_pump_subshell=$ZSH_SUBSHELL _p9k_async_pump_subshell=$ZSH_SUBSHELL
add-zsh-hook zshexit _p9k_kill_async_pump add-zsh-hook zshexit _p9k_kill_async_pump