From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-37725-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 8399 invoked by alias); 21 Jan 2016 19:31:40 -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: 37725
Received: (qmail 18998 invoked from network); 21 Jan 2016 19:31:39 -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:cc:subject:message-id:references:mime-version
         :content-type:content-disposition:in-reply-to:user-agent;
        bh=uX08lFczyr0phy+F9+m0jmmKManQkR0xOvQcm/EyuyU=;
        b=ZJ+VZ9VnDSnWwTENNFOUCFwYWQv41h6sMBznbJAeadam4V3bkwWWfJYTwNqLhPRMOD
         wkdL4HPvOitjDqu6GAjq23GkEDegrMalhcG1+jTR98E0h0k0OyLJpO91BHXmBLbrA9FX
         tD9qDx4cTIArr9UX2jO0c2GEFDR8ZFLMctHGMN7f/+upLfXOq39jep6H1Lv3u85XnVPX
         8vk7K6H2zvvIAfY2LpC1qub/6FM1OxrPOvEWDJ0vQxXAMHQpV57UIyvULjYcrkxyD8eI
         P+K8AOTQzhS+1nEA/QKF7/+NGtmm2O5+QjXPX4KMbSELZvyHPz0+DaSWInXHXHIJ8ghR
         O1yA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20130820;
        h=x-gm-message-state:date:from:to:cc:subject:message-id:references
         :mime-version:content-type:content-disposition:in-reply-to
         :user-agent;
        bh=uX08lFczyr0phy+F9+m0jmmKManQkR0xOvQcm/EyuyU=;
        b=KOJwiCMflSMHixYwCDLzbQDXC+WSkmljny0p2ZalwaCAgXT8jwUbB62NhQJmyUMdaK
         ekGnjo+4Ycom7qVLAZNfSOcrGkxJh/sl5IH+xqmG0zer8eagtXT5JEr7zCROX6Lm8Vhk
         9fd92I2pxmhgrYYo5LMcY5EGTjrrACnS+I7/UU8HpcaCpo4UEfk1oUGjqPdD/HC7RcKg
         ruwCjGqmiIxhTkzmZdys+fbUV0zNjDVfVapG7AGv5d2Ko+MwSJIoDZEOGlWw5PyH0Zj6
         mOGLKCIdPBpIxgeXiO9/ZMlKIpPoklZYmJYYL/8ptfeOui3ZxiKzLosqzTIUje1mUQhF
         EhkQ==
X-Gm-Message-State: ALoCoQlaRHyjzN2O1v6eTQLW7kYgGd+lyvM7VB4eOb4PUaAJxnWDwAaGtIwC8ICLv+agZsVWNX6e70AQuvl9+Y/x/iQzi0KJHw==
X-Received: by 10.202.219.10 with SMTP id s10mr33407865oig.27.1453404695656;
        Thu, 21 Jan 2016 11:31:35 -0800 (PST)
Date: Thu, 21 Jan 2016 13:31:34 -0600
From: Matthew Martin <phy1729@gmail.com>
To: Daniel Shahaf <d.s@daniel.shahaf.name>
Cc: zsh-workers@zsh.org
Subject: Re: [patch] _init_d add OpenBSD bits
Message-ID: <20160121193134.GA25505@CptOrmolo.darkstar>
References: <20160110190157.GA4187@CptOrmolo.darkstar>
 <20160113005734.GA24858@tarsus.local2>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160113005734.GA24858@tarsus.local2>
User-Agent: Mutt/1.5.24 (2015-08-30)

On Wed, Jan 13, 2016 at 12:57:34AM +0000, Daniel Shahaf wrote:
> Surely these should be single quotes around the last argument?

Updated diff after a few more comments from Daniel.


diff --git a/Completion/Unix/Command/_init_d b/Completion/Unix/Command/_init_d
index bbf62fc..2bb8d53 100644
--- a/Completion/Unix/Command/_init_d
+++ b/Completion/Unix/Command/_init_d
@@ -1,6 +1,7 @@
 #compdef -p */(init|rc[0-9S]#).d/*
 
 local cmds script
+local -a flags
 
 _compskip=all
 
@@ -41,6 +42,23 @@ if [[ $OSTYPE = freebsd* ]]; then
 
     return 0
   }
+elif [[ $OSTYPE = openbsd* ]]; then
+  (( $+functions[_init_d_fullpath] )) ||
+  _init_d_fullpath() {
+    echo /etc/rc.d/$1
+    return 0
+  }
+
+  (( $+functions[_init_d_get_cmds] )) ||
+  _init_d_get_cmds() {
+    local -a cmds disabled
+
+    cmds=(start stop reload restart check)
+    disabled=(${${${(M)${(f)"$(< $script)"}:#rc_(${(~j:|:)cmds})=NO}#rc_}%=NO})
+    echo ${cmds:|disabled}
+  }
+
+  flags=('-d[print debug information]' '-f[forcibly start the daemon]')
 else
   (( $+functions[_init_d_fullpath] )) ||
   _init_d_fullpath() {
@@ -90,4 +108,4 @@ cmds=( $(_init_d_get_cmds) ) || return
 (( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds ||
     cmds=(start stop)
 
-_sub_commands $cmds
+_arguments -s -A "-*" $flags ':init.d command:_sub_commands $cmds'