Localize IFS tighter in _mplayer().

This commit is contained in:
Ville Skyttä 2010-09-28 19:11:54 +03:00
parent 5a254604e7
commit 1a2de64f80

View File

@ -11,7 +11,7 @@ _mplayer_options_list()
_mplayer() _mplayer()
{ {
local cmd cur prev skinsdir IFS=$' \t\n' i j k=0 local cmd cur prev skinsdir i j k=0
COMPREPLY=() COMPREPLY=()
cmd=${COMP_WORDS[0]} cmd=${COMP_WORDS[0]}
@ -37,7 +37,7 @@ _mplayer()
else else
_filedir ttf _filedir ttf
fi fi
IFS=$'\n' local IFS=$'\n'
COMPREPLY=( "${COMPREPLY[@]}" COMPREPLY=( "${COMPREPLY[@]}"
$( compgen -W '$( fc-list 2>/dev/null )' -- "$cur" ) ) $( compgen -W '$( fc-list 2>/dev/null )' -- "$cur" ) )
return 0 return 0
@ -48,7 +48,7 @@ _mplayer()
;; ;;
-vobsub) -vobsub)
_filedir '@(idx|ifo|sub)' _filedir '@(idx|ifo|sub)'
IFS=$'\t\n' local IFS=$'\t\n'
COMPREPLY=( $( for i in "${COMPREPLY[@]}"; do COMPREPLY=( $( for i in "${COMPREPLY[@]}"; do
if [[ -f $i && -r $i ]]; then if [[ -f $i && -r $i ]]; then
printf '%s\n' ${i%.*} printf '%s\n' ${i%.*}
@ -56,7 +56,6 @@ _mplayer()
printf '%s\n' $i printf '%s\n' $i
fi fi
done ) ) done ) )
IFS=$' \t\n'
return 0 return 0
;; ;;
-ifo) -ifo)
@ -76,7 +75,7 @@ _mplayer()
skinsdir=/usr/share/mplayer/Skin skinsdir=/usr/share/mplayer/Skin
fi fi
IFS=$'\t\n' local IFS=$'\t\n'
for i in ~/.mplayer/Skin $skinsdir; do for i in ~/.mplayer/Skin $skinsdir; do
if [[ -d $i && -r $i ]]; then if [[ -d $i && -r $i ]]; then
for j in $( compgen -d $i/$cur ); do for j in $( compgen -d $i/$cur ); do
@ -85,7 +84,6 @@ _mplayer()
done done
fi fi
done done
IFS=$' \t\n'
return 0 return 0
;; ;;
-cdrom-device) -cdrom-device)