[Patch v3 3/8] cli: let the user know which protocol is unknown or unsupported

diff --git a/92/8ca2290881765d5b4ac49695c9d6e7ee1b9c26 b/92/8ca2290881765d5b4ac49695c9d6e7ee1b9c26
new file mode 100644 (file)
index 0000000..2c91e67
--- /dev/null
+++ b/92/8ca2290881765d5b4ac49695c9d6e7ee1b9c26
@@ -0,0 +1,71 @@
+Return-Path: <bremner@tethera.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 EDEAE6DE0A94\r
+ for <notmuch@notmuchmail.org>; Mon, 14 Dec 2015 05:39:12 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.313\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.313 tagged_above=-999 required=5 tests=[AWL=0.238,\r
+  RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] 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 3dpSfBSUGSnV for <notmuch@notmuchmail.org>;\r
+ Mon, 14 Dec 2015 05:39:11 -0800 (PST)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 29EF26DE09ED\r
+ for <notmuch@notmuchmail.org>; Mon, 14 Dec 2015 05:39:10 -0800 (PST)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1a8TLE-0008ES-CU; Mon, 14 Dec 2015 08:39:04 -0500\r
+Received: (nullmailer pid 31798 invoked by uid 1000);\r
+ Mon, 14 Dec 2015 13:39:05 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v3 3/8] cli: let the user know which protocol is unknown or\r
+ unsupported\r
+Date: Mon, 14 Dec 2015 09:38:52 -0400\r
+Message-Id: <1450100337-31655-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.6.2\r
+In-Reply-To: <1450100337-31655-1-git-send-email-david@tethera.net>\r
+References: <1450100337-31655-1-git-send-email-david@tethera.net>\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: Mon, 14 Dec 2015 13:39:13 -0000\r
+\r
+From: Jani Nikula <jani@nikula.org>\r
+\r
+The current error message is not helpful.\r
+---\r
+ crypto.c | 3 ++-\r
+ 1 file changed, 2 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/crypto.c b/crypto.c\r
+index da0289d..feae949 100644\r
+--- a/crypto.c\r
++++ b/crypto.c\r
+@@ -81,7 +81,8 @@ notmuch_crypto_get_context (notmuch_crypto_t *crypto, const char *protocol)\r
+           return protocols[i].get_context (crypto);\r
+     }\r
+ \r
+-    fprintf (stderr, "Unknown or unsupported cryptographic protocol.\n");\r
++    fprintf (stderr, "Unknown or unsupported cryptographic protocol %s.\n",\r
++           protocol);\r
+ \r
+     return NULL;\r
+ }\r
+-- \r
+2.6.2\r
+\r