diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-06-22 11:09:17 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-06-22 11:09:17 +0000 |
| commit | 6218b6dc192b1bbfdff8116a7d3856b90b863f90 (patch) | |
| tree | 91d3f8b3844bfc018899dffa12057a7375277123 | |
| parent | 37b54774378da19184f820411ea94b61576d6fa5 (diff) | |
| download | zsh-6218b6dc192b1bbfdff8116a7d3856b90b863f90.tar.gz zsh-6218b6dc192b1bbfdff8116a7d3856b90b863f90.tar.xz zsh-6218b6dc192b1bbfdff8116a7d3856b90b863f90.zip | |
followup to compinit-security patch (12033)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Core/compinit | 29 |
2 files changed, 21 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 59cb0b23a..d99e84aa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-06-22 Sven Wischnowsky <wischnow@zsh.org> + * 12033: Completion/Core/compinit: followup to compinit-security + patch + * 12029: Completion/Builtins/_arrays, Completion/Builtins/_zstyle, Completion/Commands/_bash_completions, Completion/Commands/_history_complete_word, diff --git a/Completion/Core/compinit b/Completion/Core/compinit index 01717425c..e4747a8b3 100644 --- a/Completion/Core/compinit +++ b/Completion/Core/compinit @@ -348,7 +348,7 @@ if [[ -n "$_i_check" ]]; then typeset _i_q _i_wdirs=( ${^fpath}(Nf:g+w:,f:o+w:,^u0u${EUID}) ) - _i_wfiles=( ${^~fpath:/.}/^([^_]*|*~|*.zwc)(N^u0u${EUID}) ) + _i_wfiles=( ${^~fpath:/.}/^([^_]*|*~)(N^u0u${EUID}) ) case "${#_i_wdirs}:${#_i_wfiles}" in 0:0) _i_q= ;; @@ -358,16 +358,20 @@ if [[ -n "$_i_check" ]]; then esac if [[ -n "$_i_q" ]]; then - if [[ "$_i_fail" = ask ]] && - ! read -q "?There are insecure $_i_q, continue [yn]? "; then - unfunction compinit compdef - unset _comp_dumpfile _comp_secure compprefuncs comppostfuncs \ - _comps _patcomps _postpatcomps _compautos _lastcomp - - return 1 + if [[ "$_i_fail" = ask ]]; then + if ! read -q "?There are insecure $_i_q, continue [yn]? "; then + unfunction compinit compdef + unset _comp_dumpfile _comp_secure compprefuncs comppostfuncs \ + _comps _patcomps _postpatcomps _compautos _lastcomp + + return 1 + fi + _i_wfiles=() + _i_wdirs=() + else + (( $#_i_wfiles )) && _i_files=( "${(@)_i_files:#(${(j:|:)_i_wfiles})}" ) + (( $#_i_wdirs )) && _i_files=( "${(@)_i_files:#(${(j:|:)_i_wdirs})/*}" ) fi - (( $#_i_wfiles )) && _i_files=( "${(@)_i_files:#(${(j:|:)_i_wfiles})}" ) - (( $#_i_wdirs )) && _i_files=( "${(@)_i_files:#(${(j:|:)_i_wdirs})/*}" ) fi _comp_secure=yes fi @@ -393,12 +397,15 @@ if [[ -f "$_comp_dumpfile" ]]; then fi fi if [[ -z "$_i_done" ]]; then + typeset -A _i_test + for _i_dir in $fpath; do [[ $_i_dir = . ]] && continue (( $_i_wdirs[(I)$_i_dir] )) && continue for _i_file in $_i_dir/^([^_]*|*~|*.zwc)(N); do _i_name="${_i_file:t}" - (( $+functions[$_i_name] + $_i_wfiles[(I)$_i_file] )) && continue + (( $+_i_test[$_i_name] + $_i_wfiles[(I)$_i_file] )) && continue + _i_test[$_i_name]=yes read -rA _i_line < $_i_file _i_tag=$_i_line[1] shift _i_line |