diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Completion/Unix/Command/_pgrep | 36 |
2 files changed, 38 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d89214af7..0ce580622 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-03-13 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * Kosuke Asami: 32472: Completion/Unix/Command/_pgrep: new options. + 2014-03-13 Peter Stephenson <p.stephenson@samsung.com> * Jun T: 32480: Src/Zle/zle_vi.c: fix crash in vi mode when too diff --git a/Completion/Unix/Command/_pgrep b/Completion/Unix/Command/_pgrep index e460202a1..e4bd2e286 100644 --- a/Completion/Unix/Command/_pgrep +++ b/Completion/Unix/Command/_pgrep @@ -5,18 +5,29 @@ typeset -A opt_args typeset -a arguments arguments=('-P[parent process id]:parent process id:->ppid' + '-F[match only in process in pidfile]:files:_files' '-g[match only in process group ids]:group:->pgid' '-G[match only real group id]:group:_groups' + '-j[match only in processes inside jails]' + '-M[extract the name list from the specified core]:files:_files' + '-N[extract the name list from the specified system]:files:_files' '-s[match only session id]:session id:->sid' '-t[match only controlled by terminal]:terminal device:->tty' + '-T[match only in processes specified routing table in rtable]' '-u[match only effective user id]:user:_users' '-U[match only real user id]:user:_users' '(-n)-o[oldest process]' '(-o)-n[newest process]' + '-a[include process ancestors in the match list]' + '-c[print a count of matching processes]' '-f[match against full command line]' + '-i[ignore case distinctions]' + '-I[confirmation before attempting to single each process]' + '-L[given pidfile must be locked]' + '-q[do not write anything to standard output]' + '-S[search also in system processes]' '-v[negate matching]' - '-x[match exactly]' - '*:process name:->pname') + '-x[match exactly]') if [[ $service == 'pkill' ]] then @@ -27,6 +38,27 @@ then '-l[list name in addition to id]') fi +local optchars +case "$OSTYPE" in + linux*) + optchars="cflvxdnoPgsuUGt" + ;; + freebsd*) + optchars="LSafilnoqvxFGMNPUdgjstu" + ;; + openbsd*) + optchars="flnoqvxdGgPsTtUu" + ;; + darwin*) + optchars="LafilnoqvxFGPUdgtu" + ;; + *) + optchars="flvxdnoPgsuUGt" + ;; +esac +arguments=( ${(M)arguments:#(|\*)(|\(*\))-[$optchars]*} + '*:process name:->pname') + _arguments -s -w $arguments && ret=0 case $state in |