#include "sprinter.h"
static void
-show_reply_headers (GMimeMessage *message)
+show_reply_headers (GMimeStream *stream, GMimeMessage *message)
{
- GMimeStream *stream_stdout = NULL;
-
- stream_stdout = g_mime_stream_file_new (stdout);
- 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);
+ /* Output RFC 2822 formatted (and RFC 2047 encoded) headers. */
+ if (g_mime_object_write_to_stream (GMIME_OBJECT (message), NULL, stream) < 0) {
+ INTERNAL_ERROR ("failed to write headers to stdout\n");
}
}
static void
-format_part_reply (mime_node_t *node)
+format_part_reply (GMimeStream *stream, mime_node_t *node)
{
int i;
if (node->envelope_file) {
- printf ("On %s, %s wrote:\n",
- notmuch_message_get_header (node->envelope_file, "date"),
- notmuch_message_get_header (node->envelope_file, "from"));
+ 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, "from"));
} else if (GMIME_IS_MESSAGE (node->part)) {
GMimeMessage *message = GMIME_MESSAGE (node->part);
- InternetAddressList *recipients;
- const char *recipients_string;
+ char *recipients_string;
- printf ("> From: %s\n", g_mime_message_get_sender (message));
- recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
- recipients_string = internet_address_list_to_string (recipients, 0);
+ g_mime_stream_printf (stream, "> From: %s\n", g_mime_message_get_from_string (message));
+ recipients_string = g_mime_message_get_address_string (message, GMIME_ADDRESS_TYPE_TO);
if (recipients_string)
- printf ("> To: %s\n",
- recipients_string);
- recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
- recipients_string = internet_address_list_to_string (recipients, 0);
+ g_mime_stream_printf (stream, "> To: %s\n",
+ recipients_string);
+ g_free (recipients_string);
+ recipients_string = g_mime_message_get_address_string (message, GMIME_ADDRESS_TYPE_CC);
if (recipients_string)
- printf ("> Cc: %s\n",
- recipients_string);
- printf ("> Subject: %s\n", g_mime_message_get_subject (message));
- printf ("> Date: %s\n", g_mime_message_get_date_as_string (message));
- printf (">\n");
+ g_mime_stream_printf (stream, "> Cc: %s\n",
+ recipients_string);
+ g_free (recipients_string);
+ g_mime_stream_printf (stream, "> Subject: %s\n", g_mime_message_get_subject (message));
+ g_mime_stream_printf (stream, "> Date: %s\n", g_mime_message_get_date_string (node, message));
+ g_mime_stream_printf (stream, ">\n");
} else if (GMIME_IS_PART (node->part)) {
GMimeContentType *content_type = g_mime_object_get_content_type (node->part);
GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (node->part);
g_mime_content_type_is_type (content_type, "application", "pgp-signature")) {
/* Ignore PGP/MIME cruft parts */
} else if (g_mime_content_type_is_type (content_type, "text", "*") &&
- !g_mime_content_type_is_type (content_type, "text", "html")) {
- GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
- 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);
+ ! g_mime_content_type_is_type (content_type, "text", "html")) {
+ show_text_part_content (node->part, stream, NOTMUCH_SHOW_TEXT_PART_REPLY);
} else if (disposition &&
strcasecmp (g_mime_content_disposition_get_disposition (disposition),
GMIME_DISPOSITION_ATTACHMENT) == 0) {
const char *filename = g_mime_part_get_filename (GMIME_PART (node->part));
- printf ("Attachment: %s (%s)\n", filename,
- g_mime_content_type_to_string (content_type));
+ g_mime_stream_printf (stream, "Attachment: %s (%s)\n", filename,
+ g_mime_content_type_get_mime_type (content_type));
} else {
- printf ("Non-text part: %s\n",
- g_mime_content_type_to_string (content_type));
+ g_mime_stream_printf (stream, "Non-text part: %s\n",
+ g_mime_content_type_get_mime_type (content_type));
}
}
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 {
} address_match_t;
/* Match given string against given address according to mode. */
-static notmuch_bool_t
+static bool
match_address (const char *str, const char *address, address_match_t mode)
{
switch (mode) {
return strcasecmp (address, str) == 0;
}
- return FALSE;
+ return false;
}
/* Match given string against user's configured "primary" and "other"
const char **other;
size_t i, other_len;
- if (!str || *str == '\0')
+ if (! str || *str == '\0')
return NULL;
primary = notmuch_config_get_user_primary_email (config);
/* Is the given address configured as one of the user's "primary" or
* "other" addresses. */
-static notmuch_bool_t
+static bool
address_is_users (const char *address, notmuch_config_t *config)
{
return address_match (address, config, STRING_IS_USER_ADDRESS) != NULL;
scan_address_list (InternetAddressList *list,
notmuch_config_t *config,
GMimeMessage *message,
- GMimeRecipientType type,
+ GMimeAddressType type,
const char **user_from)
{
InternetAddress *address;
if (user_from && *user_from == NULL)
*user_from = addr;
} else if (message) {
- g_mime_message_add_recipient (message, type, name, addr);
+ g_mime_message_add_mailbox (message, type, name, addr);
n++;
}
}
/* Does the address in the Reply-To header of 'message' already appear
* in either the 'To' or 'Cc' header of the message?
*/
-static notmuch_bool_t
+static bool
reply_to_header_is_redundant (GMimeMessage *message,
InternetAddressList *reply_to_list)
{
InternetAddress *address;
InternetAddressMailbox *mailbox;
InternetAddressList *recipients;
- notmuch_bool_t ret = FALSE;
+ bool ret = false;
int i;
if (reply_to_list == NULL ||
mailbox = INTERNET_ADDRESS_MAILBOX (address);
addr = internet_address_mailbox_get_addr (mailbox);
if (strcmp (addr, reply_to) == 0) {
- ret = TRUE;
+ ret = true;
break;
}
}
return ret;
}
-static InternetAddressList *get_sender(GMimeMessage *message)
+static InternetAddressList *
+get_sender (GMimeMessage *message)
{
- const char *reply_to;
-
- reply_to = g_mime_message_get_reply_to (message);
- if (reply_to && *reply_to) {
- InternetAddressList *reply_to_list;
+ InternetAddressList *reply_to_list;
- /*
+ reply_to_list = g_mime_message_get_reply_to_list (message);
+ if (reply_to_list &&
+ internet_address_list_length (reply_to_list) > 0) {
+ /*
* Some mailing lists munge the Reply-To header despite it
* being A Bad Thing, see
* http://marc.merlins.org/netrants/reply-to-harmful.html
* to the list. Note that the address in the Reply-To header
* will always appear in the reply if reply_all is true.
*/
- reply_to_list = internet_address_list_parse_string (reply_to);
if (! reply_to_header_is_redundant (message, reply_to_list))
return reply_to_list;
-
- g_object_unref (G_OBJECT (reply_to_list));
}
- return internet_address_list_parse_string (
- g_mime_message_get_sender (message));
+ return g_mime_message_get_from (message);
}
-static InternetAddressList *get_to(GMimeMessage *message)
+static InternetAddressList *
+get_to (GMimeMessage *message)
{
- return g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
+ return g_mime_message_get_addresses (message, GMIME_ADDRESS_TYPE_TO);
}
-static InternetAddressList *get_cc(GMimeMessage *message)
+static InternetAddressList *
+get_cc (GMimeMessage *message)
{
- return g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
+ return g_mime_message_get_addresses (message, GMIME_ADDRESS_TYPE_CC);
}
-static InternetAddressList *get_bcc(GMimeMessage *message)
+static InternetAddressList *
+get_bcc (GMimeMessage *message)
{
- return g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_BCC);
+ return g_mime_message_get_addresses (message, GMIME_ADDRESS_TYPE_BCC);
}
/* Augment the recipients of 'reply' from the "Reply-to:", "From:",
add_recipients_from_message (GMimeMessage *reply,
notmuch_config_t *config,
GMimeMessage *message,
- notmuch_bool_t reply_all)
+ bool reply_all)
{
struct {
InternetAddressList * (*get_header)(GMimeMessage *message);
- GMimeRecipientType recipient_type;
+ GMimeAddressType recipient_type;
} reply_to_map[] = {
- { get_sender, GMIME_RECIPIENT_TYPE_TO },
- { get_to, GMIME_RECIPIENT_TYPE_TO },
- { get_cc, GMIME_RECIPIENT_TYPE_CC },
- { get_bcc, GMIME_RECIPIENT_TYPE_BCC },
+ { get_sender, GMIME_ADDRESS_TYPE_TO },
+ { get_to, GMIME_ADDRESS_TYPE_TO },
+ { get_cc, GMIME_ADDRESS_TYPE_CC },
+ { get_bcc, GMIME_ADDRESS_TYPE_BCC },
};
const char *from_addr = NULL;
unsigned int i;
n += scan_address_list (recipients, config, reply,
reply_to_map[i].recipient_type, &from_addr);
- if (!reply_all && n) {
+ if (! reply_all && n) {
/* Stop adding new recipients in reply-to-sender mode if
* we have added some recipient(s) above.
*
}
}
+ /* If no recipients were added but we found one of the user's
+ * addresses to use as a from address then the message is from the
+ * user to the user - add the discovered from address to the list
+ * of recipients so that the reply goes back to the user.
+ */
+ if (n == 0 && from_addr)
+ g_mime_message_add_mailbox (reply, GMIME_ADDRESS_TYPE_TO, NULL, from_addr);
+
return from_addr;
}
if (*by == '\0')
break;
mta = xstrdup (by);
- token = strtok(mta," \t");
+ token = strtok (mta, " \t");
if (token == NULL) {
free (mta);
break;
}
static GMimeMessage *
-create_reply_message(void *ctx,
- notmuch_config_t *config,
- notmuch_message_t *message,
- GMimeMessage *mime_message,
- notmuch_bool_t reply_all,
- notmuch_bool_t limited)
+create_reply_message (void *ctx,
+ notmuch_config_t *config,
+ notmuch_message_t *message,
+ GMimeMessage *mime_message,
+ bool reply_all,
+ bool limited)
{
const char *subject, *from_addr = NULL;
const char *in_reply_to, *orig_references, *references;
* otherwise.
*/
GMimeMessage *reply = g_mime_message_new (limited ? 0 : 1);
+
if (reply == NULL) {
fprintf (stderr, "Out of memory\n");
return NULL;
in_reply_to = talloc_asprintf (ctx, "<%s>",
notmuch_message_get_message_id (message));
- g_mime_object_set_header (GMIME_OBJECT (reply), "In-Reply-To", in_reply_to);
+ g_mime_object_set_header (GMIME_OBJECT (reply), "In-Reply-To", in_reply_to, NULL);
orig_references = notmuch_message_get_header (message, "references");
if (orig_references && *orig_references)
else
references = talloc_strdup (ctx, in_reply_to);
- g_mime_object_set_header (GMIME_OBJECT (reply), "References", references);
+ g_mime_object_set_header (GMIME_OBJECT (reply), "References", references, NULL);
from_addr = add_recipients_from_message (reply, config,
mime_message, reply_all);
from_addr = talloc_asprintf (ctx, "%s <%s>",
notmuch_config_get_user_name (config),
from_addr);
- g_mime_object_set_header (GMIME_OBJECT (reply), "From", from_addr);
+ g_mime_object_set_header (GMIME_OBJECT (reply), "From", from_addr, NULL);
- subject = notmuch_message_get_header (message, "subject");
+ subject = g_mime_message_get_subject (mime_message);
if (subject) {
if (strncasecmp (subject, "Re:", 3))
subject = talloc_asprintf (ctx, "Re: %s", subject);
- g_mime_message_set_subject (reply, subject);
+ g_mime_message_set_subject (reply, subject, NULL);
}
return reply;
FORMAT_HEADERS_ONLY,
};
-static int do_reply(notmuch_config_t *config,
- notmuch_query_t *query,
- notmuch_show_params_t *params,
- int format,
- notmuch_bool_t reply_all)
+static int
+do_reply (notmuch_config_t *config,
+ notmuch_query_t *query,
+ notmuch_show_params_t *params,
+ int format,
+ bool reply_all)
{
GMimeMessage *reply;
mime_node_t *node;
return 1;
if (count != 1) {
- fprintf (stderr, "Error: search term did not match precisely one message (matched %d messages).\n", count);
+ fprintf (stderr, "Error: search term did not match precisely one message (matched %u messages).\n", count);
return 1;
}
for (;
notmuch_messages_valid (messages);
- notmuch_messages_move_to_next (messages))
- {
+ notmuch_messages_move_to_next (messages)) {
message = notmuch_messages_get (messages);
if (mime_node_open (config, message, ¶ms->crypto, &node))
reply = create_reply_message (config, config, message,
GMIME_MESSAGE (node->part), reply_all,
format == FORMAT_HEADERS_ONLY);
- if (!reply)
+ if (! reply)
return 1;
if (format == FORMAT_JSON || format == FORMAT_SEXP) {
/* The headers of the reply message we've created */
sp->map_key (sp, "reply-headers");
- format_headers_sprinter (sp, reply, TRUE);
+ /* FIXME: send msg_crypto here to avoid killing the
+ * subject line on reply to encrypted messages! */
+ format_headers_sprinter (sp, reply, true, NULL);
/* Start the original */
sp->map_key (sp, "original");
- format_part_sprinter (config, sp, node, TRUE, TRUE, FALSE);
+ format_part_sprinter (config, sp, node, true, false);
/* End */
sp->end (sp);
} else {
- show_reply_headers (reply);
- if (format == FORMAT_DEFAULT)
- format_part_reply (node);
+ GMimeStream *stream_stdout = stream_stdout = g_mime_stream_stdout_new ();
+ if (stream_stdout) {
+ 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));
int opt_index;
notmuch_show_params_t params = {
.part = -1,
+ .crypto = { .decrypt = NOTMUCH_DECRYPT_AUTO },
};
int format = FORMAT_DEFAULT;
- int reply_all = TRUE;
+ int reply_all = true;
notmuch_opt_desc_t options[] = {
- { NOTMUCH_OPT_KEYWORD, &format, "format", 'f',
- (notmuch_keyword_t []){ { "default", FORMAT_DEFAULT },
- { "json", FORMAT_JSON },
- { "sexp", FORMAT_SEXP },
- { "headers-only", FORMAT_HEADERS_ONLY },
- { 0, 0 } } },
- { NOTMUCH_OPT_INT, ¬much_format_version, "format-version", 0, 0 },
- { NOTMUCH_OPT_KEYWORD, &reply_all, "reply-to", 'r',
- (notmuch_keyword_t []){ { "all", TRUE },
- { "sender", FALSE },
- { 0, 0 } } },
- { NOTMUCH_OPT_BOOLEAN, ¶ms.crypto.decrypt, "decrypt", 'd', 0 },
- { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 },
- { 0, 0, 0, 0, 0 }
+ { .opt_keyword = &format, .name = "format", .keywords =
+ (notmuch_keyword_t []){ { "default", FORMAT_DEFAULT },
+ { "json", FORMAT_JSON },
+ { "sexp", FORMAT_SEXP },
+ { "headers-only", FORMAT_HEADERS_ONLY },
+ { 0, 0 } } },
+ { .opt_int = ¬much_format_version, .name = "format-version" },
+ { .opt_keyword = &reply_all, .name = "reply-to", .keywords =
+ (notmuch_keyword_t []){ { "all", true },
+ { "sender", false },
+ { 0, 0 } } },
+ { .opt_keyword = (int *) (¶ms.crypto.decrypt), .name = "decrypt",
+ .keyword_no_arg_value = "true", .keywords =
+ (notmuch_keyword_t []){ { "false", NOTMUCH_DECRYPT_FALSE },
+ { "auto", NOTMUCH_DECRYPT_AUTO },
+ { "true", NOTMUCH_DECRYPT_NOSTASH },
+ { 0, 0 } } },
+ { .opt_inherit = notmuch_shared_options },
+ { }
};
opt_index = parse_arguments (argc, argv, options, 1);
notmuch_exit_if_unsupported_format ();
- query_string = query_string_from_args (config, argc-opt_index, argv+opt_index);
+ query_string = query_string_from_args (config, argc - opt_index, argv + opt_index);
if (query_string == NULL) {
fprintf (stderr, "Out of memory\n");
return EXIT_FAILURE;
return EXIT_FAILURE;
}
- params.crypto.gpgpath = notmuch_config_get_crypto_gpg_path (config);
-
if (notmuch_database_open (notmuch_config_get_database_path (config),
NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much))
return EXIT_FAILURE;
if (do_reply (config, query, ¶ms, format, reply_all) != 0)
return EXIT_FAILURE;
- notmuch_crypto_cleanup (¶ms.crypto);
+ _notmuch_crypto_cleanup (¶ms.crypto);
notmuch_query_destroy (query);
notmuch_database_destroy (notmuch);
projects / notmuch / blobdiff