From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-37100-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 17982 invoked by alias); 13 Nov 2015 04:44:08 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 37100
Received: (qmail 17996 invoked from network); 13 Nov 2015 04:44:08 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
	T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no
	version=3.4.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=date:from:to:subject:message-id:mime-version:content-type
         :content-disposition:user-agent;
        bh=/eG2c8Ehszs92WECVJTmj1vrBSTF6JM528MX5r7+myc=;
        b=a6XragN4RRcig53HSn6du0ChE2BpiC+o/qA8/TfUi6EIiI5lW+AJxQ/VQB5NijJTBI
         +kw5GCWDIKAx53T7yoHIEc1GXgIjWuQMgHp3OgfFvjHUS2Mlvf9UfWCPUB8ks2g6VerZ
         R31RkoZrR3/fAfWn5gjVfmECzMWKTt2qCJoWVPHv6MtgqrVFyFkTv57xeycUSKJOSOhl
         7bNfuN0kpYpVi62ojDapkBYoGrwza+BvppQtX/rFhBuw4jLJm5MnQ2oKZxbLXnlfQRMx
         TxvJQ8zURjSeu1UjwYu7XofuswgYR70TgUH22B/opVZ5qKZn4EGR2JCy3Mw4VdoPD9fI
         SYCw==
X-Received: by 10.60.150.237 with SMTP id ul13mr11385919oeb.49.1447389844328;
        Thu, 12 Nov 2015 20:44:04 -0800 (PST)
Date: Thu, 12 Nov 2015 22:44:02 -0600
From: Matthew Martin <phy1729@gmail.com>
To: zsh-workers@zsh.org
Subject: [patch] sysctl update for OpenBSD
Message-ID: <20151113044402.GA24499@CptOrmolo.darkstar>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.24 (2015-08-30)

-w hasn't been a valid flag since 4.2 so it should be safe to just kill
it ;). The :# * bit in _cache_sysctlvars is because kern.version has
a newline in it's value.

- Matthew Martin


diff --git a/Completion/Unix/Command/_sysctl b/Completion/Unix/Command/_sysctl
index ff3312f..9d9e8b9 100644
--- a/Completion/Unix/Command/_sysctl
+++ b/Completion/Unix/Command/_sysctl
@@ -34,13 +34,13 @@ case $OSTYPE in
       '(-n -p -a -A)*:sysctl variable:_files -W /proc/sys'
   ;;
   openbsd*)
-    : ${(A)_cache_sysctlvars:=${${(f)"$(sysctl -a)"}%% *}}
-    _arguments -s -A "-*" \
-      '(-w -A *)-a[list all string and integer variables]' \
-      '(-w -a *)-A[list all known variables]' \
-      '(-w)-n[show only values]' \
-      '(-a -A -n)-w[write variable]' \
-      '(-a -A)*:sysctl variable:_multi_parts ${words[(r)-w]:+-S=} -i . _cache_sysctlvars'
+    : ${(A)_cache_sysctlvars:=${${${(f)"$(sysctl -a 2>/dev/null)"}%%=*}:# *}}
+    _arguments -S -s -A "-*" \
+      '(-A -q *)-a[list all string and integer variables]' \
+      '(-a -q *)-A[list all known variables]' \
+      '-n[show only values]' \
+      '(-a -A)-q[suppress all output when setting a variable]' \
+      '(-a -A)*:sysctl variable:_multi_parts -i -S = -q . _cache_sysctlvars'
   ;;
   *)
     _default