From 5cd867003c7e9d312ae4e38c2cf1bedf655ad3f6 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Thu, 24 May 2012 15:40:39 +1700 Subject: [PATCH] [PATCH v4 3/7] cli: modify show and reply to use new crypto struct --- ba/b162ce665e3b89b123bc31db33fdc0ec24718b | 239 ++++++++++++++++++++++ 1 file changed, 239 insertions(+) create mode 100644 ba/b162ce665e3b89b123bc31db33fdc0ec24718b diff --git a/ba/b162ce665e3b89b123bc31db33fdc0ec24718b b/ba/b162ce665e3b89b123bc31db33fdc0ec24718b new file mode 100644 index 000000000..5b94105f6 --- /dev/null +++ b/ba/b162ce665e3b89b123bc31db33fdc0ec24718b @@ -0,0 +1,239 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 21987431FBD + for ; Wed, 23 May 2012 15:40:50 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id kg1sNg+cGR+d for ; + Wed, 23 May 2012 15:40:49 -0700 (PDT) +Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu + [131.215.239.19]) + by olra.theworths.org (Postfix) with ESMTP id D798D431FBC + for ; Wed, 23 May 2012 15:40:48 -0700 (PDT) +Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1]) + by earth-doxen-postvirus (Postfix) with ESMTP id 95D9466E01A5 + for ; Wed, 23 May 2012 15:40:48 -0700 (PDT) +X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new +Received: from finestructure.net (unknown [137.151.175.56]) + (Authenticated sender: jrollins) + by earth-doxen-submit (Postfix) with ESMTP id 489A066E018D + for ; Wed, 23 May 2012 15:40:46 -0700 (PDT) +Received: by finestructure.net (Postfix, from userid 1000) + id 0198F1EA; Wed, 23 May 2012 15:40:46 -0700 (PDT) +From: Jameson Graef Rollins +To: Notmuch Mail +Subject: [PATCH v4 3/7] cli: modify show and reply to use new crypto struct +Date: Wed, 23 May 2012 15:40:39 -0700 +Message-Id: <1337812843-14986-4-git-send-email-jrollins@finestructure.net> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1337812843-14986-3-git-send-email-jrollins@finestructure.net> +References: <1337812843-14986-1-git-send-email-jrollins@finestructure.net> + <1337812843-14986-2-git-send-email-jrollins@finestructure.net> + <1337812843-14986-3-git-send-email-jrollins@finestructure.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 23 May 2012 22:40:50 -0000 + +notmuch_show_params_t is modified to use the new notmuch_crypto_t, and +notmuch-show and notmuch-reply are modified accordingly. +--- + notmuch-client.h | 3 +-- + notmuch-reply.c | 29 ++++++++++++++++------------- + notmuch-show.c | 30 +++++++++++++++++------------- + 3 files changed, 34 insertions(+), 28 deletions(-) + +diff --git a/notmuch-client.h b/notmuch-client.h +index a8b00ab..9f44dc9 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -86,8 +86,7 @@ typedef struct notmuch_show_params { + notmuch_bool_t omit_excluded; + notmuch_bool_t raw; + int part; +- GMimeCryptoContext* cryptoctx; +- notmuch_bool_t decrypt; ++ notmuch_crypto_t crypto; + } notmuch_show_params_t; + + /* There's no point in continuing when we've detected that we've done +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 7184a5d..41b18e4 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -544,7 +544,7 @@ notmuch_reply_format_default(void *ctx, + g_object_unref (G_OBJECT (reply)); + 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) { + format_part_reply (root); + talloc_free (root); +@@ -574,7 +574,7 @@ notmuch_reply_format_json(void *ctx, + + messages = notmuch_query_search_messages (query); + 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) + return 1; + +@@ -675,7 +675,12 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + char *query_string; + 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); +- notmuch_show_params_t params = { .part = -1 }; ++ notmuch_show_params_t params = { ++ .part = -1, ++ .crypto = { ++ .decrypt = FALSE ++ } ++ }; + int format = FORMAT_DEFAULT; + int reply_all = TRUE; + +@@ -689,7 +694,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + (notmuch_keyword_t []){ { "all", TRUE }, + { "sender", FALSE }, + { 0, 0 } } }, +- { NOTMUCH_OPT_BOOLEAN, ¶ms.decrypt, "decrypt", 'd', 0 }, ++ { NOTMUCH_OPT_BOOLEAN, ¶ms.crypto.decrypt, "decrypt", 'd', 0 }, + { 0, 0, 0, 0, 0 } + }; + +@@ -706,18 +711,18 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + else + reply_format_func = notmuch_reply_format_default; + +- if (params.decrypt) { ++ if (params.crypto.decrypt) { + #ifdef GMIME_ATLEAST_26 + /* TODO: GMimePasswordRequestFunc */ +- params.cryptoctx = g_mime_gpg_context_new (NULL, "gpg"); ++ params.crypto.gpgctx = g_mime_gpg_context_new (NULL, "gpg"); + #else + 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 +- if (params.cryptoctx) { +- g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.cryptoctx, FALSE); ++ if (params.crypto.gpgctx) { ++ g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.crypto.gpgctx, FALSE); + } else { +- params.decrypt = FALSE; ++ params.crypto.decrypt = FALSE; + fprintf (stderr, "Failed to construct gpg context.\n"); + } + #ifndef GMIME_ATLEAST_26 +@@ -753,11 +758,9 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + if (reply_format_func (ctx, config, query, ¶ms, reply_all) != 0) + return 1; + ++ notmuch_crypto_cleanup (¶ms.crypto); + notmuch_query_destroy (query); + notmuch_database_destroy (notmuch); + +- if (params.cryptoctx) +- g_object_unref(params.cryptoctx); +- + return ret; + } +diff --git a/notmuch-show.c b/notmuch-show.c +index 95427d4..cc509a6 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -810,8 +810,8 @@ show_message (void *ctx, + mime_node_t *root, *part; + notmuch_status_t status; + +- status = mime_node_open (local, message, params->cryptoctx, +- params->decrypt, &root); ++ status = mime_node_open (local, message, params->crypto.gpgctx, ++ params->crypto.decrypt, &root); + if (status) + goto DONE; + 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; + int opt_index, ret; + 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; + notmuch_bool_t verify = FALSE; + int exclude = EXCLUDE_TRUE; +@@ -1002,7 +1008,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + { 0, 0 } } }, + { NOTMUCH_OPT_INT, ¶ms.part, "part", 'p', 0 }, + { NOTMUCH_OPT_BOOLEAN, ¶ms.entire_thread, "entire-thread", 't', 0 }, +- { NOTMUCH_OPT_BOOLEAN, ¶ms.decrypt, "decrypt", 'd', 0 }, ++ { NOTMUCH_OPT_BOOLEAN, ¶ms.crypto.decrypt, "decrypt", 'd', 0 }, + { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 }, + { 0, 0, 0, 0, 0 } + }; +@@ -1047,18 +1053,18 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + break; + } + +- if (params.decrypt || verify) { ++ if (params.crypto.decrypt || verify) { + #ifdef GMIME_ATLEAST_26 + /* TODO: GMimePasswordRequestFunc */ +- params.cryptoctx = g_mime_gpg_context_new (NULL, "gpg"); ++ params.crypto.gpgctx = g_mime_gpg_context_new (NULL, "gpg"); + #else + 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 +- if (params.cryptoctx) { +- g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.cryptoctx, FALSE); ++ if (params.crypto.gpgctx) { ++ g_mime_gpg_context_set_always_trust ((GMimeGpgContext*) params.crypto.gpgctx, FALSE); + } else { +- params.decrypt = FALSE; ++ params.crypto.decrypt = FALSE; + fprintf (stderr, "Failed to construct gpg context.\n"); + } + #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, ¶ms); + } + ++ notmuch_crypto_cleanup (¶ms.crypto); + notmuch_query_destroy (query); + notmuch_database_destroy (notmuch); + +- if (params.cryptoctx) +- g_object_unref(params.cryptoctx); +- + return ret; + } +-- +1.7.10 + -- 2.26.2