diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Core/compinit | 22 |
2 files changed, 22 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 068779055..bbe485c06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-06-23 Sven Wischnowsky <wischnow@zsh.org> + + * 12041: Completion/Core/compinit: even more compiinit stuff, + change prompt, search for insecure parent dirs + 2000-06-22 Peter Stephenson <pws@pwstephenson.fsnet.co.uk> * 12040: Src/builtin.c: typeset -r on existing parameter set diff --git a/Completion/Core/compinit b/Completion/Core/compinit index e4747a8b3..ed1b6b1fb 100644 --- a/Completion/Core/compinit +++ b/Completion/Core/compinit @@ -347,8 +347,20 @@ if [[ -n "$_i_check" ]]; then if [[ "$_i_fail" != use ]]; then typeset _i_q - _i_wdirs=( ${^fpath}(Nf:g+w:,f:o+w:,^u0u${EUID}) ) - _i_wfiles=( ${^~fpath:/.}/^([^_]*|*~)(N^u0u${EUID}) ) + # We search for: + # - world/group-writable directories in fpath not owned by root or the user + # - parent-directories of directories in fpath that are world/group-writable + # and not owned by root or the user (that would allow someone to put a + # digest file for one of the directories into the parent directory) + # - digest files for one of the directories in fpath not owned by root or + # the user + # - and for files in directories from fpath not owned by root or the user + # (including zwc files) + + _i_wdirs=( ${^fpath}(Nf:g+w:,f:o+w:,^u0u${EUID}) + ${^fpath}/..(Nf:g+w:,f:o+w:,^u0u${EUID}) + ${^fpath}.zwc^([^_]*|*~)(N^u0u${EUID}) ) + _i_wfiles=( ${^fpath}/^([^_]*|*~)(N^u0u${EUID}) ) case "${#_i_wdirs}:${#_i_wfiles}" in 0:0) _i_q= ;; @@ -359,7 +371,7 @@ if [[ -n "$_i_check" ]]; then if [[ -n "$_i_q" ]]; then if [[ "$_i_fail" = ask ]]; then - if ! read -q "?There are insecure $_i_q, continue [yn]? "; then + if ! read -q "?There are insecure $_i_q, continue [ny]? "; then unfunction compinit compdef unset _comp_dumpfile _comp_secure compprefuncs comppostfuncs \ _comps _patcomps _postpatcomps _compautos _lastcomp @@ -369,8 +381,8 @@ if [[ -n "$_i_check" ]]; then _i_wfiles=() _i_wdirs=() else - (( $#_i_wfiles )) && _i_files=( "${(@)_i_files:#(${(j:|:)_i_wfiles})}" ) - (( $#_i_wdirs )) && _i_files=( "${(@)_i_files:#(${(j:|:)_i_wdirs})/*}" ) + (( $#_i_wfiles )) && _i_files=( "${(@)_i_files:#(${(j:|:)_i_wfiles%.zwc})}" ) + (( $#_i_wdirs )) && _i_files=( "${(@)_i_files:#(${(j:|:)_i_wdirs%.zwc})/*}" ) fi fi _comp_secure=yes |