mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-03 10:21:46 +02:00
Code Releases Activity

39333: include name of command used to gain priviliges in context for command and gain-priviliges styles

Browse source
This commit is contained in:
Oliver Kiddle 2016-09-16 00:05:10 +02:00
parent fbafc5b509
commit b870ff85a0
5 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
2016-09-15 Oliver Kiddle <opk@zsh.org>
* 39333: Completion/Base/Utility/_call_program,
Doc/Zsh/compsys.yo, Completion/Solaris/Command/_pfexec,
Completion/Unix/Command/_sudo: include name of command used to
gain priviliges in context for command and gain-priviliges styles
* 39332: Doc/Zsh/cond.yo, Src/cond.c, Src/params.c, Src/parse.c,
Completion/Zsh/Context/_condition, Test/C02cond.ztst: support
ksh's [[ -v varname ]] condition for checking if variables are set

9
Completion/Base/Utility/_call_program
View file

@ -1,12 +1,15 @@
#autoload +X
local tmp err_fd=-1
local curcontext="${curcontext}" tmp err_fd=-1
local -a prefix
if [[ "$1" = -p ]]; then
shift
zstyle -t ":completion:${curcontext}:${1}" gain-privileges &&
prefix=( $_comp_priv_prefix )
if (( $#_comp_priv_prefix )); then
curcontext="${curcontext%:*}/${${(@M)_comp_priv_prefix:#^*[^\\]=*}[1]}:"
zstyle -t ":completion:${curcontext}:${1}" gain-privileges &&
prefix=( $_comp_priv_prefix )
fi
fi
if (( ${debug_fd:--1} > 2 )) || [[ ! -t 2 ]]

2
Completion/Solaris/Command/_pfexec
View file

@ -25,7 +25,7 @@ _pfexec() {
_arguments \
'-P[privileges to acquire]:privspec:_privset' \
'(-):command name: _command_names -e' \
'*::arguments:{ _comp_priv_prefix=( $words[1] ${(kv)opt_args[-P]} ) ; _normal }'
'*::arguments:{ _comp_priv_prefix=( pfexec ${(kv)opt_args[-P]} ) ; _normal }'
}
_pfexec "$@"

5
Completion/Unix/Command/_sudo
View file

@ -2,7 +2,7 @@
setopt localoptions extended_glob
local environ e
local environ e cmd
local -a args
zstyle -a ":completion:${curcontext}:" environ environ
@ -39,6 +39,7 @@ args=(
if [[ $service = sudoedit ]] || (( $words[(i)-e] < $words[(i)^(*sudo|-[^-]*)] )) ; then
args=( -A "-*" $args '!(-V --version -h --help)-e' '*:file:_files' )
else
cmd="$words[1]"
args+=(
'(-e --edit 1 *)'{-e,--edit}'[edit files instead of running a command]' \
'(-s --shell)'{-s,--shell}'[run shell as the target user; a command may also be specified]' \
@ -48,7 +49,7 @@ else
'(-H --set-home -i --login -s --shell -e --edit)'{-H,--set-home}"[set HOME variable to target user's home dir]" \
'(-P --preserve-groups -i -login -s --shell -e --edit)'{-P,--preserve-groups}"[preserve group vector instead of setting to target's]" \
'(-)1:command: _command_names -e'
'*::arguments:{ _comp_priv_prefix=( $words[1] -n ${(kv)opt_args[(I)(-[ugHEP]|--(user|group|set-home|preserve-env|preserve-groups))]} ) ; _normal }'
'*::arguments:{ _comp_priv_prefix=( $cmd -n ${(kv)opt_args[(I)(-[ugHEP]|--(user|group|set-home|preserve-env|preserve-groups))]} ) ; _normal }'
)
fi

4
Doc/Zsh/compsys.yo
View file

@ -4191,7 +4191,9 @@ output is influenced by the permissions it is run with. If the
tt(gain-privileges) style is set to true, tt(_call_program) will make
use of commands such as tt(sudo), if present on the command-line, to
match the permissions to whatever the final command is likely to run
under.
under. When looking up the tt(gain-privileges) and tt(command) styles,
the command component of the zstyle context will end with a slash
(`tt(/)') followed by the command that would be used to gain privileges.
)
findex(_combination)
item(tt(_combination) [ tt(-s) var(pattern) ] var(tag) var(style) var(spec) ... var(field) var(opts) ...)(