From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 2594 invoked from network); 21 May 2021 22:00:51 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 21 May 2021 22:00:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20200801; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Message-ID:Date:Content-ID: Content-Type:MIME-Version:Subject:To:From:Reply-To:Cc: Content-Transfer-Encoding:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=rJtVT2j/2nwF0Ewuf5AUAUAUX4Hh6A76lMFRYQR0BPg=; b=FkPnUcG1SmiF6lLIIowxYnwixA V6CsNOf2F0RGzTAynO2XR2uwzRm5cvvlwY9c7v4mYOUk4h1XemiSACUT8YHVrmTPJwndH/cNqmg/x /v341cs+tU+gd7Ai26sHF9bA28DglxFHDekc3McShvVJEhgXxUM3Z+uhW6hJLgDIohdQ9zKPmGThx b702+PAcDgP8yqDFUKEwBatFlpA5kP/oDIL1kZyNNOJgJ8cwvrpw1eyNIOsDMfN8E+Qrm9wgLqWIt HU+Cfr/+uJR8jDUEQ8UvmIm3SP7+arCboOxCOyXRlcahndn88f2Z3f1UhGmN2DuKBiYPYPr5DM4vk i6nNOApw==; Received: from authenticated user by zero.zsh.org with local id 1lkDCM-000PAL-An; Fri, 21 May 2021 22:00:50 +0000 Received: from authenticated user by zero.zsh.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1lkDC4-000OsE-TW; Fri, 21 May 2021 22:00:33 +0000 Received: from [192.168.178.21] (helo=hydra) by mail.kiddle.eu with esmtp(Exim 4.94.2) (envelope-from ) id 1lkDC1-000GOU-Ri for zsh-workers@zsh.org; Sat, 22 May 2021 00:00:30 +0200 From: Oliver Kiddle To: Zsh workers Subject: PATCH: completion option updates for recent BSD releases MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <63020.1621634429.1@hydra> Date: Sat, 22 May 2021 00:00:29 +0200 Message-ID: <63021-1621634429.856292@LvTm.CHu7.VK88> X-Seq: 48897 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: This patch covers changes in the recent OpenBSD 6.9 and DragonFly 6.0. I also checked NetBSD 9.2 but there were no relevant changes in that. Though I did notice completion for head was missing a couple of options for NetBSD (that were newly added in DragonFly). diff --git a/Completion/Unix/Command/_dhclient b/Completion/Unix/Command/_dhclient index d5ca5b271..e22586b04 100644 --- a/Completion/Unix/Command/_dhclient +++ b/Completion/Unix/Command/_dhclient @@ -20,7 +20,6 @@ case $OSTYPE in openbsd*) args+=( '-i+[ignore values provided by leases for specified options]:options' - '-L+[specify file to write option data too]:file:_files' "-n[don't configure any interfaces]" '-r[release the current lease back to the server it came from]' '-v[verbose log messages]' diff --git a/Completion/Unix/Command/_head b/Completion/Unix/Command/_head index 1e968cc11..f25c97c83 100644 --- a/Completion/Unix/Command/_head +++ b/Completion/Unix/Command/_head @@ -18,7 +18,13 @@ else case $OSTYPE in (freebsd*|darwin*|dragonfly*|netbsd*) args+=( '(-n)-c+[display the first specified bytes]:number of bytes' ) - ;; + ;| + dragonfly*|netbsd*) + args+=( + '(-v)-q[never print headers giving file names]' + '(-q)-v[always print headers giving file names]' + ) + ;; esac fi diff --git a/Completion/Unix/Command/_pgrep b/Completion/Unix/Command/_pgrep index 5b1853e6b..e10f42f53 100644 --- a/Completion/Unix/Command/_pgrep +++ b/Completion/Unix/Command/_pgrep @@ -125,6 +125,10 @@ else fi fi +if [[ $OSTYPE = dragonfly* ]]; then + arguments+=( '(-t)-T[match only processes associated with the current terminal]' ) +fi + arguments+=( $sig_arguments + o '*: :->pname' ) [[ $OSTYPE == linux* ]] || aopts+=( -A '*-' ) diff --git a/Completion/Unix/Command/_ping b/Completion/Unix/Command/_ping index e69173430..b371e808f 100644 --- a/Completion/Unix/Command/_ping +++ b/Completion/Unix/Command/_ping @@ -189,6 +189,7 @@ case ${variant}:${${service#ping}:-4} in args+=( '-E[audible bell for no packet]' '-e[audible bell for each packet]' + '-g[provide a visual display of packets received and lost]' '-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/_sed b/Completion/Unix/Command/_sed index 73227901e..79a010c92 100644 --- a/Completion/Unix/Command/_sed +++ b/Completion/Unix/Command/_sed @@ -109,10 +109,10 @@ else ) ;| openbsd*|freebsd*|netbsd*|dragonfly*) args+=( '(-r -E)'-r$extended ) ;| - darwin*|freebsd*|netbsd*|openbsd*) args+=( '-i+'$inplace ) ;| - darwin*|freebsd*|netbsd*) args+=( '-l[make output line buffered]' ) ;| - freebsd*) args+=( '-u[disable data buffering]' ) ;| - freebsd*|netbsd*) + darwin*|freebsd*|netbsd*|openbsd*|dragonfly*) args+=( '-i+'$inplace ) ;| + darwin*|freebsd*|netbsd*|dragonfly*) args+=( '-l[make output line buffered]' ) ;| + freebsd*|dragonfly*) args+=( '-u[disable data buffering]' ) ;| + freebsd*|netbsd*|dragonfly*) args+=( '-I+[edit files in-place, treating all files as a single input stream]:: :_guard "^(*[@/; \\\]*|?(#c6,)|-*)" "suffix for backup"' ) diff --git a/Completion/Unix/Command/_tail b/Completion/Unix/Command/_tail index 3bfbe37ca..6d6e9b2d5 100644 --- a/Completion/Unix/Command/_tail +++ b/Completion/Unix/Command/_tail @@ -43,7 +43,7 @@ else '(-v)-q[never output headers giving file names]' ) ;| - (netbsd*) + (dragonfly*|netbsd*) args+=( '(-q)-v[always output headers giving file names]' ) ;; esac diff --git a/Completion/Unix/Command/_timeout b/Completion/Unix/Command/_timeout index d0ff085bb..223059e4d 100644 --- a/Completion/Unix/Command/_timeout +++ b/Completion/Unix/Command/_timeout @@ -2,8 +2,8 @@ local args -if [[ $service = g* || $OSTYPE != *bsd* ]]; then - # GNU coreutils as opposed to Free/NetBSD implementation +if [[ $service = g* || $OSTYPE != *(freebsd|netbsd)* ]]; then + # GNU coreutils or DFly as opposed to Free/NetBSD implementation args=( '(-v --verbose)'{-v,--verbose}'[indicate when signal is sent upon timeout]' '(- *)--help[display usage information]' diff --git a/Completion/Unix/Command/_uname b/Completion/Unix/Command/_uname index 0e55ba1c3..96194842a 100644 --- a/Completion/Unix/Command/_uname +++ b/Completion/Unix/Command/_uname @@ -62,13 +62,19 @@ else '-v[print detailed operating system version]' ) case $OSTYPE in - freebsd*|dragonfly*) args+=( '-i[print kernel ident]' ) ;| - freebsd<10->.*) + freebsd*|dragonfly*) args+=( - '-K[print FreeBSD kernel version]' - '-U[print FreeBSD user environment version]' + '-i[print kernel ident]' + '-K[print kernel version]' + '-U[print user environment version]' ) ;| + dragonfly*) + args+=( + '-P[write ABI string for dports / pkgng, including odd-to-even version-munging]' + '-PP[write ABI string for dports / pkgng, without version-munging]' + ) + ;; freebsd<13->.*) args+=( "-b[print kernel's linker-generated build-id]" ) ;;