debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: modify show and reply to use new crypto struct

Browse source 
notmuch_show_params_t is modified to use the new notmuch_crypto_t, and
notmuch-show and notmuch-reply are modified accordingly.
This commit is contained in:
Jameson Graef Rollins 2012-05-26 11:45:42 -07:00 committed by David Bremner
parent e3be5afbad
commit c3eba1c3f8
3 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
notmuch-client.h
View file

@ -87,8 +87,7 @@ typedef struct notmuch_show_params {
notmuch_bool_t omit_excluded; notmuch_bool_t omit_excluded;
notmuch_bool_t raw; notmuch_bool_t raw;
int part; int part;
notmuch_crypto_context_t* cryptoctx; notmuch_crypto_t crypto;
notmuch_bool_t decrypt;
} notmuch_show_params_t; } notmuch_show_params_t;
/* There's no point in continuing when we've detected that we've done /* There's no point in continuing when we've detected that we've done

29
notmuch-reply.c
View file

@ -575,7 +575,7 @@ notmuch_reply_format_default(void *ctx,
g_object_unref (G_OBJECT (reply)); g_object_unref (G_OBJECT (reply));
reply = NULL; reply = NULL;
if (mime_node_open (ctx, message, params->cryptoctx, params->decrypt, if (mime_node_open (ctx, message, params->crypto.gpgctx, params->crypto.decrypt,
&root) == NOTMUCH_STATUS_SUCCESS) { &root) == NOTMUCH_STATUS_SUCCESS) {
format_part_reply (root); format_part_reply (root);
talloc_free (root); talloc_free (root);
@ -605,7 +605,7 @@ notmuch_reply_format_json(void *ctx,
messages = notmuch_query_search_messages (query); messages = notmuch_query_search_messages (query);
message = notmuch_messages_get (messages); message = notmuch_messages_get (messages);
if (mime_node_open (ctx, message, params->cryptoctx, params->decrypt, if (mime_node_open (ctx, message, params->crypto.gpgctx, params->crypto.decrypt,
&node) != NOTMUCH_STATUS_SUCCESS) &node) != NOTMUCH_STATUS_SUCCESS)
return 1; return 1;
@ -706,7 +706,12 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
char *query_string; char *query_string;
int opt_index, ret = 0; int opt_index, ret = 0;
int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_show_params_t *params, notmuch_bool_t reply_all); int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_show_params_t *params, notmuch_bool_t reply_all);
notmuch_show_params_t params = { .part = -1 }; notmuch_show_params_t params = {
.part = -1,
.crypto = {
.decrypt = FALSE
}
};
int format = FORMAT_DEFAULT; int format = FORMAT_DEFAULT;
int reply_all = TRUE; int reply_all = TRUE;
@ -720,7 +725,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
(notmuch_keyword_t []){ { "all", TRUE }, (notmuch_keyword_t []){ { "all", TRUE },
{ "sender", FALSE }, { "sender", FALSE },
{ 0, 0 } } }, { 0, 0 } } },
{ NOTMUCH_OPT_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 }, { NOTMUCH_OPT_BOOLEAN, &params.crypto.decrypt, "decrypt", 'd', 0 },
{ 0, 0, 0, 0, 0 } { 0, 0, 0, 0, 0 }
}; };
@ -737,18 +742,18 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
else else
reply_format_func = notmuch_reply_format_default; reply_format_func = notmuch_reply_format_default;
if (params.decrypt) { if (params.crypto.decrypt) {
#ifdef GMIME_ATLEAST_26 #ifdef GMIME_ATLEAST_26
/* TODO: GMimePasswordRequestFunc */ /* TODO: GMimePasswordRequestFunc */
params.cryptoctx = g_mime_gpg_context_new (NULL, "gpg"); params.crypto.gpgctx = g_mime_gpg_context_new (NULL, "gpg");
#else #else
GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL); GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL);
params.cryptoctx = g_mime_gpg_context_new (session, "gpg"); params.crypto.gpgctx = g_mime_gpg_context_new (session, "gpg");
#endif #endif
if (params.cryptoctx) { if (params.crypto.gpgctx) {
g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.cryptoctx, FALSE); g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.crypto.gpgctx, FALSE);
} else { } else {
params.decrypt = FALSE; params.crypto.decrypt = FALSE;
fprintf (stderr, "Failed to construct gpg context.\n"); fprintf (stderr, "Failed to construct gpg context.\n");
} }
#ifndef GMIME_ATLEAST_26 #ifndef GMIME_ATLEAST_26
@ -784,11 +789,9 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
if (reply_format_func (ctx, config, query, &params, reply_all) != 0) if (reply_format_func (ctx, config, query, &params, reply_all) != 0)
return 1; return 1;
notmuch_crypto_cleanup (&params.crypto);
notmuch_query_destroy (query); notmuch_query_destroy (query);
notmuch_database_destroy (notmuch); notmuch_database_destroy (notmuch);
if (params.cryptoctx)
g_object_unref(params.cryptoctx);
return ret; return ret;
} }

