PATCH: completion option updates

[Oliver Kiddle <okiddle@xxxxxxxxxxx>]

Some updates to options, relevant versions are:

xrandr 1.5
xterm 346
GNU make 4.2.91
gnutls 3.6.10
btrfs 5.2.1
GNU xargs 4.7
kpartx 0.8.2
ss 190924
Solaris 11.4 netstat
LD_DEBUG environment variable on Linux
strace 5.3

For Solaris 11.4, there are further things that should be updated.
_kpartx is only exclusion lists rather than kpartx changes.

Oliver

diff --git a/Completion/Linux/Command/_btrfs b/Completion/Linux/Command/_btrfs
index bc941621e..eb31580ad 100644
--- a/Completion/Linux/Command/_btrfs
+++ b/Completion/Linux/Command/_btrfs
@@ -109,16 +109,16 @@ while (( $#state )); do
             '(-u --uuid)'{-u,--uuid}'[uuid of the subvolume]'
             '1:subvolume path:_directories'
           )
-        ;;
+        ;|
         subvolume:sync) args+=( '-s[sleep between checks]:delay (seconds) [1]' );;
         subvolume:find-new) args+=( '1:subvol:_files -/' '2:lastgen: _message "last gen"' );;
-        (device|filesystem|qgroup):(df|du|show|usage))
+        (device|filesystem|qgroup|subvolume):(df|du|show|usage))
           args+=(
             '--iec[use 1024 as a base]'
             '--si[use 1000 as a base]'
           )
         ;|
-        (device|filesystem):(df|usage))
+        (device|filesystem):(df|usage)|subvolume:show)
           args+=(
             '(-b --raw)'{-b,--raw}'[output raw numbers in bytes]'
             '(-h --human-readable -H)'{-h,--human-readable}'[output human friendly numbers, base 1024]'
@@ -233,7 +233,7 @@ while (( $#state )); do
         property:list)
           args+=(
             '-t[specify object type]:object type:(subvol filesystem inode device)'
-            '1:object'
+            '1: : _guard "^-*" object'
           )
         ;;
         quota:(enable|disable)) args+=( '1:path:_files -/' );;
@@ -295,6 +295,7 @@ while (( $#state )); do
             \*{-b,--block}'[print info from the specified block only]:block number'
             '(-t --tree)'{-t,--tree}'[print only tree with the given id (string or number)]:tree id'
             '--follow[use with -b, to show all children tree blocks of the block]'
+            "--noscan[don't scan devices from the filesystem, use only the listed ones]"
           )
         ;;
         inspect*:dump-super)
@@ -399,7 +400,11 @@ while (( $#state )); do
             '1:mount:->mounts'
           )
         ;;
-        h(|e(|l(|p)))) args+=( '--full[display detailed help]' );;
+        h(|e(|l(|p)))) args+=(
+            '--full[display detailed help on every command]'
+            '--box[show list of built-in tools (busybox style)]'
+          )
+        ;;
         *) args+=( '*: :_default' );; # fallback for unknown subcommands
       esac
       if ! (( shift )); then
diff --git a/Completion/Linux/Command/_kpartx b/Completion/Linux/Command/_kpartx
index 8f09c416d..79a8dd8a7 100644
--- a/Completion/Linux/Command/_kpartx
+++ b/Completion/Linux/Command/_kpartx
@@ -1,11 +1,11 @@
 #compdef kpartx
 
 _arguments -s -S : \
-  '-a[add partition mappings]' \
+  '(-d -u -l)-a[add partition mappings]' \
   '-r[read-only partition mappings]' \
-  '-d[delete partition mappings]' \
-  '-u[update partition mappings]' \
-  '-l[list partition mappings]' \
+  '(-a -u -l)-d[delete partition mappings]' \
+  '(-a -d -l)-u[update partition mappings]' \
+  '(-a -d -u)-l[list partition mappings]' \
   '-p[set device name-partition number delimiter]' \
   '-f[force creation of mappings]' \
   '-g[force GUID partition table]' \
diff --git a/Completion/Linux/Command/_ss b/Completion/Linux/Command/_ss
index 1dbd717eb..d2f9a2311 100644
--- a/Completion/Linux/Command/_ss
+++ b/Completion/Linux/Command/_ss
@@ -41,6 +41,7 @@ _arguments -C -s \
   "($info -f --family)"{-f+,--family=}'[display sockets of specified type]:family:(inet inet6 link unix netlink vsock tipc xdp help)' \
   "($info -K --kill)"{-K,--kill}'[forcibly close sockets, display what was closed]' \
   "($info -H --no-header)"{-H,--no-header}'[suppress header line]' \
