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

2016-01-24 Thread Daniel Kahn Gillmor 
Thanks for the review, Tomi!

On Sun 2016-01-24 10:23:02 -0500, Tomi Ollila wrote:
> On Wed, Jan 20 2016, Daniel Kahn Gillmor  wrote:
>
>> Use functions to access the gpg_path for a _notmuch_crypto_t object.
>> This lets us return sensible defaults based on the state of the user's
>> machine.
>> ---
>>  notmuch-reply.c | 13 ++---
>>  notmuch-show.c  | 12 ++--
>>  util/crypto.c   | 49 -
>>  util/crypto.h   |  8 +++-
>>  4 files changed, 75 insertions(+), 7 deletions(-)
>>
>> diff --git a/util/crypto.c b/util/crypto.c
>> index c18c82c..0b51347 100644
>> --- a/util/crypto.c
>> +++ b/util/crypto.c
>> @@ -21,7 +21,11 @@
>>  
>>  #include "notmuch.h"
>>  #include "crypto.h"
>> +#include "search-path.h"
>>  #include 
>> +#include 
>> +
>> +#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
>>  
>>  #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
>
> duplicate ARRAY_SIZE definition ?

whoops, thanks for catching that.  I think that got inserted from a git
rebase.  fixing in my local copy now.

 --dkg
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

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

2016-01-24 Thread Tomi Ollila 
On Wed, Jan 20 2016, Daniel Kahn Gillmor  wrote:

> Use functions to access the gpg_path for a _notmuch_crypto_t object.
> This lets us return sensible defaults based on the state of the user's
> machine.
> ---
>  notmuch-reply.c | 13 ++---
>  notmuch-show.c  | 12 ++--
>  util/crypto.c   | 49 -
>  util/crypto.h   |  8 +++-
>  4 files changed, 75 insertions(+), 7 deletions(-)
>
> diff --git a/util/crypto.c b/util/crypto.c
> index c18c82c..0b51347 100644
> --- a/util/crypto.c
> +++ b/util/crypto.c
> @@ -21,7 +21,11 @@
>  
>  #include "notmuch.h"
>  #include "crypto.h"
> +#include "search-path.h"
>  #include 
> +#include 
> +
> +#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
>  
>  #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))

duplicate ARRAY_SIZE definition ?

>  
> @@ -38,7 +42,7 @@ get_gpg_context (_notmuch_crypto_t *crypto, 
> GMimeCryptoContext **ctx)
>  }
>  
>  /* TODO: GMimePasswordRequestFunc */
> -crypto->gpgctx = g_mime_gpg_context_new (NULL, crypto->gpgpath ? 
> crypto->gpgpath : "gpg");
> +crypto->gpgctx = g_mime_gpg_context_new (NULL, 
> _notmuch_crypto_get_gpg_path(crypto));
>  if (! crypto->gpgctx) {
___
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch

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

2016-01-19 Thread Daniel Kahn Gillmor 
Use functions to access the gpg_path for a _notmuch_crypto_t object.
This lets us return sensible defaults based on the state of the user's
machine.
---
 notmuch-reply.c | 13 ++---
 notmuch-show.c  | 12 ++--
 util/crypto.c   | 49 -
 util/crypto.h   |  8 +++-
 4 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/notmuch-reply.c b/notmuch-reply.c
index eccfb32..793e6f9 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -790,13 +790,15 @@ notmuch_reply_command (notmuch_config_t *config, int 
argc, char *argv[])
.crypto = {
.verify = FALSE,
.decrypt = FALSE,
-   .gpgpath = NULL
+   .gpg_path = NULL
}
 };
 int format = FORMAT_DEFAULT;
 int reply_all = TRUE;
 struct sprinter *sp = NULL;
-
+notmuch_status_t status;
+const char *gpg_path = NULL;
+
 notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_KEYWORD, , "format", 'f',
  (notmuch_keyword_t []){ { "default", FORMAT_DEFAULT },
@@ -845,7 +847,12 @@ notmuch_reply_command (notmuch_config_t *config, int argc, 
char *argv[])
return EXIT_FAILURE;
 }
 