30
notmuch-show.c
View file

@ -810,8 +810,8 @@ show_message (void *ctx,
mime_node_t *root, *part; mime_node_t *root, *part;
notmuch_status_t status; notmuch_status_t status;
status = mime_node_open (local, message, params->cryptoctx, status = mime_node_open (local, message, params->crypto.gpgctx,
params->decrypt, &root); params->crypto.decrypt, &root);
if (status) if (status)
goto DONE; goto DONE;
part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part)); part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part));
@ -984,7 +984,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
char *query_string; char *query_string;
int opt_index, ret; int opt_index, ret;
const notmuch_show_format_t *format = &format_text; const notmuch_show_format_t *format = &format_text;
notmuch_show_params_t params = { .part = -1, .omit_excluded = TRUE }; notmuch_show_params_t params = {
.part = -1,
.omit_excluded = TRUE,
.crypto = {
.decrypt = FALSE
}
};
int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED; int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;
notmuch_bool_t verify = FALSE; notmuch_bool_t verify = FALSE;
int exclude = EXCLUDE_TRUE; int exclude = EXCLUDE_TRUE;
@ -1002,7 +1008,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
{ 0, 0 } } }, { 0, 0 } } },
{ NOTMUCH_OPT_INT, &params.part, "part", 'p', 0 }, { NOTMUCH_OPT_INT, &params.part, "part", 'p', 0 },
{ NOTMUCH_OPT_BOOLEAN, &params.entire_thread, "entire-thread", 't', 0 }, { NOTMUCH_OPT_BOOLEAN, &params.entire_thread, "entire-thread", 't', 0 },
{ NOTMUCH_OPT_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 }, { NOTMUCH_OPT_BOOLEAN, &params.crypto.decrypt, "decrypt", 'd', 0 },
{ NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 }, { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },
{ 0, 0, 0, 0, 0 } { 0, 0, 0, 0, 0 }
}; };
@ -1047,18 +1053,18 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
break; break;
} }
if (params.decrypt || verify) { if (params.crypto.decrypt || verify) {
#ifdef GMIME_ATLEAST_26 #ifdef GMIME_ATLEAST_26
/* TODO: GMimePasswordRequestFunc */ /* TODO: GMimePasswordRequestFunc */
params.cryptoctx = g_mime_gpg_context_new (NULL, "gpg"); params.crypto.gpgctx = g_mime_gpg_context_new (NULL, "gpg");
#else #else
GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL); GMimeSession* session = g_object_new (g_mime_session_get_type(), NULL);
params.cryptoctx = g_mime_gpg_context_new (session, "gpg"); params.crypto.gpgctx = g_mime_gpg_context_new (session, "gpg");
#endif #endif
if (params.cryptoctx) { if (params.crypto.gpgctx) {
g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.cryptoctx, FALSE); g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.crypto.gpgctx, FALSE);
} else { } else {
params.decrypt = FALSE; params.crypto.decrypt = FALSE;
fprintf (stderr, "Failed to construct gpg context.\n"); fprintf (stderr, "Failed to construct gpg context.\n");
} }
#ifndef GMIME_ATLEAST_26 #ifndef GMIME_ATLEAST_26
@ -1115,11 +1121,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
ret = do_show (ctx, query, format, &params); ret = do_show (ctx, query, format, &params);
} }
notmuch_crypto_cleanup (&params.crypto);
notmuch_query_destroy (query); notmuch_query_destroy (query);
notmuch_database_destroy (notmuch); notmuch_database_destroy (notmuch);
if (params.cryptoctx)
g_object_unref(params.cryptoctx);
return ret; return ret;
} }