[RFC 4/5] cli: add notmuch config append command to append to string list configs

diff --git a/da/b4ed720aabb1905194ab6655ef730411934f48 b/da/b4ed720aabb1905194ab6655ef730411934f48
new file mode 100644 (file)
index 0000000..2b9e83f
--- /dev/null
+++ b/da/b4ed720aabb1905194ab6655ef730411934f48
@@ -0,0 +1,155 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id D0D126DE191D\r
+ for <notmuch@notmuchmail.org>; Tue,  3 Nov 2015 11:50:27 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.542\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.542 tagged_above=-999 required=5 tests=[AWL=0.178,\r
+  DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id nNVzYz3QnOZh for <notmuch@notmuchmail.org>;\r
+ Tue,  3 Nov 2015 11:50:26 -0800 (PST)\r
+Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com\r
+ [209.85.212.176])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id CADC86DE13DA\r
+ for <notmuch@notmuchmail.org>; Tue,  3 Nov 2015 11:50:17 -0800 (PST)\r
+Received: by wikq8 with SMTP id q8so78806578wik.1\r
+ for <notmuch@notmuchmail.org>; Tue, 03 Nov 2015 11:50:16 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=nikula_org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references\r
+ :in-reply-to:references;\r
+ bh=z9SveoyXSbFAFaDD1ocYZR0BU9Q76zFgrdIJNYNIhCI=;\r
+ b=oz2iGKrR4ob1PavAINlcj8zeyQ5s8KGlxBqJbz61KkUUns+upeuhQklC8mNffSZ7FG\r
+ uiEitC8URwXiJNYtR/cyaesWwDAGGZKg4zhqvx64ouHt/wFqj3TvaFs0PED9ee+/aZZ/\r
+ IbKVnsWLJi9CkQ8BJVtEBEqObTvU+REP9/B+KKoXMLzEh0G1+XwYaV2ejmysNozL18pD\r
+ 5HJnmbDEjD/4YtLsurU/i75DTpakOXA42p4p1IArBGiP98ozDqrps9rWRf8Ce5ZsQJS2\r
+ +W8s8BUmEjwC/23u9ZhScynX01A+Q3GeBw7QCkWklgB/YOTzBBDq8cY3V2SJJm/v5Asp\r
+ F9NA==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references:in-reply-to:references;\r
+ bh=z9SveoyXSbFAFaDD1ocYZR0BU9Q76zFgrdIJNYNIhCI=;\r
+ b=HD71Quo5ZWzCp6MMDg+hDLojgsYnqfR5dn/WeZmnBsd/Ys6ZoPibPE4y1n51P4nlYx\r
+ ps7eEqFnezEFrIbcutq/1cAIDXd/fUsLGV68cN2cZSAIVVAgGXLGhgwkFE0Inmpxp++k\r
+ wYQqyn7FKXFXbl+Ty1ay9LQuipnsKuJWPyMNOIKvpBhp40FGq6/ASOC7YElYLJyqKnK+\r
+ QJchOndpp8ddnJ1a5C1YXO2uEgB5QunfXV5LXPLquIUipy/9gHnBztzBEVhlVck6tWgZ\r
+ cVJIN/qCGdQRbq+xr1BbpDtMp1hsNjOCaE3wA7b3LMQhVVkvkt28JLxo9DTe67Rq3R6y\r
+ u//w==\r
+X-Gm-Message-State:\r
+ ALoCoQkkh8Qf+Q1WVtq+kbDOQCFpfleHpkheORotVIMoRbUj4v08gZcMtOrsrWtTxeNBxZwEYY7x\r
+X-Received: by 10.194.175.226 with SMTP id cd2mr35732863wjc.30.1446580216139; \r
+ Tue, 03 Nov 2015 11:50:16 -0800 (PST)\r
+Received: from localhost (mobile-access-bceec0-208.dhcp.inet.fi.\r
+ [188.238.192.208])\r
+ by smtp.gmail.com with ESMTPSA id h198sm24928364wmd.9.2015.11.03.11.50.15\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Tue, 03 Nov 2015 11:50:15 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [RFC 4/5] cli: add notmuch config append command to append to string\r
+ list configs\r
+Date: Tue,  3 Nov 2015 21:49:32 +0200\r
+Message-Id:\r
+ <0fadf414bc7086c5abddc3cbdd2c9da5f286f6ad.1446579858.git.jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <cover.1446579858.git.jani@nikula.org>\r
+References: <cover.1446579858.git.jani@nikula.org>\r
+In-Reply-To: <cover.1446579858.git.jani@nikula.org>\r
+References: <cover.1446579858.git.jani@nikula.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 03 Nov 2015 19:50:28 -0000\r
+\r
+Make it easy to add new entries to string list configs. For example,\r
+'notmuch config append new.ignore my-non-mail-file'.\r
+---\r
+ notmuch-config.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++\r
+ 1 file changed, 47 insertions(+)\r
+\r
+diff --git a/notmuch-config.c b/notmuch-config.c\r
+index d252bb25d4bb..96c73b0cc2ac 100644\r
+--- a/notmuch-config.c\r
++++ b/notmuch-config.c\r
+@@ -831,6 +831,46 @@ notmuch_config_command_set (notmuch_config_t *config, char *item, int argc, char\r
+ }\r
+ \r
+ static int\r
++notmuch_config_command_append (notmuch_config_t *config, char *item,\r
++                             int argc, char *argv[])\r
++{\r
++    char **value, **new_value;\r
++    size_t i, length, new_length;\r
++    char *group, *key;\r
++\r
++    if (_item_split (item, &group, &key))\r
++      return 1;\r
++\r
++    value = g_key_file_get_string_list (config->key_file, group, key,\r
++                                      &length, NULL);\r
++    if (value == NULL)\r
++      length = 0;\r
++\r
++    new_length = length + argc;\r
++    new_value = talloc_size (NULL, new_length * sizeof (char *));\r
++    if (! new_value)\r
++      return 1;\r
++\r
++    for (i = 0; i < new_length; i++) {\r
++      if (i < length)\r
++          new_value[i] = value[i];\r
++      else\r
++          new_value[i] = argv[i - length];\r
++    }\r
++\r
++    if (new_length == 1)\r
++      g_key_file_set_string (config->key_file, group, key, new_value[0]);\r
++    else\r
++      g_key_file_set_string_list (config->key_file, group, key,\r
++                                  (const gchar **) new_value, new_length);\r
++\r
++    g_strfreev (value);\r
++    talloc_free (new_value);\r
++\r
++    return notmuch_config_save (config);\r
++}\r
++\r
++static int\r
+ notmuch_config_command_list (notmuch_config_t *config)\r
+ {\r
+     char **groups;\r
+@@ -905,6 +945,13 @@ notmuch_config_command (notmuch_config_t *config, int argc, char *argv[])\r
+           return EXIT_FAILURE;\r
+       }\r
+       ret = notmuch_config_command_set (config, argv[1], argc - 2, argv + 2);\r
++    } else if (strcmp (argv[0], "append") == 0) {\r
++      if (argc < 3) {\r
++          fprintf (stderr, "Error: notmuch config append requires at least "\r
++                   "two arguments.\n");\r
++          return EXIT_FAILURE;\r
++      }\r
++      ret = notmuch_config_command_append (config, argv[1], argc - 2, argv + 2);\r
+     } else if (strcmp (argv[0], "list") == 0) {\r
+       ret = notmuch_config_command_list (config);\r
+     } else {\r
+-- \r
+2.1.4\r
+\r