debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-28 13:44:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

indexopts: change _try_decrypt to _decrypt_policy

Browse source 
This terminology makes it clearer what's going on at the API layer,
and paves the way for future changesets that offer more nuanced
decryption policy.
This commit is contained in:
Daniel Kahn Gillmor 2017-12-08 01:23:51 -05:00 committed by David Bremner
parent d3964e81ac
commit b62045a186
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/index.cc
View file

@ -525,7 +525,7 @@ _index_encrypted_mime_part (notmuch_message_t *message,
notmuch_database_t * notmuch = NULL; notmuch_database_t * notmuch = NULL;
GMimeObject *clear = NULL; GMimeObject *clear = NULL;
if (!indexopts || !notmuch_indexopts_get_try_decrypt (indexopts)) if (!indexopts || !notmuch_indexopts_get_decrypt_policy (indexopts))
return; return;
notmuch = _notmuch_message_database (message); notmuch = _notmuch_message_database (message);

10
lib/indexopts.c
View file

@ -36,24 +36,24 @@ notmuch_database_get_default_indexopts (notmuch_database_t *db)
((!(strcasecmp(decrypt, "true"))) || ((!(strcasecmp(decrypt, "true"))) ||
(!(strcasecmp(decrypt, "yes"))) || (!(strcasecmp(decrypt, "yes"))) ||
(!(strcasecmp(decrypt, "1"))))) (!(strcasecmp(decrypt, "1")))))
notmuch_indexopts_set_try_decrypt (ret, true); notmuch_indexopts_set_decrypt_policy (ret, true);
free (decrypt); free (decrypt);
return ret; return ret;
} }
notmuch_status_t notmuch_status_t
notmuch_indexopts_set_try_decrypt (notmuch_indexopts_t *indexopts, notmuch_indexopts_set_decrypt_policy (notmuch_indexopts_t *indexopts,
notmuch_bool_t try_decrypt) notmuch_bool_t decrypt_policy)
{ {
if (!indexopts) if (!indexopts)
return NOTMUCH_STATUS_NULL_POINTER; return NOTMUCH_STATUS_NULL_POINTER;
indexopts->crypto.decrypt = try_decrypt; indexopts->crypto.decrypt = decrypt_policy;
return NOTMUCH_STATUS_SUCCESS; return NOTMUCH_STATUS_SUCCESS;
} }
notmuch_bool_t notmuch_bool_t
notmuch_indexopts_get_try_decrypt (const notmuch_indexopts_t *indexopts) notmuch_indexopts_get_decrypt_policy (const notmuch_indexopts_t *indexopts)
{ {
if (!indexopts) if (!indexopts)
return false; return false;

8
lib/notmuch.h
View file

@ -2244,17 +2244,17 @@ notmuch_database_get_default_indexopts (notmuch_database_t *db);
* @since libnotmuch 5.1 (notmuch 0.26) * @since libnotmuch 5.1 (notmuch 0.26)
*/ */
notmuch_status_t notmuch_status_t
notmuch_indexopts_set_try_decrypt (notmuch_indexopts_t *indexopts, notmuch_indexopts_set_decrypt_policy (notmuch_indexopts_t *indexopts,
notmuch_bool_t try_decrypt); notmuch_bool_t decrypt_policy);
/** /**
* Return whether to decrypt encrypted parts while indexing. * Return whether to decrypt encrypted parts while indexing.
* see notmuch_indexopts_set_try_decrypt. * see notmuch_indexopts_set_decrypt_policy.
* *
* @since libnotmuch 5.1 (notmuch 0.26) * @since libnotmuch 5.1 (notmuch 0.26)
*/ */
notmuch_bool_t notmuch_bool_t
notmuch_indexopts_get_try_decrypt (const notmuch_indexopts_t *indexopts); notmuch_indexopts_get_decrypt_policy (const notmuch_indexopts_t *indexopts);
/** /**
* Destroy a notmuch_indexopts_t object. * Destroy a notmuch_indexopts_t object.

4
notmuch-client.h
View file

@ -500,8 +500,8 @@ int notmuch_minimal_options (const char* subcommand_name,
/* the state chosen by the user invoking one of the notmuch /* the state chosen by the user invoking one of the notmuch
* subcommands that does indexing */ * subcommands that does indexing */
struct _notmuch_client_indexing_cli_choices { struct _notmuch_client_indexing_cli_choices {
bool try_decrypt; bool decrypt_policy;
bool try_decrypt_set; bool decrypt_policy_set;
notmuch_indexopts_t * opts; notmuch_indexopts_t * opts;
}; };
extern struct _notmuch_client_indexing_cli_choices indexing_cli_choices; extern struct _notmuch_client_indexing_cli_choices indexing_cli_choices;

12
notmuch.c
View file

@ -99,8 +99,8 @@ int notmuch_minimal_options (const char *subcommand_name,
struct _notmuch_client_indexing_cli_choices indexing_cli_choices = { }; struct _notmuch_client_indexing_cli_choices indexing_cli_choices = { };
const notmuch_opt_desc_t notmuch_shared_indexing_options [] = { const notmuch_opt_desc_t notmuch_shared_indexing_options [] = {
{ .opt_bool = &indexing_cli_choices.try_decrypt, { .opt_bool = &indexing_cli_choices.decrypt_policy,
.present = &indexing_cli_choices.try_decrypt_set, .present = &indexing_cli_choices.decrypt_policy_set,
.name = "decrypt" }, .name = "decrypt" },
{ } { }
}; };
@ -111,21 +111,21 @@ notmuch_process_shared_indexing_options (notmuch_database_t *notmuch, g_mime_3_u
{ {
if (indexing_cli_choices.opts == NULL) if (indexing_cli_choices.opts == NULL)
indexing_cli_choices.opts = notmuch_database_get_default_indexopts (notmuch); indexing_cli_choices.opts = notmuch_database_get_default_indexopts (notmuch);
if (indexing_cli_choices.try_decrypt_set) { if (indexing_cli_choices.decrypt_policy_set) {
notmuch_status_t status; notmuch_status_t status;
if (indexing_cli_choices.opts == NULL) if (indexing_cli_choices.opts == NULL)
return NOTMUCH_STATUS_OUT_OF_MEMORY; return NOTMUCH_STATUS_OUT_OF_MEMORY;
status = notmuch_indexopts_set_try_decrypt (indexing_cli_choices.opts, indexing_cli_choices.try_decrypt); status = notmuch_indexopts_set_decrypt_policy (indexing_cli_choices.opts, indexing_cli_choices.decrypt_policy);
if (status != NOTMUCH_STATUS_SUCCESS) { if (status != NOTMUCH_STATUS_SUCCESS) {
fprintf (stderr, "Error: Failed to set index decryption policy to %s. (%s)\n", fprintf (stderr, "Error: Failed to set index decryption policy to %s. (%s)\n",
indexing_cli_choices.try_decrypt ? "True" : "False", notmuch_status_to_string (status)); indexing_cli_choices.decrypt_policy ? "True" : "False", notmuch_status_to_string (status));
notmuch_indexopts_destroy (indexing_cli_choices.opts); notmuch_indexopts_destroy (indexing_cli_choices.opts);
indexing_cli_choices.opts = NULL; indexing_cli_choices.opts = NULL;
return status; return status;
} }
} }
#if (GMIME_MAJOR_VERSION < 3) #if (GMIME_MAJOR_VERSION < 3)
if (indexing_cli_choices.opts && notmuch_indexopts_get_try_decrypt (indexing_cli_choices.opts)) { if (indexing_cli_choices.opts && notmuch_indexopts_get_decrypt_policy (indexing_cli_choices.opts)) {
const char* gpg_path = notmuch_config_get_crypto_gpg_path (config); const char* gpg_path = notmuch_config_get_crypto_gpg_path (config);
if (gpg_path && strcmp(gpg_path, "gpg")) if (gpg_path && strcmp(gpg_path, "gpg"))
fprintf (stderr, "Warning: deprecated crypto.gpg_path is set to '%s'\n" fprintf (stderr, "Warning: deprecated crypto.gpg_path is set to '%s'\n"