mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-11-27 15:01:00 +01:00
Code Releases Activity

38639: fix username completion after -, update options and get user shell with getent

Browse source
This commit is contained in:
Oliver Kiddle 2016-06-09 22:51:18 +02:00
parent 5e4db660b2
commit cf01ad96d4
2 changed files with 73 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2016-06-09 Oliver Kiddle <opk@zsh.org>
* 38639: Completion/Unix/Command/_su: fix username completion
after -, update options and get user shell with getent
2016-06-07 Daniel Shahaf <d.s@daniel.shahaf.name> 2016-06-07 Daniel Shahaf <d.s@daniel.shahaf.name>
* 38624: Completion/Unix/Command/_git: Optimize the last commit's * 38624: Completion/Unix/Command/_git: Optimize the last commit's

129
Completion/Unix/Command/_su
View file

@ -2,79 +2,86 @@
local -A opt_args local -A opt_args
local -a args context state line expl local -a args context state line expl
local shell=${words[(i)(-s|--shell=*)]} first='1:user name:_users' local first='(-)${norm}:user name:_users'
local usr=root integer norm=1 strip
local shell usr
if _pick_variant gnu="Free Software Foundation" unix --version; then (( $words[(i)-(l|-login)] < CURRENT )) || args=( '-[use a login shell]' )
args=( case $OSTYPE in
'(--command)-c[pass command to shell]:command string:->command' linux*)
'(-c)--command=-[pass command to shell]:command string:->command' args=( -S $args
'-f[pass -f to shell (csh)]' '(-c --command --session-command *)'{-c,--command=}'[pass command to shell]:command string:_cmdstring'
'(--login)-l[use a login shell]' "(-c --command *)--session-command=[pass command to shell and don't create a new session]:command string:_cmdstring"
'(-l)--login[use a login shell]' '(--fast -f)'{-f,--fast}'[pass -f to shell]'
'(-p --preserve-environment)-m[do not reset environment]' '(-l --login -m -p --preserve-environment)'{-l,--login}'[use a login shell]'
'(-m --preserve-environment)-p[do not reset environment]' '(-l --login -m -p --preserve-environment)'{-m,-p,--preserve-environment}"[don't reset environment]"
'(-m -p)--preserve-environment[do not reset environment]' '(-s --shell)'{-s,--shell=}'[run the specified shell]:shell:->shells'
'(--shell)-s[run the specified shell]:shell:->shell' '(-)--help[display help information]'
'(-s)--shell=-[run the specified shell]:shell:->shell' '(-)--version[display version information]'
) )
else (( EUID )) || args+=(
args=( '(-g --group)'{-g,--group=}'[specify primary group]:group:_groups'
'-l[use a login shell]' \*{-G,--supp-group=}'[specify supplemental group]:group:_groups'
'-s[run the specified shell]:shell:->shell' )
) first="(--help --version)${first#???}"
case $OSTYPE in ;;
freebsd*) *bsd*|dragonfly*)
args=( args+=(
'-c[use settings from specified login class]:class' '-c[use settings from specified login class]:class'
'-f[if the invoked shell is csh, prevent it from reading .cshrc]' '-f[if the invoked shell is csh, prevent it from reading .cshrc]'
'-l[use a login shell]' '(-m)-l[use a login shell]'
'-m[do not reset environment]' "(-l)-m[don't reset environment]"
'-s[set the MAC label]' )
;|
freebsd*) args+=( '-s[set the MAC label]' ) ;;
openbsd*)
args+=(
'(-K)-a[specify authentication type]:authentication type'
'(-a)-K[shorthand for -a passwd]'
'-s[run the specified shell]:shell:->shells'
'-L[loop until login succeeds]'
) )
;; ;;
*) args+=( '-c[pass command to shell]:command string:->command' ) ;; netbsd*)
esac args+=(
'-d[use a login shell but retain current directory]'
"-K[don't use Kerberos]"
)
;;
esac
if (( $words[(i)-] < CURRENT )); then
args=( ${args:#*-(-login|l|)\[*} '1:-' )
norm=2
fi fi
if [[ $#words -ge 2 && $words[2] != -* && CURRENT -ne 2 ]]; then _arguments $args ${(e)first} "*:shell arguments:= ->rest" && return
usr=$words[2]
first=
fi
[[ $words[shell] == -s ]] && ((shell++)) usr=${line[norm]/--/root}
if (( $#opt_args[(i)-(s|-shell)] )); then
if [[ CURRENT -ne shell && -n ${words[shell]} ]]; then shell=${(v)opt_args[(i)-(s|-shell)]}
shell=${words[shell]#*=} elif (( ${+commands[getent]} )); then
shell="${$(_call_program shells getent passwd $usr)##*:}"
else else
shell="${${(M@)${(@f)$(</etc/passwd)}:#$usr*}##*:}" shell="${${(M@)${(@f)$(</etc/passwd)}:#$usr*}##*:}"
fi fi
[[ -z $first ]] && compset -n 2
_arguments : $args[@] $first "*:${shell:t} arguments:->rest" && return
case $state in case $state in
(command) shells)
compset -q _wanted -C $context shells expl shell compadd ${(f)^"$(</etc/shells)"}(N)
_normal return
return ;;
;; rest)
(shell) if [[ -z $shell || $shell = */(nologin|false) ]]; then
_wanted -C $context shells expl shell compadd ${(f)^"$(</etc/shells)"}(N) _message "-s option required, $usr has no shell"
return else
;; (( strip = $#words - $#line + norm ))
(rest) (( CURRENT -= strip - 1 ))
if [[ -z $shell || $shell = */(nologin|false) ]]; then words[2,strip]=()
_arguments "-s[run the specified shell, $usr has no shell]" || _dispatch ${service}:${context} $shell $shell:t -default-
_message "-s option required, $usr has no shell" return
compstate[insert]= fi
else ;;
# Something wrong here: doubles the file listing sometimes
_dispatch ${service}:${context} $shell $shell:t -default-
return
fi
;;
esac esac
return 1 return 1