From 7be7862a7cd29ab441b195669f65ddbd1e96c4bf Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Thu, 24 May 2012 15:40:40 +1700 Subject: [PATCH] [PATCH v4 4/7] cli: modify mime_node_open to take new crypto struct as argument --- 1d/320e3ee0ddf76845579953597c945efab5b1c9 | 159 ++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 1d/320e3ee0ddf76845579953597c945efab5b1c9 diff --git a/1d/320e3ee0ddf76845579953597c945efab5b1c9 b/1d/320e3ee0ddf76845579953597c945efab5b1c9 new file mode 100644 index 000000000..5f8d1456a --- /dev/null +++ b/1d/320e3ee0ddf76845579953597c945efab5b1c9 @@ -0,0 +1,159 @@ +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 6A262431FBD + for ; Wed, 23 May 2012 15:40:49 -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 8VN-o23rXbBH for ; + Wed, 23 May 2012 15:40:48 -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 B4C55431FB6 + 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 6C46066E017C + 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 4B79166E01A5 + for ; Wed, 23 May 2012 15:40:46 -0700 (PDT) +Received: by finestructure.net (Postfix, from userid 1000) + id 0447E1F1; Wed, 23 May 2012 15:40:46 -0700 (PDT) +From: Jameson Graef Rollins +To: Notmuch Mail +Subject: [PATCH v4 4/7] cli: modify mime_node_open to take new crypto struct + as argument +Date: Wed, 23 May 2012 15:40:40 -0700 +Message-Id: <1337812843-14986-5-git-send-email-jrollins@finestructure.net> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1337812843-14986-4-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> + <1337812843-14986-4-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:49 -0000 + +This simplifies the interface considerably, getting rid of #ifdefs +along the way. +--- + mime-node.c | 7 +++---- + notmuch-client.h | 10 +++++----- + notmuch-reply.c | 6 ++---- + notmuch-show.c | 3 +-- + 4 files changed, 11 insertions(+), 15 deletions(-) + +diff --git a/mime-node.c b/mime-node.c +index 06fdb70..ba3a01b 100644 +--- a/mime-node.c ++++ b/mime-node.c +@@ -57,8 +57,7 @@ _mime_node_context_free (mime_node_context_t *res) + + notmuch_status_t + mime_node_open (const void *ctx, notmuch_message_t *message, +- GMimeCryptoContext *cryptoctx, +- notmuch_bool_t decrypt, mime_node_t **root_out) ++ notmuch_crypto_t *crypto, mime_node_t **root_out) + { + const char *filename = notmuch_message_get_filename (message); + mime_node_context_t *mctx; +@@ -110,8 +109,8 @@ mime_node_open (const void *ctx, notmuch_message_t *message, + goto DONE; + } + +- mctx->cryptoctx = cryptoctx; +- mctx->decrypt = decrypt; ++ mctx->cryptoctx = crypto->gpgctx; ++ mctx->decrypt = crypto->decrypt; + + /* Create the root node */ + root->part = GMIME_OBJECT (mctx->mime_message); +diff --git a/notmuch-client.h b/notmuch-client.h +index 9f44dc9..8d92d41 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -349,9 +349,10 @@ struct mime_node { + }; + + /* Construct a new MIME node pointing to the root message part of +- * message. If cryptoctx is non-NULL, it will be used to verify +- * signatures on any child parts. If decrypt is true, then cryptoctx +- * will additionally be used to decrypt any encrypted child parts. ++ * message. If crypto->gpgctx is non-NULL, it will be used to verify ++ * signatures on any child parts. If crypto->decrypt is true, then ++ * crypto.gpgctx will additionally be used to decrypt any encrypted ++ * child parts. + * + * Return value: + * +@@ -363,8 +364,7 @@ struct mime_node { + */ + notmuch_status_t + mime_node_open (const void *ctx, notmuch_message_t *message, +- GMimeCryptoContext *cryptoctx, +- notmuch_bool_t decrypt, mime_node_t **node_out); ++ notmuch_crypto_t *crypto, mime_node_t **node_out); + + /* Return a new MIME node for the requested child part of parent. + * parent will be used as the talloc context for the returned child +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 41b18e4..148152c 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -544,8 +544,7 @@ notmuch_reply_format_default(void *ctx, + g_object_unref (G_OBJECT (reply)); + reply = NULL; + +- if (mime_node_open (ctx, message, params->crypto.gpgctx, params->crypto.decrypt, +- &root) == NOTMUCH_STATUS_SUCCESS) { ++ if (mime_node_open (ctx, message, &(params->crypto), &root) == NOTMUCH_STATUS_SUCCESS) { + format_part_reply (root); + talloc_free (root); + } +@@ -574,8 +573,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->crypto.gpgctx, params->crypto.decrypt, +- &node) != NOTMUCH_STATUS_SUCCESS) ++ if (mime_node_open (ctx, message, &(params->crypto), &node) != NOTMUCH_STATUS_SUCCESS) + return 1; + + reply = create_reply_message (ctx, config, message, reply_all); +diff --git a/notmuch-show.c b/notmuch-show.c +index cc509a6..fb5e9b6 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -810,8 +810,7 @@ show_message (void *ctx, + mime_node_t *root, *part; + notmuch_status_t status; + +- status = mime_node_open (local, message, params->crypto.gpgctx, +- params->crypto.decrypt, &root); ++ status = mime_node_open (local, message, &(params->crypto), &root); + if (status) + goto DONE; + part = mime_node_seek_dfs (root, (params->part < 0 ? 0 : params->part)); +-- +1.7.10 + -- 2.26.2