35049: allow jail completion to include jid 0 for the host and to

complete jails by any parameter

2 files changed, 2 insertions, 12 deletions

diff --git a/Completion/Unix/Command/_pgrep b/Completion/Unix/Command/_pgrep
index 3af55a379..d3dcd1812 100644
--- a/Completion/Unix/Command/_pgrep
+++ b/Completion/Unix/Command/_pgrep
@@ -8,7 +8,7 @@ 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]:jail id:->jid'
+     '-j[match only in processes inside jails]:jail id:_sequence _jails -0 -o jid'
      '-J[match only in project ids]:project id:->projid'
      '-M[extract the name list from the specified core]:files:_files'
      '-N[extract the name list from the specified system]:files:_files'
@@ -93,16 +93,6 @@ case $state in
     _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)
     compset -P '*,'
 
diff --git a/Completion/Unix/Command/_ps b/Completion/Unix/Command/_ps
index 925f48390..e557b27b9 100644
--- a/Completion/Unix/Command/_ps
+++ b/Completion/Unix/Command/_ps
@@ -160,7 +160,7 @@ if (( CURRENT > 1 )) && [[ $OSTYPE != solaris* || ( $OSTYPE = linux-gnu && $word
       _wanted -C option-k-1 properties expl 'property' _sequence -s , _ps_props -s - && return
     ;;
     *G) _sequence -s , _groups && return ;;
-    *J) _sequence -s , _jails && return ;;
+    *J) _sequence _jails -0 && return ;;
     *[MNW]) _files && return ;;
     *t)
       _wanted -C option-t-1 ttys expl tty _sequence -s , \