+  "($info -O --oneline)"{-O,--oneline}"[print socket's data on a single line]" \
   "($info -A --query --socket)"{-A+,--query=,--socket=}'[specify socket tables to show]: :_values -s , socket\ table all inet tcp udp raw unix packet netlink unix_dgram unix_stream unix_seqpacket packet_raw packet_dgram vsock_stream vsock_dgram tipc' \
   "($info -D)"{-D+,--diag=}'[dump raw info to file]:file:_files' \
   "($info -F)"{-F+,--filter=}'[read filter information from a file]:file:_files' \
diff --git a/Completion/Linux/Command/_strace b/Completion/Linux/Command/_strace
index 683673fdd..7d4595a33 100644
--- a/Completion/Linux/Command/_strace
+++ b/Completion/Linux/Command/_strace
@@ -25,7 +25,7 @@ _arguments -C -s \
   '(-C -i -k -r -ff -t -tt -ttt -T -y -yy)-c[count time, calls, and errors for each system call and report a summary]' \
   '(-c)-C[count time, calls, and errors for each system call and report a summary in addition to regular output]' \
   '-O+[overhead for tracing system calls]:overhead (microseconds)' \
-  '-S+[sort the output of the histogram (-c option) by the specified criterion]:sort criterion:(time calls name nothing)' \
+  '-S+[sort the output of the histogram (-c option) by the specified criterion]:sort criterion [time]:(time calls errors name nothing)' \
   '-w[summarise syscall latency]' \
   '*-e+[select events to trace or how to trace]:system call:->expressions' \
   '*-P+[trace only system calls accessing given path]:path:_files' \
@@ -39,6 +39,7 @@ _arguments -C -s \
   '*-E+[set or remove exported environment variable]:variable:->envars' \
   "${root}-u+[run as specified user]:user:_users" \
   '(:)*-p+[attach to the process with specified process ID and begin tracing]:process ID:_pids' \
+  '--seccomp-bpf[enable seccomp-bpf filtering]' \
   '-d[show debug output of strace itself on standard error]' \
   '-v[print unabbreviated versions of environment, stat, termios, etc. calls]' \
   '(- 1 *)-h[display help information]' \
diff --git a/Completion/Unix/Command/_gnutls b/Completion/Unix/Command/_gnutls
index 8b8f6c78e..6c9956b10 100644
--- a/Completion/Unix/Command/_gnutls
+++ b/Completion/Unix/Command/_gnutls
@@ -85,7 +85,7 @@ case "$service" in
       '--benchmark-tls-ciphers[benchmark TLS ciphers]'
       '--priority-list[print list of the supported priority strings]'
       '*--alpn=[enable application layer protocol]:string'
-      '--recordsize=[specify maximum record size to advertise]:record size'
+      '--recordsize=[specify maximum record size to advertise]:record size (0-4096)'
       "--disable-sni[don't send a Server Name]"
       '--single-key-share[send a single key share under TLS1.3]'
       '--post-handshake-auth[enable post-handshake authentication under TLS1.3]'
@@ -119,6 +119,8 @@ case "$service" in
       '--pskhint=[specify PSK identity hint to use]:string'
       '*--ocsp-response=[specify OCSP response to send to client]:string:_files'
       '--ignore-ocsp-response-errors[ignore any errors when setting the OCSP response]'
+      '--recordsize=[specify maximum record size to advertise]:record size (0-16384)'
+      '--httpdata=[specify data to use as HTTP response]:file:_files'
     )
   ;;
 
diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make
index 56d47f4ea..3dcf479c3 100644
--- a/Completion/Unix/Command/_make
+++ b/Completion/Unix/Command/_make
@@ -172,14 +172,14 @@ _make() {
       '-d[print lots of debug information]'
       '--debug=-[print various types of debug information]:debug options:->debug'
       '(-e --environment-overrides)'{-e,--environment-overrides}'[environment variables override makefiles]'
-      '--eval=-[evaluate STRING as a makefile statement]:STRING'
-      '(-f --file --makefile)'{-f,--file=,--makefile=}'[read FILE as a makefile]:makefile:->file'
+      \*{-E+,--eval=-}'[evaluate string as a makefile statement]:string'
+      '(-f --file --makefile)'{-f,--file=,--makefile=}'[read specified file as a makefile]:makefile:->file'
       '(- *)'{-h,--help}'[print help message and exit]'
       '(-i --ignore-errors)'{-i,--ignore-errors}'[ignore errors from recipes]'
-      '*'{-I,--include-dir=}'[search DIRECTORY for included makefiles]:search path for included makefile:->dir'
-      '(-j --jobs)'{-j+,--jobs=}'[allow N jobs at once; infinite jobs with no arg]:number of jobs'
+      '*'{-I,--include-dir=}'[search specified directory for included makefiles]:search path for included makefile:->dir'
+      '(-j --jobs)'{-j+,--jobs=}'[allow specified number of parallel jobs; unlimited jobs with no arg]:: : _guard "[0-9]#" "number of jobs"'
       '(-k --keep-going)'{-k,--keep-going}"[keep going when some targets can't be made]"
-      '(-l --load-average --max-load)'{-l,--load-average=,--max-load}"[don't start multiple jobs unless load is below N]:load"
+      '(-l --load-average --max-load)'{-l,--load-average=,--max-load}"[don't start multiple jobs unless load is below specified value]:load"
       '(-L --check-symlink-times)'{-L,--check-symlink-times}'[use the latest mtime between symlinks and target]'
       '(-n --just-print --dry-run --recon)'{-n,--just-print,--dry-run,--recon}"[don't actually run any recipe; just print them]"
       '*'{-o,--old-file=,--assume-old=}"[consider specified file to be old and don't remake it]:file not to remake:->file"
@@ -189,12 +189,13 @@ _make() {
       '(-r --no-builtin-rules)'{-r,--no-builtin-rules}'[disable the built-in implicit rules]'
       '(-R --no-builtin-variables)'{-R,--no-builtin-variables}'[disable the built-in variable settings]'
       '(-s --silent --quiet)'{-s,--silent,--quiet}"[don't echo recipes]"
+      '--no-silent[echo recipes (disable --silent mode)]'
       '(-S --no-keep-going --stop)'{-S,--no-keep-going,--stop}'[turns off -k]'
       '(-t --touch)'{-t,--touch}'[touch targets instead of remaking them]'
       '(- *)'{-v,--version}'[print the version number of make and exit]'
       '(-w --print-directory)'{-w,--print-directory}'[print the current directory]'
       '--no-print-directory[turn off -w, even if it was turned on implicitly]'
-      '*'{-W,--what-if=,--new-file=,--assume-new=}'[consider FILE to be infinitely new]:file to treat as modified:->file'
+      '*'{-W,--what-if=,--new-file=,--assume-new=}'[consider specified file to be infinitely new]:file to treat as modified:->file'
       '--warn-undefined-variables[warn when an undefined variable is referenced]'
       '--warn-undefined-functions[warn when an undefined user function is called]'
     )
diff --git a/Completion/Unix/Command/_netstat b/Completion/Unix/Command/_netstat
index 7342a8a22..94aa1688d 100644
--- a/Completion/Unix/Command/_netstat
+++ b/Completion/Unix/Command/_netstat
@@ -174,8 +174,15 @@ case $OSTYPE in
   ;|
 
   solaris2.<11->)
+    sets+=( dcache '-[^-]#d*' )
+    sel_dcache=( '-d[display the destination cache entry table]' )
+    dcache=( $families )
     args=( '-T+[specify time format]:time format:((u\:seconds\ since\ epoch d\:standard\ date\ format))' )
-    sockets=( '-u[list user, pid and program that created network endpoint]' )
+    sockets+=(
+      '-u[list user, pid and program that created network endpoint]'
+      '-k[show only sockets with kernel data path bypass enabled]'
+      '-L[only show state of sockets using SO_REUSEPORT load balancing]'
+    )
   ;&
   solaris*)
     args=( -A '-*' $args )
