From 7d2d242b30dad78cc9df81a275324e57c9fedd34 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <okiddle@yahoo.co.uk>
Date: Tue, 1 Oct 2019 23:10:17 +0200
Subject: 44798: completion option update

---
 Completion/Linux/Command/_btrfs  | 15 ++++++++++-----
 Completion/Linux/Command/_kpartx |  8 ++++----
 Completion/Linux/Command/_ss     |  1 +
 Completion/Linux/Command/_strace |  3 ++-
 4 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'Completion/Linux')

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..2a1cfcb78 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]' \
-- 
cgit 1.4.1