Merge tag 'zsh-5.7.1-test-3' into debian

Test release: 5.7.1-test-3

1 files changed, 26 insertions, 26 deletions

diff --git a/Completion/Unix/Command/_vmstat b/Completion/Unix/Command/_vmstat
index 7d3008592..f3ac1af14 100644
--- a/Completion/Unix/Command/_vmstat
+++ b/Completion/Unix/Command/_vmstat
@@ -21,15 +21,28 @@ case $OSTYPE in
       '(- :)'{-D,--disk-sum}'[summarize disk statistics]'
     )
   ;;
-  *bsd*)
+  *bsd*|dragonfly*)
     specs=(
       '-c+[specify number of times to refresh the display]:count'
-      '-f[report on the number fork syscalls since boot and pages of virtual memory for each]'
       '-i[report the number of interrupts taken by devices since boot]'
       '-M+[specify core file to extract values associated with the name list from]:core:_files'
       '-N+[specify file to extract the name list from]:system:_files'
       '-w+[specify delay between each display]:delay (seconds)'
-      '*:disk:_files'
+      '*: :_bsd_disks'
+    )
+  ;|
+  *bsd*)
+    specs+=(
+      '-f[report on the number fork syscalls since boot and pages of virtual memory for each]'
+    )
+  ;|
+  freebsd*|dragonfly*)
+    specs+=(
+      '-m[report on the usage of kernel dynamic memory allocated using malloc(9) by type]'
+      '-n+[change the maximum number of disks to display]:number of disks to display [2]'
+      '*-p+[specify which types of devices to display]: :->devices'
+      '-s[display the contents of the SUM structure]'
+      '-z[report on memory used by the kernel zone allocator, uma(9), by zone]'
     )
   ;|
   freebsd*)
@@ -37,13 +50,8 @@ case $OSTYPE in
       '-a[include statistics about all interrupts]'
       '-h[human readable memory columns output]'
       '-H[scriptable memory columns output]'
-      '-m[report on the usage of kernel dynamic memory allocated using malloc(9) by type]'
-      '-n+[change the maximum number of disks to display]:number of disks to display'
       '-o[list virtual memory objects]'
       '-P[report per-cpu system/user/idle cpu statistics]'
-      '-p+[specify which types of devices to display]: :->devices'
-      '-s[display the contents of the SUM structure]'
-      '-z[report on memory used by the kernel zone allocator, uma(9), by zone]'
     )
   ;|
   (net|open)bsd*)
@@ -73,12 +81,14 @@ case $OSTYPE in
       '-W[print more information about kernel memory pools]'
     )
   ;;
-  freebsd*|solaris*)
+  dragonfly*)
     specs+=(
-      '::disk:_files -W /dev -g "*(-%b)"'
-      ': :_guard "[0-9]#" "interval (seconds)"' ':count'
+      '-b[use brief format for formatted numbers]'
+      '-o[report usage of kernel object cache]'
+      '-u[output unformatted numeric values]'
+      '-v[include IRQ numbers and IRQ target CPU numbers before device names (with -i)]'
     )
-  ;|
+  ;;
   solaris2.<11->)
     specs+=( '(-i -s)-T+[specify time format]:time format:((u\:seconds\ since\ epoch d\:standard\ date\ format))' )
   ;&
@@ -90,30 +100,20 @@ case $OSTYPE in
       '-p[report paging activity]'
       '(-T)-s[display the total number of system events since boot]'
       '-S[report on swapping rather than paging activity]'
+      '::disk:_files -W /dev -g "*(-%b)"'
+      ': :_guard "[0-9]#" "interval (seconds)"' '::count'
     )
   ;;
 esac
 
 if (( $#specs )); then
   local curcontext=$curcontext state state_descr line ret=1
-  typeset -A {opt,val}_args
+  typeset -A opt_args
 
   _arguments -C -s -w -A '-*' : "$specs[@]" && ret=0
 
   if [[ $state == devices ]]; then
-    local -a types
-    types=(
-      'da[direct access devices]' 'sa[sequential access devices]'
-      'printer[printers]' 'proc[processor devices]'
-      'worm[write once read multiple devices]' 'cd[CD devices]'
-      'scanner[scanner devices]' 'optical[optical memory devices]'
-      'changer[medium changer devices]' 'comm[communication devices]'
-      'array[storage array devices]' 'enclosure[enclosure services devices]'
-      'floppy[floppy devices]' 'IDE[Integrated Drive Electronics devices]'
-      'SCSI[Small Computer System Interface devices]'
-      'other[any other device interface]' 'pass[passthrough devices]'
-    )
-    _values -s , 'device type' "$types[@]" && ret=0
+    _fbsd_device_types && ret=0
   elif [[ $state == hashes ]]; then
    local -a tables
    tables=( ${${${(f)"$(_call_program hashes $words[1] -L)"}[2,-1]#?}/ ##/:} )