mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 17:34:54 +01:00
00b5623d1a
There are lots of API changes in gmime 2.6 crypto handling. By adding preprocessor directives, it is however possible to add gmime 2.6 compatibility while preserving compatibility with gmime 2.4 too. This is mostly based on id:"8762i8hrb9.fsf@bookbinder.fernseed.info". This was tested against both gmime 2.6.4 and 2.4.31. With gmime 2.4.31, the crypto tests all work fine (as expected). With gmime 2.6.4, one crypto test is currently broken (signature verification with signer key unavailable), most likely because of a bug in gmime which will hopefully be fixed in a future version.
106 lines
3 KiB
C
106 lines
3 KiB
C
/* notmuch - Not much of an email program, (just index and search)
|
|
*
|
|
* Copyright © 2009 Carl Worth
|
|
* Copyright © 2009 Keith Packard
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see http://www.gnu.org/licenses/ .
|
|
*
|
|
* Authors: Carl Worth <cworth@cworth.org>
|
|
* Keith Packard <keithp@keithp.com>
|
|
*/
|
|
|
|
#include "notmuch-client.h"
|
|
|
|
typedef struct show_message_state {
|
|
int part_count;
|
|
} show_message_state_t;
|
|
|
|
static void
|
|
show_message_part (mime_node_t *node,
|
|
show_message_state_t *state,
|
|
const notmuch_show_format_t *format,
|
|
int first)
|
|
{
|
|
/* Formatters expect the envelope for embedded message parts */
|
|
GMimeObject *part = node->envelope_part ?
|
|
GMIME_OBJECT (node->envelope_part) : node->part;
|
|
int i;
|
|
|
|
if (!first)
|
|
fputs (format->part_sep, stdout);
|
|
|
|
/* Format this part */
|
|
if (format->part_start)
|
|
format->part_start (part, &(state->part_count));
|
|
|
|
if (node->decrypt_attempted && format->part_encstatus)
|
|
format->part_encstatus (node->decrypt_success);
|
|
|
|
if (node->verify_attempted && format->part_sigstatus)
|
|
#ifdef GMIME_ATLEAST_26
|
|
format->part_sigstatus (node->sig_list);
|
|
#else
|
|
format->part_sigstatus (node->sig_validity);
|
|
#endif
|
|
|
|
format->part_content (part);
|
|
|
|
if (node->envelope_part) {
|
|
fputs (format->header_start, stdout);
|
|
if (format->header_message_part)
|
|
format->header_message_part (GMIME_MESSAGE (node->part));
|
|
fputs (format->header_end, stdout);
|
|
|
|
fputs (format->body_start, stdout);
|
|
}
|
|
|
|
/* Recurse over the children */
|
|
state->part_count += 1;
|
|
for (i = 0; i < node->nchildren; i++)
|
|
show_message_part (mime_node_child (node, i), state, format, i == 0);
|
|
|
|
/* Finish this part */
|
|
if (node->envelope_part)
|
|
fputs (format->body_end, stdout);
|
|
|
|
if (format->part_end)
|
|
format->part_end (part);
|
|
}
|
|
|
|
notmuch_status_t
|
|
show_message_body (notmuch_message_t *message,
|
|
const notmuch_show_format_t *format,
|
|
notmuch_show_params_t *params)
|
|
{
|
|
notmuch_status_t ret;
|
|
show_message_state_t state;
|
|
mime_node_t *root, *part;
|
|
|
|
ret = mime_node_open (NULL, message, params->cryptoctx, params->decrypt,
|
|
&root);
|
|
if (ret)
|
|
return ret;
|
|
|
|
/* The caller of show_message_body has already handled the
|
|
* outermost envelope, so skip it. */
|
|
state.part_count = MAX (params->part, 1);
|
|
|
|
part = mime_node_seek_dfs (root, state.part_count);
|
|
if (part)
|
|
show_message_part (part, &state, format, TRUE);
|
|
|
|
talloc_free (root);
|
|
|
|
return NOTMUCH_STATUS_SUCCESS;
|
|
}
|