46/1fb489d4a62312a9abcdf2c04ce4d8a9e28945

   1 Return-Path: <jani@nikula.org>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 215E1431FDE\r
   6         for <notmuch@notmuchmail.org>; Sat,  1 Nov 2014 04:30:59 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
   9 X-Spam-Flag: NO\r
  10 X-Spam-Score: -0.7\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  13         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id MJrBvAGwOU0R for <notmuch@notmuchmail.org>;\r
  17         Sat,  1 Nov 2014 04:30:55 -0700 (PDT)\r
  18 Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com\r
  19         [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id C0773431FD0\r
  22         for <notmuch@notmuchmail.org>; Sat,  1 Nov 2014 04:30:54 -0700 (PDT)\r
  23 Received: by mail-wi0-f173.google.com with SMTP id n3so3147193wiv.6\r
  24         for <notmuch@notmuchmail.org>; Sat, 01 Nov 2014 04:30:53 -0700 (PDT)\r
  25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  26         d=1e100.net; s=20130820;\r
  27         h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
  28         :references:in-reply-to:references;\r
  29         bh=g7cnwjxUcYpCo/Qdphgdt1n1EDzuqstDj1y8AevAUHw=;\r
  30         b=YnZi0hlLvdJMksfDQ2OhXo1OX430WwcCsM1vUZwME8IhK95W8sSI1fLbZRChQ/Qd22\r
  31         VJs1LTUSZxcVUJAOCEJZs9Q2wminLn9h+sIdVshha5Xa4qUui6dQrLobptS1Aje+UTKf\r
  32         1Y0pgmKd873yJ5/5hqvU14pCWIcVvPUa84YypWfI/PiSAbeqU2K/WfiP6ByKuZ7TP/L/\r
  33         HTb4YgWreC4Q5pJTS0dNNFp71pEFwIs/qI2FUgwn88Z3ymKV9Aq3A2JtfXUZ/ZHVFQnz\r
  34         VacpeEp5+xOwlfihvdfKSYjgvdZN7kWa14PW4L2ZSxbdrGMEM2phMnBPlNYoZNCCi8dG\r
  35         +49Q==\r
  36 X-Gm-Message-State:\r
  37  ALoCoQkkfwZSF5tlzf6dZw1IELyQHT31S/EgfScQIuGlxgYtvoIChnqL9YbBJpNwyohpIRrsQqRm\r
  38 X-Received: by 10.180.106.104 with SMTP id gt8mr3317542wib.51.1414841453728;\r
  39         Sat, 01 Nov 2014 04:30:53 -0700 (PDT)\r
  40 Received: from localhost (dsl-hkibrasgw2-58c36d-48.dhcp.inet.fi.\r
  41         [88.195.109.48]) by mx.google.com with ESMTPSA id\r
  42         gg18sm1657240wic.21.2014.11.01.04.30.52 for <multiple recipients>\r
  43         (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
  44         Sat, 01 Nov 2014 04:30:53 -0700 (PDT)\r
  45 From: Jani Nikula <jani@nikula.org>\r
  46 To: Michal Sojka <sojkam1@fel.cvut.cz>\r
  47 Subject: [RFC PATCH 1/2] cli: add support for hierarchical command line option\r
  48         arrays\r
  49 Date: Sat,  1 Nov 2014 13:30:47 +0200\r
  50 Message-Id:\r
  51  <b63d5006bffad50dead14bdfdaf0529911807fa9.1414839970.git.jani@nikula.org>\r
  52 X-Mailer: git-send-email 2.1.1\r
  53 In-Reply-To: <cover.1414839970.git.jani@nikula.org>\r
  54 References: <87egtn2s4z.fsf@steelpick.2x.cz>\r
  55         <cover.1414839970.git.jani@nikula.org>\r
  56 In-Reply-To: <cover.1414839970.git.jani@nikula.org>\r
  57 References: <cover.1414839970.git.jani@nikula.org>\r
  58 Cc: notmuch@notmuchmail.org\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Sat, 01 Nov 2014 11:30:59 -0000\r
  72 \r
  73 NOTMUCH_OPT_INHERIT expects a notmuch_opt_desc_t * pointer in\r
  74 output_var.\r
  75 ---\r
  76  command-line-arguments.c | 11 +++++++----\r
  77  command-line-arguments.h |  1 +\r
  78  2 files changed, 8 insertions(+), 4 deletions(-)\r
  79 \r
  80 diff --git a/command-line-arguments.c b/command-line-arguments.c\r
  81 index c6f7269603cb..eb977d0a6fa9 100644\r
  82 --- a/command-line-arguments.c\r
  83 +++ b/command-line-arguments.c\r
  84 @@ -122,16 +122,19 @@ parse_position_arg (const char *arg_str, int pos_arg_index,\r
  85   */\r
  86  \r
  87  notmuch_bool_t\r
  88 -parse_option (const char *arg,\r
  89 -             const notmuch_opt_desc_t *options) {\r
  90 +parse_option (const char *_arg, const notmuch_opt_desc_t *options)\r
  91 +{\r
  92 +    const char *arg = _arg + 2; /* _arg starts with -- */\r
  93  \r
  94      assert(arg);\r
  95      assert(options);\r
  96  \r
  97 -    arg += 2;\r
  98 -\r
  99      const notmuch_opt_desc_t *try;\r
 100      for (try = options; try->opt_type != NOTMUCH_OPT_END; try++) {\r
 101 +       if (try->opt_type == NOTMUCH_OPT_INHERIT &&\r
 102 +           parse_option (_arg, try->output_var))\r
 103 +           return TRUE;\r
 104 +\r
 105         if (! try->name)\r
 106             continue;\r
 107  \r
 108 diff --git a/command-line-arguments.h b/command-line-arguments.h\r
 109 index 6444129ad2d0..309aaf2b37b8 100644\r
 110 --- a/command-line-arguments.h\r
 111 +++ b/command-line-arguments.h\r
 112 @@ -5,6 +5,7 @@\r
 113  \r
 114  enum notmuch_opt_type {\r
 115      NOTMUCH_OPT_END = 0,\r
 116 +    NOTMUCH_OPT_INHERIT,       /* another options table */\r
 117      NOTMUCH_OPT_BOOLEAN,       /* --verbose              */\r
 118      NOTMUCH_OPT_INT,           /* --frob=8               */\r
 119      NOTMUCH_OPT_KEYWORD,       /* --format=raw|json|text */\r
 120 -- \r
 121 2.1.1\r
 122 \r