This change prepares us to know whether or not
_index_encrypted_mime_part succeeded or not on a given MIME part.
We don't currently make use of the information, but we will in
subsequent changes.
---
lib/index.cc | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/lib/index.cc b/lib/index.cc
index e03f5230..29ede685 100644
--- a/lib/index.cc
+++ b/lib/index.cc
@@ -364,7 +364,7 @@ _index_content_type (notmuch_message_t *message,
GMimeObject *part)
}
}
-static void
+static bool
_index_encrypted_mime_part (notmuch_message_t *message, notmuch_indexopts_t
*indexopts,
GMimeContentType *content_type,
GMimeObject *part);
@@ -419,6 +419,8 @@ _index_mime_part (notmuch_message_t *message,
_index_content_type (message,
g_mime_multipart_get_part (multipart, i));
if (i == GMIME_MULTIPART_ENCRYPTED_CONTENT) {
+ /* deliberately ignore return value here: if it fails to
decrypt,
+ we have nothing else to try */
_index_encrypted_mime_part(message, indexopts,
content_type,
part);
@@ -519,8 +521,9 @@ _index_mime_part (notmuch_message_t *message,
}
/* descend (if desired) into the cleartext part of an encrypted MIME
- * part while indexing. */
-static void
+ * part while indexing. Returns true if there was a successful
+ * decryption, false if there was not.*/
+static bool
_index_encrypted_mime_part (notmuch_message_t *message,
notmuch_indexopts_t *indexopts,
g_mime_3_unused(GMimeContentType *content_type),
@@ -532,7 +535,7 @@ _index_encrypted_mime_part (notmuch_message_t *message,
GMimeObject *clear = NULL;
if (!indexopts || (notmuch_indexopts_get_decrypt_policy (indexopts) ==
NOTMUCH_DECRYPT_FALSE))
- return;
+ return false;
notmuch = notmuch_message_get_database (message);
@@ -550,7 +553,7 @@ _index_encrypted_mime_part (notmuch_message_t *message,
if (status)
_notmuch_database_log_append (notmuch, "failed to add
index.decryption "
"property (%d)\n", status);
- return;
+ return false;
}
}
#endif
@@ -560,7 +563,7 @@ _index_encrypted_mime_part (notmuch_message_t *message,
clear = _notmuch_crypto_decrypt (&attempted,
notmuch_indexopts_get_decrypt_policy (indexopts),
message, crypto_ctx, encrypted_data,
get_sk ? &decrypt_result : NULL, &err);
if (!attempted)
- return;
+ return false;
if (err || !clear) {
if (decrypt_result)
g_object_unref (decrypt_result);
@@ -576,7 +579,7 @@ _index_encrypted_mime_part (notmuch_message_t *message,
if (status)
_notmuch_database_log_append (notmuch, "failed to add
index.decryption "
"property (%d)\n", status);
- return;
+ return false;
}
if (decrypt_result) {
#if HAVE_GMIME_SESSION_KEYS
@@ -597,7 +600,7 @@ _index_encrypted_mime_part (notmuch_message_t *message,
if (status)
_notmuch_database_log (notmuch, "failed to add index.decryption "
"property (%d)\n", status);
-
+ return true;
}
notmuch_status_t
--
2.15.1
_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch
