From 09c6acf7b23f6ea6af6c5ac9cce18aa1afc49aa7 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Thu, 9 May 2019 00:17:04 +0200 Subject: 44279: completion updates for Dragonfly 5.4, FreeBSD 12 and OpenBSD 6.5 --- Completion/Unix/Command/_arp | 2 -- Completion/Unix/Command/_arping | 1 + Completion/Unix/Command/_cp | 2 +- Completion/Unix/Command/_date | 9 ++++----- Completion/Unix/Command/_gcore | 1 - Completion/Unix/Command/_install | 8 +++++--- Completion/Unix/Command/_ls | 8 ++++++-- Completion/Unix/Command/_netstat | 1 + Completion/Unix/Command/_ping | 11 +++++------ Completion/Unix/Command/_script | 6 +----- Completion/Unix/Command/_tcpdump | 1 + Completion/Unix/Command/_top | 2 +- Completion/Unix/Command/_vmstat | 30 +++++++++++++++++++++++------- Completion/Unix/Command/_zpool | 10 +++++++++- 14 files changed, 58 insertions(+), 34 deletions(-) (limited to 'Completion/Unix/Command') diff --git a/Completion/Unix/Command/_arp b/Completion/Unix/Command/_arp index 90e30d6c2..389f1099b 100644 --- a/Completion/Unix/Command/_arp +++ b/Completion/Unix/Command/_arp @@ -38,8 +38,6 @@ case $OSTYPE in ;; darwin*|freebsd*|dragonfly*) cmds+=( '(-n -i)-S[create an arp entry, replacing any existing entry]' ) - ;| - darwin*|freebsd*) args+=( '(-s -Q -f)-i+[select an interface]:interface:_net_interfaces' ) ;| darwin*) diff --git a/Completion/Unix/Command/_arping b/Completion/Unix/Command/_arping index 66ce7bc18..4974a408a 100644 --- a/Completion/Unix/Command/_arping +++ b/Completion/Unix/Command/_arping @@ -12,6 +12,7 @@ _arguments -s \ '-V[print version and exit]' \ '-c[how many packets to send]:count' \ '-w[how long to wait for a reply]:timeout' \ + '-i[specify interval between packets]:interval (seconds)' \ '-I[interface]:ethernet interface:_net_interfaces' \ '-s[source ip address]:source IP address:_hosts' \ ':destination:_hosts' diff --git a/Completion/Unix/Command/_cp b/Completion/Unix/Command/_cp index 88750b330..ae448213a 100644 --- a/Completion/Unix/Command/_cp +++ b/Completion/Unix/Command/_cp @@ -53,7 +53,7 @@ else 'solaris2.<11->*' '-/[preserve extended attributes and extended system attributes]' \ '(darwin|dragonfly|freebsd)*' "(-f -i)-n[don't overwrite existing file]" \ 'netbsd*' "-N[don't copy file flags]" \ - '(darwin|dragonfly|freebsd|netbsd)*' '-a[archive mode, same as -RpP]' \ + '(darwin|dragonfly|freebsd|netbsd|openbsd)*' '-a[archive mode, same as -RpP]' \ '(dragonfly|freebsd)*' '-l[link files instead of copying]' \ '(darwin|dragonfly|*bsd)*' '-v[show file names as they are copied]' \ 'darwin*' "-X[don't copy extended attributes or resource forks]" \ diff --git a/Completion/Unix/Command/_date b/Completion/Unix/Command/_date index a3e933710..91bd3b5f1 100644 --- a/Completion/Unix/Command/_date +++ b/Completion/Unix/Command/_date @@ -31,7 +31,7 @@ else freebsd*|dragonfly*|darwin*|netbsd*|openbsd*) opts+=( -A '-*' ) args+=( - '-j[do not try to set date]' + "-j[don't try to set date]" '2:format or date:->fmt_date' ) ;| @@ -41,6 +41,7 @@ else freebsd*|dragonfly*|darwin*|openbsd*) args+=( '-d+:daylight saving time value' + '-f+[use specified format for input]:parsing format:_date_formats:new date' '-t+:minutes west of GMT' ) ;| @@ -57,13 +58,11 @@ else ) args+=( '-r+[reference time: file modification or literal time]:reference: _alternative $alts' + '(-R)-I-[display in ISO 8601 format]::precision:(date hours minutes seconds)' ) ;| freebsd*|dragonfly*|darwin*) - args+=( - '-f+[use specified format for input]:parsing format:_date_formats:new date:' - '*-v+[adjust and print (but not set) date]:[+-]value[ymwdHMS]:' - ) + args+=( "*-v+[adjust and print (but don't set) date]:[+-]value[ymwdHMS]" ) ;; freebsd*|dragonfly*) args+=( '-R[display in RFC2822 format]' ) diff --git a/Completion/Unix/Command/_gcore b/Completion/Unix/Command/_gcore index 4933ffee6..72d11864b 100644 --- a/Completion/Unix/Command/_gcore +++ b/Completion/Unix/Command/_gcore @@ -37,7 +37,6 @@ case $OSTYPE in _arguments -s \ '-c+[write core file to specified file]:file:_files' \ '-f[dump all available segments]' \ - '-s[stop process while gathering image]' \ '::executable:' \ ':pid:_pids' ;; diff --git a/Completion/Unix/Command/_install b/Completion/Unix/Command/_install index 80a1b0c00..60b0f6153 100644 --- a/Completion/Unix/Command/_install +++ b/Completion/Unix/Command/_install @@ -64,14 +64,16 @@ else [[ $OSTYPE == (darwin|dragonfly)* ]] && args+=( '-M[disable use of mmap(2)]' ) + [[ $OSTYPE == (dragonfly|freebsd|netbsd)* ]] && args+=( + '(-C -c --compare)-l+[link files (rather than copy) using specified method]: :->linkflags' + '+N+[use user/group database files from specified directory]: :_directories' + '-U[indicate that install is unprivileged]' + ) [[ $OSTYPE == (freebsd|netbsd)* ]] && args+=( '-D+[specify destination directory used for metadata log]: :_directories' '-h+[store digest in metadata log using specified method]: :->digests' - '(-C -c --compare)-l+[link files (rather than copy) using specified method]: :->linkflags' '-M+[log mtree(8) metadata for installed files to specified file]:metadata log file:_files' - '+N+[use user/group database files from specified directory]: :_directories' '-T+[specify mtree(8) tags to store in metadata log]:mtree(8) tags' - '-U[indicate that install is unprivileged]' ) [[ $OSTYPE == netbsd* ]] || args+=( '-S[use temporary files to perform safe copy]' diff --git a/Completion/Unix/Command/_ls b/Completion/Unix/Command/_ls index cedea1de9..1fd9383f5 100644 --- a/Completion/Unix/Command/_ls +++ b/Completion/Unix/Command/_ls @@ -81,10 +81,14 @@ if ! _pick_variant gnu=gnu unix --help; then if [[ $OSTYPE = (dragonfly*|freebsd*) ]]; then arguments+=( '(-A)-I[prevent -A from being automatically set for the super-user]' + '(-1 -C -m -x)-D+[specify format for date]:format: _date_formats' ) fi if [[ $OSTYPE = dragonfly* ]]; then - arguments+=( '-y[display FSMID in long listing]' ) + arguments+=( + '-_[use GMT based date and time output with nanotime timestamp]' + '-y[display FSMID in long listing]' + ) fi if [[ $OSTYPE = (freebsd*|darwin*) ]]; then arguments+=( '(-c -u)-U[file creation time]' ) @@ -92,9 +96,9 @@ if ! _pick_variant gnu=gnu unix --help; then if [[ $OSTYPE = freebsd* ]]; then arguments+=( '-,[print file sizes grouped and separated by thousands]' - '-D+[specify format for date]:format: _date_formats' '-y[with -t, sort filenames in the same order as the time]' '-Z[display MAC label]' + '--color=-[control use of color]:color:(never always auto)' ) fi if [[ $OSTYPE = darwin* ]]; then diff --git a/Completion/Unix/Command/_netstat b/Completion/Unix/Command/_netstat index c03aae9a2..7342a8a22 100644 --- a/Completion/Unix/Command/_netstat +++ b/Completion/Unix/Command/_netstat @@ -269,6 +269,7 @@ case $OSTYPE in ) interfaces+=( '-c+[show specified number of updates, then exit]:count' + '-e[show only the number of errors on the interface]' '-q[only show interfaces that have seen packets]' '-t[show current value of the watchdog timer function]' ) diff --git a/Completion/Unix/Command/_ping b/Completion/Unix/Command/_ping index 78fd33d92..3cb6e1008 100644 --- a/Completion/Unix/Command/_ping +++ b/Completion/Unix/Command/_ping @@ -11,6 +11,7 @@ case ${variant}:${${service#ping}:-4} in args+=( '-d[set SO_DEBUG on the socket]' '-n[show network addresses as numbers]' + '-M+[define mtu discovery]:mtu discovery:(do dont want)' '-v[verbose output]' ) ;| @@ -104,9 +105,11 @@ case ${variant}:${${service#ping}:-4} in '-z+[specify type of service]:type of service' ) ;| + (freebsd|openbsd|darwin)*:6) + args+=( '-D[disable IPv6 fragmentation]' ) + ;| (freebsd|darwin)*:6) args+=( - '-D[disable IPv6 fragmentation]' '-R[audible bell for no packet]' '-r[audible bell for each packet]' ) @@ -149,16 +152,12 @@ case ${variant}:${${service#ping}:-4} in '--apple-time[prints the time a packet was received]' ) ;; - openbsd*:4) - args+=( - '-T+[change TOS value]:TOS value:(critical inetcontrol lowdelay netcontrol throughput reliability ef af cs)' - ) - ;| openbsd*) args+=( '-H[try reverse-lookups of addresses]' '-E[audible bell for no packet]' '-e[audible bell for each packet]' + '-T+[change TOS value]:TOS value:(critical inetcontrol lowdelay netcontrol throughput reliability ef af cs)' '-V+[specify routing table to be used]:routing table' ) ;; diff --git a/Completion/Unix/Command/_script b/Completion/Unix/Command/_script index 436c9661b..ac3bf3973 100644 --- a/Completion/Unix/Command/_script +++ b/Completion/Unix/Command/_script @@ -34,10 +34,6 @@ case $OSTYPE in darwin*|dragonfly*|netbsd*|freebsd*) args=( '-q[be quiet: suppress display of starting and ending lines]' - ) - ;| - darwin*|netbsd*|freebsd*) - args+=( '(-a -r -k)-d[suppress sleeps when playing back a session]' '(-a -r -k -t)-p[play back a recorded session]' '(-d -p)-r[record a session with input, output and timing data]' @@ -58,13 +54,13 @@ case $OSTYPE in ;| darwin*|dragonfly*|freebsd*) args+=( + '-F[send output to specified named pipe]:fifo:_files -g "*(p)"' '-t+[specify interval of data flushing]:interval (seconds)' '-k[log keys sent to the program as well as output]' '*:::arguments: _normal' ) ;| darwin*|freebsd*) - args+=( '-F[send output to specified named pipe]:fifo:_files -g "*(p)"' ) ;| *) args+=( diff --git a/Completion/Unix/Command/_tcpdump b/Completion/Unix/Command/_tcpdump index 4b9950fa5..9aad84d7b 100644 --- a/Completion/Unix/Command/_tcpdump +++ b/Completion/Unix/Command/_tcpdump @@ -134,6 +134,7 @@ if [[ $OSTYPE = openbsd* ]]; then - capture ${(R)args:#(|\*)(|\(*\))--*} # removes any long-options '(-n)-a[attempt to convert network and broadcast addresses to names]' + '-B+[specify drop action to be used when filter expression matches a packet]:drop action:(pass capture drop)' '-D[select packet flowing in specified direction]:direction:(in out)' '-I[print the interface on each dump line]' '-o[print a guess of the possible operating system(s)]' diff --git a/Completion/Unix/Command/_top b/Completion/Unix/Command/_top index 4064c408d..652432166 100644 --- a/Completion/Unix/Command/_top +++ b/Completion/Unix/Command/_top @@ -65,6 +65,7 @@ case $OSTYPE in '-i[interactive mode]' '-n[non-interactive mode (identical to batch mode)]' '-o+[sort process display by the specified field]:field:( $fields )' + '-p+[filter by the specified pid]: :_pids' '-q[renice top to -20]' '-S[show system processes]' '-s+[specify delay interval]:seconds:' @@ -92,7 +93,6 @@ case $OSTYPE in '-1[combine CPU statistic into one line]' '-C[show command arguments as well as process name]' '-g+[filter processes by the specified string]:string' - '-p+[filter by the specified pid]: :_pids' '-U+[filter processes by the specified user]: :_users -M "L\:|-="' );; darwin*) diff --git a/Completion/Unix/Command/_vmstat b/Completion/Unix/Command/_vmstat index 7d3008592..bc13a5505 100644 --- a/Completion/Unix/Command/_vmstat +++ b/Completion/Unix/Command/_vmstat @@ -21,10 +21,9 @@ 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' @@ -32,18 +31,27 @@ case $OSTYPE in '*:disk:_files' ) ;| + *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*) specs+=( '-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,6 +81,14 @@ case $OSTYPE in '-W[print more information about kernel memory pools]' ) ;; + dragonfly*) + specs+=( + '-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)]' + ) + ;; freebsd*|solaris*) specs+=( '::disk:_files -W /dev -g "*(-%b)"' diff --git a/Completion/Unix/Command/_zpool b/Completion/Unix/Command/_zpool index 4d4793eea..d9c2caa52 100644 --- a/Completion/Unix/Command/_zpool +++ b/Completion/Unix/Command/_zpool @@ -14,7 +14,7 @@ _zpool() { ) if [[ $implementation = openzfs ]] && [[ $OSTYPE != solaris* ]]; then - subcmds+=(labelclear) + subcmds+=( labelclear initialize ) fi versions=( @@ -158,6 +158,14 @@ _zpool() { '::pool name:_zfs_pool' ;; + (initialize) + _arguments -A "-*" \ + '(-c --cancel)'{-c,--cancel}'[cancel initializing on specified devices]' \ + '(-s --suspend)'{-s,--suspend}'[suspend initializing on specified devices]' \ + ':pool name:_zfs_pool' \ + '*:device:_files' + ;; + (iostat) _arguments -A "-*" \ '-l[Display configuration in /dev/chassis location form]' \ -- cgit 1.4.1