From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4083 invoked by alias); 28 Apr 2018 04:30:13 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 42729 Received: (qmail 6836 invoked by uid 1010); 28 Apr 2018 04:30:13 -0000 X-Qmail-Scanner-Diagnostics: from mail-ot0-f180.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(74.125.82.180):SA:0(-1.6/5.0):. Processed in 1.191317 secs); 28 Apr 2018 04:30:13 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.1 X-Envelope-From: phy1729@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mail-followup-to:mime-version :content-disposition:user-agent; bh=o7TXAsmoJjGL6lPJDZs0yCndgqnPGwgYi+cHRzZMAdk=; b=L8eVrmbNm0hTTFZ4adxmBrHImddA2vKy7rQ/3E9TVceEZrOBqHuNnCTpJnNa+I0z6r TGr3o9faGACYJG+juMF91fQYddxgPNYNjv0s9a5bSfWv9eJbE1OW1uSD+UoBUeg18eSH tZV7bze8gjWoPEFxQbvFppbM1mpvJ6sXzKebf+5IBB+h9nx6/os3Xjym5ZKAO/zvRqVF M4by3LXNxuNKQgflp61swZ+IsZReeHy7QJJ1Yj/L5i5j0bbFglhLbqcmdcqSET52DXMi yk7SBRzkDWrluh03MQrtNkhW+hIunKEXszIE11DnXmkPJr2vxMudK2CCbXh3eq6Q/Ry/ P6sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :mime-version:content-disposition:user-agent; bh=o7TXAsmoJjGL6lPJDZs0yCndgqnPGwgYi+cHRzZMAdk=; b=j/zDCMknLKLATCUP5u1u+0setWogKaVx8OMePLeE0L4uAf67OdVFmP3X9z3Xz3nLfo 1tUiV4zJqC0rk53AIp5vhiUckfK0Nlv8DsmyYnAjDq8U0pDNLrBWJSbdl8TK4S+iz1HA kutiQrlLPVq0NYvtQ6mVe2QHY6LuxkIJwphex8hGyTuyHbBrvAFtyFr8bReMem6/95wR DF4sPLwjYmwoFKUIGIBGm4mZfjWLq9SW19ZhtEmt5owsl3GgQDrl/A4RwWSXpB4UO4FU 6wGZtCE3rqnJ41t/6MmuzOy2j4tWgzhr/CTarX9/EJ6zPGylPLTM1NVOHqKeciIXhGQ/ wLDQ== X-Gm-Message-State: ALQs6tCbNn3R6oC8D+1/18ObHjXiZEtXSvgd4+iJI3M65y+gxiX0IgqM hvawBGfHJDhHewU1TRuryL22XRQh X-Google-Smtp-Source: AB8JxZrsgVsuuA8/NuGMs++rhnQ7u7egrCiyxfm1LYRLaU+vF7WxjAVwuOuEQK4IgVZClYHdU2kxgQ== X-Received: by 2002:a9d:118f:: with SMTP id v15-v6mr3326111otf.125.1524889808376; Fri, 27 Apr 2018 21:30:08 -0700 (PDT) Date: Fri, 27 Apr 2018 23:30:05 -0500 From: Matthew Martin To: zsh-workers@zsh.org Subject: [patch] update _df Message-ID: <20180428043004.GA71288@CptOrmolo.darkstar> Mail-Followup-To: zsh-workers@zsh.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) Update _df for [DFNO]BSD. - Matthew Martin diff --git a/Completion/Unix/Command/_df b/Completion/Unix/Command/_df index 2586f4358..a31145cd4 100644 --- a/Completion/Unix/Command/_df +++ b/Completion/Unix/Command/_df @@ -28,32 +28,63 @@ if _pick_variant gnu=GNU unix --version; then {-H,--si}'[human readable format, but use powers of 1000 not 1024]' {-i,--inodes}'[list inode information instead of block usage]' ) -elif [[ "$OSTYPE" == (darwin|freebsd|dragonfly)* ]]; then +elif [[ "$OSTYPE" == (darwin|dragonfly|freebsd|netbsd*|openbsd)* ]]; then args=( - '(-b -g -H -h -k -m)-b[use 512-byte blocks (default)]' - '(-b -g -H -h -k -m)-g[use 1024^3-byte blocks]' - '(-b -g -H -h -k -m)-H[human-readable output (base 10)]' - '(-b -g -H -h -k -m)-h[human-readable output (base 2)]' - '(-b -g -H -h -k -m)-k[use 1024-byte blocks]' - '(-b -g -H -h -k -m)-m[use 1024*1024-byte blocks]' - '-P[POSIX compliant output]' - '-a[show all mount points]' - '-c[display a grand total]' - '-i[include inode usage statistics (default)]' + '(-b -g -H -h -k -m --si)-h[human-readable output (base 2)]' + '(-b -g -H -h -k -m --si)-k[use 1024-byte blocks]' + '(-G -i -P)-P[POSIX compliant output]' + '(-G -i -P)-i[include inode usage statistics (default)]' '-l[only display locally-mounted file systems]' '-n[use previously obtained statistics]' '*:files:_umountable' ) spec='[only display file systems of specified types]:file system type:->fslist' case "$OSTYPE" in + (darwin*|dragonfly*|freebsd*|netbsd*) + args+=( + '-a[show all mount points]' + '(-b -g -H -h -k -m --si)-g[use 1024^3-byte blocks]' + '(-b -g -H -h -k -m --si)-m[use 1024*1024-byte blocks]' + ) + ;| + (darwin*|dragonfly*|freebsd*) + args+=( + '(-b -g -H -h -k -m --si)-b[use 512-byte blocks (default)]' + '(-b -g -H -h -k -m --si)-H[human-readable output (base 10)]' + ) + ;| + (darwin*|freebsd*) + args+=( + '-c[display a grand total]' + ) + ;| (darwin*) args+=( "-T+$spec" "!-t+$spec" # obsolete ) ;; - (freebsd*|dragonfly*) - args+=( "-t+$spec" '-T[include file system type]' ) + (dragonfly*|freebsd*|netbsd*|openbsd*) + args+=( + "-t+$spec" + ) + ;| + (dragonfly*|freebsd*) + args+=( + '-T[include file system type]' + ) + ;| + (freebsd*) + args+=( + '--libxo[generate output via libxo]' + '(-b -g -H -h -k -m --si)--si[human-readable output (base 10)]' + '-,[separate thousands]' + ) + ;; + (netbsd*) + args+=( + '(-G -i -P)-G[display all fields in statvfs]' + ) ;; esac else