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

diff --git a/cd/526693f5c2d0caeb819a336f306ead5dac8287 b/cd/526693f5c2d0caeb819a336f306ead5dac8287
new file mode 100644 (file)
index 0000000..c55f7bc
--- /dev/null
+++ b/cd/526693f5c2d0caeb819a336f306ead5dac8287
@@ -0,0 +1,77 @@
+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 E365E6DE0FF8\r
+ for <notmuch@notmuchmail.org>; Wed, 10 Feb 2016 08:32:10 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.018\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.018 tagged_above=-999 required=5\r
+ tests=[AWL=-0.018] 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 F9Zx95u-FQqD for <notmuch@notmuchmail.org>;\r
+ Wed, 10 Feb 2016 08:32:09 -0800 (PST)\r
+Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 392006DE0BF6\r
+ for <notmuch@notmuchmail.org>; Wed, 10 Feb 2016 08:32:09 -0800 (PST)\r
+Received: from fifthhorseman.net (unknown [38.109.115.130])\r
+ by che.mayfirst.org (Postfix) with ESMTPSA id 04F90F997;\r
+ Wed, 10 Feb 2016 11:31:56 -0500 (EST)\r
+Received: by fifthhorseman.net (Postfix, from userid 1000)\r
+ id 037FF1FF3A; Wed, 10 Feb 2016 11:31:57 -0500 (EST)\r
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>\r
+To: David Bremner <david@tethera.net>, Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH v3 04/16] Provide _notmuch_crypto_{set,get}_gpg_path\r
+In-Reply-To: <87r3gkvlec.fsf@maritornes.cs.unb.ca>\r
+References: <1454272801-23623-1-git-send-email-dkg@fifthhorseman.net>\r
+ <1454272801-23623-5-git-send-email-dkg@fifthhorseman.net>\r
+ <87r3gkvlec.fsf@maritornes.cs.unb.ca>\r
+User-Agent: Notmuch/0.21+72~gd8c4f1c (http://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Wed, 10 Feb 2016 11:31:56 -0500\r
+Message-ID: <87a8n8o7b7.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: Wed, 10 Feb 2016 16:32:11 -0000\r
+\r
+On Wed 2016-02-10 06:45:47 -0500, David Bremner wrote:\r
+> Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:\r
+>\r
+>> +#define try_gpg_path(z) if (test_for_executable(z)) return z\r
+>> +    try_gpg_path("gpg2");\r
+>> +    try_gpg_path("gpg");\r
+>> +#undef try_gpg_path\r
+>> +    return NULL;\r
+>> +}\r
+>\r
+> I think I'd prefer just inlining these two ifs.\r
+>\r
+>> +notmuch_status_t\r
+>> +_notmuch_crypto_set_gpg_path (_notmuch_crypto_t *crypto, const char* gpg_path)\r
+>> +{\r
+>> +    /* return success if this matches what is already configured */\r
+>> +    if ((!gpg_path && !crypto->gpg_path) ||\r
+>> +   (gpg_path && crypto->gpg_path && 0 == strcmp(gpg_path, crypto->gpg_path)))\r
+>> +   return NOTMUCH_STATUS_SUCCESS;\r
+>\r
+> these changes probably need a pass of uncrustify or equivalent.\r
+\r
+I've made these changes in my working copy; i'll publish them as part of\r
+v4 soon.\r
+\r
+   --dkg\r