diff --git a/Completion/Unix/Command/_xargs b/Completion/Unix/Command/_xargs
index 8b543341d..f21784ef1 100644
--- a/Completion/Unix/Command/_xargs
+++ b/Completion/Unix/Command/_xargs
@@ -47,6 +47,7 @@ case $variant in
       '(-0 --null -d --delimiter)'{-0,--null}'[expect NUL characters as input separators]'
       '(-d --delimiter -0 --null)'{-d+,--delimiter=}'[specify delimiter of input items]:delimiter'
       '(-l -L --max-lines -n --max-args -s --max-chars)--max-lines=-[call program for every number of lines]::number of input lines'
+      '(-o --open-tty)'{-o,--open-tty}'[reopen stdin as /dev/tty in the child process before executing the command]'
       '--process-slot-var=[set environment variable to unique value in child processes]:variable:_parameters -g "*export*"'
       '(-r --no-run-if-empty)'{-r,--no-run-if-empty}"[don't run command in absence of input]"
       '(- *)--help[show help information]'
diff --git a/Completion/Unix/Type/_ld_debug b/Completion/Unix/Type/_ld_debug
index 94593eff0..5c10faa02 100644
--- a/Completion/Unix/Type/_ld_debug
+++ b/Completion/Unix/Type/_ld_debug
@@ -31,6 +31,7 @@ case $OSTYPE in
   linux*)
     vals+=(
       'all[combine all options]'
+      'scopes[display scope information]'
       'statistics[display relocation statistics]'
     )
   ;;
diff --git a/Completion/X/Command/_xrandr b/Completion/X/Command/_xrandr
index 26d8cd082..67045b33d 100644
--- a/Completion/X/Command/_xrandr
+++ b/Completion/X/Command/_xrandr
@@ -46,6 +46,13 @@ _arguments -C \
   '*--rmmode:Mode name:' \
   "*--addmode:output:->outputs:name" \
   "*--delmode:output:->outputs:name" \
+  '--listproviders' \
+  '--setprovideroutputsource:provider: :source' \
+  '--setprovideroffloadsink:provider: :sink' \
+  '--listmonitors' \
+  '--listactivemonitors' \
+  '--setmonitor:name' \
+  '--delmonitor:name' \
   && return 0
 
 case $state in
diff --git a/Completion/X/Command/_xterm b/Completion/X/Command/_xterm
index 7619b280a..6d98985e7 100644
--- a/Completion/X/Command/_xterm
+++ b/Completion/X/Command/_xterm
@@ -1,12 +1,16 @@
 #compdef xterm
 
 _xt_arguments \
-  -+{ah,ai,aw,bc,bdc,cb,cm,cn,cu,dc,hf,ie,im,j,ls,mb,nul,pc,rw,s,sb,sf,si,sk,sp,t,u8,ulc,ut,vb,wc,wf,samename} \
-  -{version,help,132,leftbar,rightbar,C} \
+  -+{132,ah,ai,aw,bc,bdc,cb,cjk_width,cm,cn,cu,dc,fbb,fbx,fullscreen,hf,hm,hold,ie,im,itc,j,k8,l,lc,ls,maximized,mb,mesg,mk_width,nul,pc,pob,rvc,rw,s,samename,sb,sf,si,sk,sm,sp,t,u8,uc,ulc,ulit,ut,vb,wc,wf} \
+  -{version,help,leftbar,rightbar,C} \
+  '-report-'{charclass,colors,fonts} \
+  '-T:title' \
   '-b:inner border size:' \
+  '-baudrate:rate [38400]' \
   '-bcf:time text cursor is off when blinking (milliseconds):' \
   '-bcn:time text cursor is on when blinking (milliseconds):' \
   '-cc:character class:' \
+  '-class:string' \
   '-cr:text cursor color:_x_color' \
   '-e:program: _command_names -e:*::program arguments: _normal' \
   '-fa:font pattern:_xft_fonts' \
@@ -15,11 +19,14 @@ _xt_arguments \
   '-hc:background color for highlighted text:_x_color' \
   '-mc:multi-click threshold (milliseconds):' \
   '-ms:pointer cursor color:_x_color' \
+  '-n:icon name' \
   '-nb:margin bell number:' \
+  '-selbg:color:_x_color' \
+  '-selfg:color:_x_color' \
+  '-sh:scaling' \
   '-sl:save lines:' \
   '-ti:terminal ID:_terminals' \
   '-tm:terminal setting:' \
   '-tn:terminal type:' \
   '-ziconbeep:iconbeep (percent):' \
-  '-C' \
   '-S-:pseudo-terminal and file descriptor:'