Re: [PATCH v2 04/16] Provide _notmuch_crypto_{set,get}_gpg_path

diff --git a/17/32c123827fb82d12f6df7b11544b5e9dbd5927 b/17/32c123827fb82d12f6df7b11544b5e9dbd5927
new file mode 100644 (file)
index 0000000..22edae9
--- /dev/null
+++ b/17/32c123827fb82d12f6df7b11544b5e9dbd5927
@@ -0,0 +1,89 @@
+Return-Path: <dkg@fifthhorseman.net>\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 8C4C96DE13DB\r
+ for <notmuch@notmuchmail.org>; Sun, 24 Jan 2016 07:55:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.182\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.182 tagged_above=-999 required=5\r
+ tests=[AWL=-0.182] 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 sXzJCgOOOBkg for <notmuch@notmuchmail.org>;\r
+ Sun, 24 Jan 2016 07:55:26 -0800 (PST)\r
+Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108])\r
+ by arlo.cworth.org (Postfix) with ESMTP id B7E176DE13E3\r
+ for <notmuch@notmuchmail.org>; Sun, 24 Jan 2016 07:55:17 -0800 (PST)\r
+Received: from fifthhorseman.net (h-67-101-29-155.nycm.ny.dynamic.megapath.net\r
+ [67.101.29.155])\r
+ by che.mayfirst.org (Postfix) with ESMTPSA id 5F9D9F991;\r
+ Sun, 24 Jan 2016 10:55:11 -0500 (EST)\r
+Received: by fifthhorseman.net (Postfix, from userid 1000)\r
+ id B0CF420085; Sun, 24 Jan 2016 10:55:12 -0500 (EST)\r
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH v2 04/16] Provide _notmuch_crypto_{set,get}_gpg_path\r
+In-Reply-To: <m2twm357e1.fsf@guru.guru-group.fi>\r
+References: <1453258369-7366-1-git-send-email-dkg@fifthhorseman.net>\r
+ <1453258369-7366-5-git-send-email-dkg@fifthhorseman.net>\r
+ <m2twm357e1.fsf@guru.guru-group.fi>\r
+User-Agent: Notmuch/0.21+67~g41ad7ff (http://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 24 Jan 2016 10:55:12 -0500\r
+Message-ID: <87a8nv7z1b.fsf@alice.fifthhorseman.net>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sun, 24 Jan 2016 15:55:28 -0000\r
+\r
+Thanks for the review, Tomi!\r
+\r
+On Sun 2016-01-24 10:23:02 -0500, Tomi Ollila wrote:\r
+> On Wed, Jan 20 2016, Daniel Kahn Gillmor <dkg@fifthhorseman.net> wrote:\r
+>\r
+>> Use functions to access the gpg_path for a _notmuch_crypto_t object.\r
+>> This lets us return sensible defaults based on the state of the user's\r
+>> machine.\r
+>> ---\r
+>>  notmuch-reply.c | 13 ++++++++++---\r
+>>  notmuch-show.c  | 12 ++++++++++--\r
+>>  util/crypto.c   | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-\r
+>>  util/crypto.h   |  8 +++++++-\r
+>>  4 files changed, 75 insertions(+), 7 deletions(-)\r
+>>\r
+>> diff --git a/util/crypto.c b/util/crypto.c\r
+>> index c18c82c..0b51347 100644\r
+>> --- a/util/crypto.c\r
+>> +++ b/util/crypto.c\r
+>> @@ -21,7 +21,11 @@\r
+>>  \r
+>>  #include "notmuch.h"\r
+>>  #include "crypto.h"\r
+>> +#include "search-path.h"\r
+>>  #include <string.h>\r
+>> +#include <talloc.h>\r
+>> +\r
+>> +#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))\r
+>>  \r
+>>  #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))\r
+>\r
+> duplicate ARRAY_SIZE definition ?\r
+\r
+whoops, thanks for catching that.  I think that got inserted from a git\r
+rebase.  fixing in my local copy now.\r
+\r
+         --dkg\r