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

cli/reply: direct all output for text format to gmime stream

Browse source 
Interleaving printfs with writes to the gmime stream worked when the
gmime stream was backed by the FILE *stdout, but that is no longer the
case.  Create one stream and pass it into the two functions where
needed, as well well as replacing printfs with g_mime_stream_printf.
This commit is contained in:
David Bremner 2017-05-27 13:51:12 -03:00
parent 1e7dbf7abc
commit 555e2abe9d
2 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
notmuch-client.h
View file

@ -29,7 +29,7 @@
#include "compat.h" #include "compat.h"
#include <gmime/gmime.h> #include "gmime-extra.h"
typedef GMimeCryptoContext notmuch_crypto_context_t; typedef GMimeCryptoContext notmuch_crypto_context_t;
/* This is automatically included only since gmime 2.6.10 */ /* This is automatically included only since gmime 2.6.10 */

63
notmuch-reply.c
View file

@ -25,47 +25,42 @@
#include "sprinter.h" #include "sprinter.h"
static void static void
show_reply_headers (GMimeMessage *message) show_reply_headers (GMimeStream *stream, GMimeMessage *message)
{ {
GMimeStream *stream_stdout = NULL; /* Output RFC 2822 formatted (and RFC 2047 encoded) headers. */
if (g_mime_object_write_to_stream (GMIME_OBJECT(message), stream) < 0) {
stream_stdout = g_mime_stream_file_new (stdout); INTERNAL_ERROR("failed to write headers to stdout\n");
if (stream_stdout) {
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
/* Output RFC 2822 formatted (and RFC 2047 encoded) headers. */
g_mime_object_write_to_stream (GMIME_OBJECT(message), stream_stdout);
g_object_unref(stream_stdout);
} }
} }
static void static void
format_part_reply (mime_node_t *node) format_part_reply (GMimeStream *stream, mime_node_t *node)
{ {
int i; int i;
if (node->envelope_file) { if (node->envelope_file) {
printf ("On %s, %s wrote:\n", g_mime_stream_printf (stream, "On %s, %s wrote:\n",
notmuch_message_get_header (node->envelope_file, "date"), notmuch_message_get_header (node->envelope_file, "date"),
notmuch_message_get_header (node->envelope_file, "from")); notmuch_message_get_header (node->envelope_file, "from"));
} else if (GMIME_IS_MESSAGE (node->part)) { } else if (GMIME_IS_MESSAGE (node->part)) {
GMimeMessage *message = GMIME_MESSAGE (node->part); GMimeMessage *message = GMIME_MESSAGE (node->part);
InternetAddressList *recipients; InternetAddressList *recipients;
const char *recipients_string; const char *recipients_string;
printf ("> From: %s\n", g_mime_message_get_sender (message)); g_mime_stream_printf (stream, "> From: %s\n", g_mime_message_get_sender (message));
recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO); recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
recipients_string = internet_address_list_to_string (recipients, 0); recipients_string = internet_address_list_to_string (recipients, 0);
if (recipients_string) if (recipients_string)
printf ("> To: %s\n", g_mime_stream_printf (stream, "> To: %s\n",
recipients_string); recipients_string);
recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC); recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
recipients_string = internet_address_list_to_string (recipients, 0); recipients_string = internet_address_list_to_string (recipients, 0);
if (recipients_string) if (recipients_string)
printf ("> Cc: %s\n", g_mime_stream_printf (stream, "> Cc: %s\n",
recipients_string); recipients_string);
printf ("> Subject: %s\n", g_mime_message_get_subject (message)); g_mime_stream_printf (stream, "> Subject: %s\n", g_mime_message_get_subject (message));
printf ("> Date: %s\n", g_mime_message_get_date_as_string (message)); g_mime_stream_printf (stream, "> Date: %s\n", g_mime_message_get_date_as_string (message));
printf (">\n"); g_mime_stream_printf (stream, ">\n");
} else if (GMIME_IS_PART (node->part)) { } else if (GMIME_IS_PART (node->part)) {
GMimeContentType *content_type = g_mime_object_get_content_type (node->part); GMimeContentType *content_type = g_mime_object_get_content_type (node->part);
GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (node->part); GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (node->part);
@ -75,24 +70,21 @@ format_part_reply (mime_node_t *node)
/* Ignore PGP/MIME cruft parts */ /* Ignore PGP/MIME cruft parts */
} else if (g_mime_content_type_is_type (content_type, "text", "*") && } else if (g_mime_content_type_is_type (content_type, "text", "*") &&
!g_mime_content_type_is_type (content_type, "text", "html")) { !g_mime_content_type_is_type (content_type, "text", "html")) {
GMimeStream *stream_stdout = g_mime_stream_file_new (stdout); show_text_part_content (node->part, stream, NOTMUCH_SHOW_TEXT_PART_REPLY);
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
show_text_part_content (node->part, stream_stdout, NOTMUCH_SHOW_TEXT_PART_REPLY);
g_object_unref(stream_stdout);
} else if (disposition && } else if (disposition &&
strcasecmp (g_mime_content_disposition_get_disposition (disposition), strcasecmp (g_mime_content_disposition_get_disposition (disposition),
GMIME_DISPOSITION_ATTACHMENT) == 0) { GMIME_DISPOSITION_ATTACHMENT) == 0) {
const char *filename = g_mime_part_get_filename (GMIME_PART (node->part)); const char *filename = g_mime_part_get_filename (GMIME_PART (node->part));
printf ("Attachment: %s (%s)\n", filename, g_mime_stream_printf (stream, "Attachment: %s (%s)\n", filename,
g_mime_content_type_to_string (content_type)); g_mime_content_type_to_string (content_type));
} else { } else {
printf ("Non-text part: %s\n", g_mime_stream_printf (stream, "Non-text part: %s\n",
g_mime_content_type_to_string (content_type)); g_mime_content_type_to_string (content_type));
} }
} }
for (i = 0; i < node->nchildren; i++) for (i = 0; i < node->nchildren; i++)
format_part_reply (mime_node_child (node, i)); format_part_reply (stream, mime_node_child (node, i));
} }
typedef enum { typedef enum {
@ -678,9 +670,14 @@ static int do_reply(notmuch_config_t *config,
/* End */ /* End */
sp->end (sp); sp->end (sp);
} else { } else {
show_reply_headers (reply); GMimeStream *stream_stdout = stream_stdout = g_mime_stream_stdout_new ();
if (format == FORMAT_DEFAULT) if (stream_stdout) {
format_part_reply (node); show_reply_headers (stream_stdout, reply);
if (format == FORMAT_DEFAULT)
format_part_reply (stream_stdout, node);
}
g_mime_stream_flush (stream_stdout);
g_object_unref(stream_stdout);
} }
g_object_unref (G_OBJECT (reply)); g_object_unref (G_OBJECT (reply));