-params.crypto.gpgpath = notmuch_config_get_crypto_gpg_path (config);
+gpg_path = notmuch_config_get_crypto_gpg_path (config);
+status = _notmuch_crypto_set_gpg_path (&(params.crypto), gpg_path);
+if (status != NOTMUCH_STATUS_SUCCESS) {
+   fprintf (stderr, "Error: could not set gpg_path to '%s'.\n", gpg_path);
+   return EXIT_FAILURE;
+}
 
 if (notmuch_database_open (notmuch_config_get_database_path (config),
   NOTMUCH_DATABASE_MODE_READ_ONLY, ))
diff --git a/notmuch-show.c b/notmuch-show.c
index 3c91ece..096fd49 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -1006,13 +1006,15 @@ notmuch_show_command (notmuch_config_t *config, int 
argc, char *argv[])
.crypto = {
.verify = FALSE,
.decrypt = FALSE,
-   .gpgpath = NULL
+   .gpg_path = NULL
},
.include_html = FALSE
 };
 int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;
 int exclude = EXCLUDE_TRUE;
 int entire_thread = ENTIRE_THREAD_DEFAULT;
+notmuch_status_t status;
+const char *gpg_path = NULL;
 
 notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_KEYWORD, _sel, "format", 'f',
@@ -1130,7 +1132,13 @@ notmuch_show_command (notmuch_config_t *config, int 
argc, char *argv[])
return EXIT_FAILURE;
 }
 
-params.crypto.gpgpath = notmuch_config_get_crypto_gpg_path (config);
+
+gpg_path = notmuch_config_get_crypto_gpg_path (config);
+status = _notmuch_crypto_set_gpg_path (&(params.crypto), gpg_path);
+if (status != NOTMUCH_STATUS_SUCCESS) {
+   fprintf (stderr, "Error: could not set gpg_path to '%s'.\n", gpg_path);
+   return EXIT_FAILURE;
+}
 
 if (notmuch_database_open (notmuch_config_get_database_path (config),
   NOTMUCH_DATABASE_MODE_READ_ONLY, ))
diff --git a/util/crypto.c b/util/crypto.c
index c18c82c..0b51347 100644
--- a/util/crypto.c
+++ b/util/crypto.c
@@ -21,7 +21,11 @@
 
 #include "notmuch.h"
 #include "crypto.h"
+#include "search-path.h"
 #include 
+#include 
+
+#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
 
 #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
 
@@ -38,7 +42,7 @@ get_gpg_context (_notmuch_crypto_t *crypto, 
GMimeCryptoContext **ctx)
 }
 
 /* TODO: GMimePasswordRequestFunc */
-crypto->gpgctx = g_mime_gpg_context_new (NULL, crypto->gpgpath ? 
crypto->gpgpath : "gpg");
+crypto->gpgctx = g_mime_gpg_context_new (NULL, 
_notmuch_crypto_get_gpg_path(crypto));
 if (! crypto->gpgctx) {
return NOTMUCH_STATUS_FAILED_CRYPTO_CONTEXT_CREATION;
 }
@@ -88,6 +92,47 @@ _notmuch_crypto_get_gmime_ctx_for_protocol 
(_notmuch_crypto_t *crypto,
 return NOTMUCH_STATUS_UNKNOWN_CRYPTO_PROTOCOL;
 }
 
+const char*
+_notmuch_crypto_get_gpg_path (const _notmuch_crypto_t *crypto)
+{
+if (crypto->gpg_path)
+   return crypto->gpg_path;
+
+#define try_gpg_path(z) if (test_for_executable(z)) return z
+try_gpg_path("gpg2");
+try_gpg_path("gpg");
+#undef try_gpg_path
+return NULL;
+}
+
+notmuch_status_t
+_notmuch_crypto_set_gpg_path (_notmuch_crypto_t *crypto, const char* gpg_path)
+{
+/* return success if this matches what is already configured */
+if ((!gpg_path && !crypto->gpg_path) ||
+   (gpg_path && crypto->gpg_path && 0 == strcmp(gpg_path, 
crypto->gpg_path)))
+   return NOTMUCH_STATUS_SUCCESS;
+
+if (!gpg_path && !test_for_executable(gpg_path))
+   return NOTMUCH_STATUS_FILE_ERROR;
+
+/* clear any existing gpgctx, since things are changing */
+if (crypto->gpgctx) {
+   g_object_unref (crypto->gpgctx);
+   crypto->gpgctx = NULL;
+}
+
+if (crypto->gpg_path) {
+   talloc_free(crypto->gpg_path);
+   crypto->gpg_path = NULL;
+}
+
+