cf/709d1f8c7887d3ee8b5bffc1d320c1593e4d7a

   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 E2299431FB6\r
   6         for <notmuch@notmuchmail.org>; Sat,  6 Sep 2014 05:53:42 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id 6AHgVXx+KsPM for <notmuch@notmuchmail.org>;\r
  16         Sat,  6 Sep 2014 05:53:37 -0700 (PDT)\r
  17 Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com\r
  18         [209.85.212.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  19         (No client certificate requested)\r
  20         by olra.theworths.org (Postfix) with ESMTPS id 30321431FBC\r
  21         for <notmuch@notmuchmail.org>; Sat,  6 Sep 2014 05:53:37 -0700 (PDT)\r
  22 Received: by mail-wi0-f180.google.com with SMTP id ex7so609183wid.13\r
  23         for <notmuch@notmuchmail.org>; Sat, 06 Sep 2014 05:53:33 -0700 (PDT)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=1e100.net; s=20130820;\r
  26         h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
  27         bh=Uq5Jq31quR31nh5r9iX/mSJrDDNveWaNZkrAENfogdM=;\r
  28         b=BYt8xdHFG0K2ihWGCm9rKJxl8ynRl/naJYs+VcxxwT+HLjjsETOGM9LgSRBAXSCAfc\r
  29         GhJLqNR6am9hKCzndj3e9Hvos6fIBM+ekIqGpe0LERx8y8b78byFQicm2JvlaqtqYUc7\r
  30         wJQRzTkJENHvhwv204uE+jEQkVmWL2L37/xK0AqnjhvYDm15kGDUOor9ICxaS52yQ1sl\r
  31         fX12ot3r616sEIPhIivdTw5F+6TkCvvio6bL2jlutAf0RQp/LTs6oswHc2nwVMN8ySmZ\r
  32         AHfrEW8WPZWheBpAph29ZP3TqUQAcPKqsUMYVFcbWbcwtn2CEpEVCVJsjDb7tSqjH7k3\r
  33         omHw==\r
  34 X-Gm-Message-State:\r
  35  ALoCoQnTzIBYoH92qkTbeVPhT33deUAbLOtLA2rREar4BZiwY6hLL9/wvaxtPnGRw9GR6ESnOpxb\r
  36 X-Received: by 10.180.186.10 with SMTP id fg10mr9898874wic.20.1410008012430;\r
  37         Sat, 06 Sep 2014 05:53:32 -0700 (PDT)\r
  38 Received: from localhost (dsl-hkibrasgw2-58c374-75.dhcp.inet.fi.\r
  39         [88.195.116.75])\r
  40         by mx.google.com with ESMTPSA id r8sm4483908wjy.20.2014.09.06.05.53.31\r
  41         for <multiple recipients>\r
  42         (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
  43         Sat, 06 Sep 2014 05:53:31 -0700 (PDT)\r
  44 From: Jani Nikula <jani@nikula.org>\r
  45 To: notmuch@notmuchmail.org\r
  46 Subject: [PATCH 1/3] cli: add support for parsing multiple keyword arguments\r
  47 Date: Sat,  6 Sep 2014 15:53:28 +0300\r
  48 Message-Id: <1410008010-3770-1-git-send-email-jani@nikula.org>\r
  49 X-Mailer: git-send-email 2.1.0\r
  50 X-BeenThere: notmuch@notmuchmail.org\r
  51 X-Mailman-Version: 2.1.13\r
  52 Precedence: list\r
  53 List-Id: "Use and development of the notmuch mail system."\r
  54         <notmuch.notmuchmail.org>\r
  55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  56         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  58 List-Post: <mailto:notmuch@notmuchmail.org>\r
  59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  61         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  62 X-List-Received-Date: Sat, 06 Sep 2014 12:53:43 -0000\r
  63 \r
  64 This allows having multiple --foo=bar --foo=baz options on the command\r
  65 line, with the corresponding values OR'd together.\r
  66 ---\r
  67  command-line-arguments.c | 6 +++++-\r
  68  command-line-arguments.h | 1 +\r
  69  2 files changed, 6 insertions(+), 1 deletion(-)\r
  70 \r
  71 diff --git a/command-line-arguments.c b/command-line-arguments.c\r
  72 index 844d6c3d18bf..c6f7269603cb 100644\r
  73 --- a/command-line-arguments.c\r
  74 +++ b/command-line-arguments.c\r
  75 @@ -23,7 +23,10 @@ _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, char next, const char\r
  76      while (keywords->name) {\r
  77         if (strcmp (arg_str, keywords->name) == 0) {\r
  78             if (arg_desc->output_var) {\r
  79 -               *((int *)arg_desc->output_var) = keywords->value;\r
  80 +               if (arg_desc->opt_type == NOTMUCH_OPT_KEYWORD_FLAGS)\r
  81 +                   *((int *)arg_desc->output_var) |= keywords->value;\r
  82 +               else\r
  83 +                   *((int *)arg_desc->output_var) = keywords->value;\r
  84             }\r
  85             return TRUE;\r
  86         }\r
  87 @@ -152,6 +155,7 @@ parse_option (const char *arg,\r
  88  \r
  89         switch (try->opt_type) {\r
  90         case NOTMUCH_OPT_KEYWORD:\r
  91 +       case NOTMUCH_OPT_KEYWORD_FLAGS:\r
  92             return _process_keyword_arg (try, next, value);\r
  93         case NOTMUCH_OPT_BOOLEAN:\r
  94             return _process_boolean_arg (try, next, value);\r
  95 diff --git a/command-line-arguments.h b/command-line-arguments.h\r
  96 index de1734ad2fdb..085a4923b5fa 100644\r
  97 --- a/command-line-arguments.h\r
  98 +++ b/command-line-arguments.h\r
  99 @@ -8,6 +8,7 @@ enum notmuch_opt_type {\r
 100      NOTMUCH_OPT_BOOLEAN,       /* --verbose              */\r
 101      NOTMUCH_OPT_INT,           /* --frob=8               */\r
 102      NOTMUCH_OPT_KEYWORD,       /* --format=raw|json|text */\r
 103 +    NOTMUCH_OPT_KEYWORD_FLAGS,  /* the above with values OR'd together */\r
 104      NOTMUCH_OPT_STRING,                /* --file=/tmp/gnarf.txt  */\r
 105      NOTMUCH_OPT_POSITION       /* notmuch dump pos_arg   */\r
 106  };\r
 107 -- \r
 108 2.1.0\r
 109 \r