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

32471: handle BSD process management in pgrep completion

Browse source
This commit is contained in:
Kosuke Asami 2014-03-12 02:04:07 +09:00 committed by Peter Stephenson
parent de68b6bbf1
commit d91732acba
2 changed files with 51 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2014-03-13 Peter Stephenson <p.w.stephenson@ntlworld.com> 2014-03-13 Peter Stephenson <p.w.stephenson@ntlworld.com>
* Kosuke Asami: 32471: Completion/Unix/Command/_pgrep: handle
BSD process options.
* Kosuke Asami: 32472: Completion/Unix/Command/_pgrep: new options. * Kosuke Asami: 32472: Completion/Unix/Command/_pgrep: new options.
2014-03-13 Peter Stephenson <p.stephenson@samsung.com> 2014-03-13 Peter Stephenson <p.stephenson@samsung.com>

54
Completion/Unix/Command/_pgrep
View file

@ -8,7 +8,7 @@ arguments=('-P[parent process id]:parent process id:->ppid'
'-F[match only in process in pidfile]:files:_files' '-F[match only in process in pidfile]:files:_files'
'-g[match only in process group ids]:group:->pgid' '-g[match only in process group ids]:group:->pgid'
'-G[match only real group id]:group:_groups' '-G[match only real group id]:group:_groups'
'-j[match only in processes inside jails]' '-j[match only in processes inside jails]:jail id:->jid'
'-M[extract the name list from the specified core]:files:_files' '-M[extract the name list from the specified core]:files:_files'
'-N[extract the name list from the specified system]:files:_files' '-N[extract the name list from the specified system]:files:_files'
'-s[match only session id]:session id:->sid' '-s[match only session id]:session id:->sid'
@ -73,21 +73,43 @@ case $state in
;; ;;
(sid) (sid)
if [[ $OSTYPE == openbsd* ]]; then
break
fi
compset -P '*,' compset -P '*,'
local -a used sid local -a used sid
used=(${(s:,:)IPREFIX}) used=(${(s:,:)IPREFIX})
sid=(${(uon)$(ps -A o sid=)}) if [[ $OSTYPE == freebsd* ]]; then
sid=(${(uon)$(ps -ax -o sid=)})
else
sid=(${(uon)$(ps -A o sid=)})
fi
_wanted sid expl 'session id' compadd -S ',' -q -F used $sid _wanted sid expl 'session id' compadd -S ',' -q -F used $sid
;; ;;
(jid)
compset -P '*,'
local -a used jid
used=(${(s:,:)IPREFIX})
jid=(${(uon)$(ps -ax -o jid=)})
_wanted jid expl 'jail id' compadd -S ',' -q -F used $jid
;;
(ppid) (ppid)
compset -P '*,' compset -P '*,'
local -a used ppid local -a used ppid
used=(${(s:,:)IPREFIX}) used=(${(s:,:)IPREFIX})
ppid=(${(uon)$(ps -A o ppid=)}) if [[ $OSTYPE == (freebsd|openbsd|darwin)* ]]; then
ppid=(${(uon)$(ps -ax -o ppid=)})
else
ppid=(${(uon)$(ps -A o ppid=)})
fi
_wanted ppid expl 'parent process id' compadd -S ',' -q -F used $ppid _wanted ppid expl 'parent process id' compadd -S ',' -q -F used $ppid
;; ;;
@ -97,7 +119,11 @@ case $state in
local -a used pgid local -a used pgid
used=(${(s:,:)IPREFIX}) used=(${(s:,:)IPREFIX})
pgid=(${(uon)$(ps -A o pgid=)}) if [[ $OSTYPE == (freebsd|openbsd|darwin)* ]]; then
pgid=(${(uon)$(ps -ax -o pgid=)})
else
pgid=(${(uon)$(ps -A o pgid=)})
fi
_wanted pgid expl 'process group id' compadd -S ',' -q -F used $pgid _wanted pgid expl 'process group id' compadd -S ',' -q -F used $pgid
;; ;;
@ -108,11 +134,27 @@ case $state in
then then
ispat="" ispat=""
fi fi
local command
if (( ${+opt_args[-f]} )) if (( ${+opt_args[-f]} ))
then then
_wanted pname expl $ispat'process command line' compadd ${(u)${(f)"$(ps -A o cmd=)"}} if [[ "$OSTYPE" == freebsd* ]] && (( ${+opt_args[-S]} )); then
command="$(ps -axH -o command=)"
elif [[ "$OSTYPE" == (freebsd|openbsd|darwin)* ]]; then
command="$(ps -ax -o command=)"
else
command="$(ps -A o cmd=)"
fi
_wanted pname expl $ispat'process command line' compadd ${(u)${(f)${command}}}
else else
_wanted pname expl $ispat'process name' compadd ${(u)${(f)"$(ps -A co cmd=)"}} if [[ "$OSTYPE" == freebsd* ]] && (( ${+opt_args[-S]} )); then
command="$(ps -axcH -o command=)"
elif [[ "$OSTYPE" == (freebsd|openbsd|darwin)* ]]; then
command="$(ps -axc -o command=)"
else
command="$(ps -A co cmd=)"
fi
_wanted pname expl $ispat'process name' compadd ${(u)${(f)${command}}}
fi fi
;; ;;