int i;
unsigned int n = 0;
+ if (list == NULL)
+ return 0;
+
for (i = 0; i < internet_address_list_length (list); i++) {
address = internet_address_list_get_address (list, i);
if (INTERNET_ADDRESS_IS_GROUP (address)) {
group = INTERNET_ADDRESS_GROUP (address);
group_list = internet_address_group_get_members (group);
- if (group_list == NULL)
- continue;
-
n += scan_address_list (group_list, config, message, type, user_from);
} else {
InternetAddressMailbox *mailbox;
return n;
}
-/* Scan addresses in 'recipients'.
- *
- * See the documentation of scan_address_list() above. This function
- * does exactly the same, but converts 'recipients' to an
- * InternetAddressList first.
- */
-static unsigned int
-scan_address_string (const char *recipients,
- notmuch_config_t *config,
- GMimeMessage *message,
- GMimeRecipientType type,
- const char **user_from)
-{
- InternetAddressList *list;
-
- if (recipients == NULL)
- return 0;
-
- list = internet_address_list_parse_string (recipients);
- if (list == NULL)
- return 0;
-
- return scan_address_list (list, config, message, type, user_from);
-}
-
/* Does the address in the Reply-To header of 'message' already appear
* in either the 'To' or 'Cc' header of the message?
*/
static int
-reply_to_header_is_redundant (notmuch_message_t *message)
+reply_to_header_is_redundant (notmuch_message_t *message, const char *reply_to)
{
- const char *reply_to, *to, *cc, *addr;
+ const char *to, *cc, *addr;
InternetAddressList *list;
InternetAddress *address;
InternetAddressMailbox *mailbox;
- reply_to = notmuch_message_get_header (message, "reply-to");
- if (reply_to == NULL || *reply_to == '\0')
- return 0;
-
list = internet_address_list_parse_string (reply_to);
if (internet_address_list_length (list) != 1)
return 0;
}
+static InternetAddressList *get_sender(notmuch_message_t *message,
+ GMimeMessage *mime_message)
+{
+ const char *reply_to;
+
+ reply_to = g_mime_message_get_reply_to (mime_message);
+ if (reply_to && *reply_to) {
+ /*
+ * Some mailing lists munge the Reply-To header despite it
+ * being A Bad Thing, see
+ * http://marc.merlins.org/netrants/reply-to-harmful.html
+ *
+ * The munging is easy to detect, because it results in a
+ * redundant reply-to header, (with an address that already
+ * exists in either To or Cc). So in this case, we ignore the
+ * Reply-To field and use the From header. This ensures the
+ * original sender will get the reply even if not subscribed
+ * to the list. Note that the address in the Reply-To header
+ * will always appear in the reply if reply_all is true.
+ */
+ if (! reply_to_header_is_redundant (message, reply_to))
+ return internet_address_list_parse_string (reply_to);
+ }
+
+ return internet_address_list_parse_string (
+ g_mime_message_get_sender (mime_message));
+}
+
+static InternetAddressList *get_to(unused(notmuch_message_t *message),
+ GMimeMessage *mime_message)
+{
+ return g_mime_message_get_recipients (mime_message,
+ GMIME_RECIPIENT_TYPE_TO);
+}
+
+static InternetAddressList *get_cc(unused(notmuch_message_t *message),
+ GMimeMessage *mime_message)
+{
+ return g_mime_message_get_recipients (mime_message,
+ GMIME_RECIPIENT_TYPE_CC);
+}
+
+static InternetAddressList *get_bcc(unused(notmuch_message_t *message),
+ GMimeMessage *mime_message)
+{
+ return g_mime_message_get_recipients (mime_message,
+ GMIME_RECIPIENT_TYPE_BCC);
+}
+
/* Augment the recipients of 'reply' from the "Reply-to:", "From:",
* "To:", "Cc:", and "Bcc:" headers of 'message'.
*
add_recipients_from_message (GMimeMessage *reply,
notmuch_config_t *config,
notmuch_message_t *message,
+ GMimeMessage *mime_message,
notmuch_bool_t reply_all)
{
struct {
- const char *header;
- const char *fallback;
+ InternetAddressList * (*get_header)(notmuch_message_t *message,
+ GMimeMessage *mime_message);
GMimeRecipientType recipient_type;
} reply_to_map[] = {
- { "reply-to", "from", GMIME_RECIPIENT_TYPE_TO },
- { "to", NULL, GMIME_RECIPIENT_TYPE_TO },
- { "cc", NULL, GMIME_RECIPIENT_TYPE_CC },
- { "bcc", NULL, GMIME_RECIPIENT_TYPE_BCC }
+ { get_sender, GMIME_RECIPIENT_TYPE_TO },
+ { get_to, GMIME_RECIPIENT_TYPE_TO },
+ { get_cc, GMIME_RECIPIENT_TYPE_CC },
+ { get_bcc, GMIME_RECIPIENT_TYPE_BCC },
};
const char *from_addr = NULL;
unsigned int i;
unsigned int n = 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
- *
- * The munging is easy to detect, because it results in a
- * redundant reply-to header, (with an address that already exists
- * in either To or Cc). So in this case, we ignore the Reply-To
- * field and use the From header. This ensures the original sender
- * will get the reply even if not subscribed to the list. Note
- * that the address in the Reply-To header will always appear in
- * the reply if reply_all is true.
- */
- if (reply_to_header_is_redundant (message)) {
- reply_to_map[0].header = "from";
- reply_to_map[0].fallback = NULL;
- }
-
for (i = 0; i < ARRAY_SIZE (reply_to_map); i++) {
- const char *recipients;
+ InternetAddressList *recipients;
- recipients = notmuch_message_get_header (message,
- reply_to_map[i].header);
- if ((recipients == NULL || recipients[0] == '\0') && reply_to_map[i].fallback)
- recipients = notmuch_message_get_header (message,
- reply_to_map[i].fallback);
+ recipients = reply_to_map[i].get_header (message, mime_message);
- n += scan_address_string (recipients, config, reply,
- reply_to_map[i].recipient_type, &from_addr);
+ n += scan_address_list (recipients, config, reply,
+ reply_to_map[i].recipient_type, &from_addr);
if (!reply_all && n) {
/* Stop adding new recipients in reply-to-sender mode if
create_reply_message(void *ctx,
notmuch_config_t *config,
notmuch_message_t *message,
- notmuch_bool_t reply_all)
+ GMimeMessage *mime_message,
+ notmuch_bool_t reply_all,
+ notmuch_bool_t limited)
{
const char *subject, *from_addr = NULL;
const char *in_reply_to, *orig_references, *references;
- /* The 1 means we want headers in a "pretty" order. */
- GMimeMessage *reply = g_mime_message_new (1);
+ /*
+ * Use the below header order for limited headers, "pretty" order
+ * otherwise.
+ */
+ GMimeMessage *reply = g_mime_message_new (limited ? 0 : 1);
if (reply == NULL) {
fprintf (stderr, "Out of memory\n");
return NULL;
}
- subject = notmuch_message_get_header (message, "subject");
- if (subject) {
- if (strncasecmp (subject, "Re:", 3))
- subject = talloc_asprintf (ctx, "Re: %s", subject);
- g_mime_message_set_subject (reply, subject);
- }
+ 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);
+
+ orig_references = notmuch_message_get_header (message, "references");
+ if (orig_references && *orig_references)
+ references = talloc_asprintf (ctx, "%s %s", orig_references,
+ in_reply_to);
+ else
+ references = talloc_strdup (ctx, in_reply_to);
+
+ g_mime_object_set_header (GMIME_OBJECT (reply), "References", references);
- from_addr = add_recipients_from_message (reply, config,
- message, reply_all);
+ from_addr = add_recipients_from_message (reply, config, message,
+ mime_message, reply_all);
+
+ /* The above is all that is needed for limited headers. */
+ if (limited)
+ return reply;
/*
* Sadly, there is no standard way to find out to which email
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);
-
- 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);
-
- orig_references = notmuch_message_get_header (message, "references");
- if (!orig_references)
- /* Treat errors like missing References headers. */
- orig_references = "";
- references = talloc_asprintf (ctx, "%s%s%s",
- *orig_references ? orig_references : "",
- *orig_references ? " " : "",
- in_reply_to);
- g_mime_object_set_header (GMIME_OBJECT (reply),
- "References", references);
+ g_mime_object_set_header (GMIME_OBJECT (reply), "From", from_addr);
- return reply;
-}
-
-static int
-notmuch_reply_format_default(void *ctx,
- notmuch_config_t *config,
- notmuch_message_t *message,
- notmuch_show_params_t *params,
- notmuch_bool_t reply_all,
- unused (sprinter_t *sp))
-{
- GMimeMessage *reply;
- mime_node_t *root;
-
- reply = create_reply_message (ctx, config, message, reply_all);
- if (!reply)
- return 1;
-
- show_reply_headers (reply);
-
- g_object_unref (G_OBJECT (reply));
-
- if (mime_node_open (ctx, message, ¶ms->crypto, &root) == NOTMUCH_STATUS_SUCCESS) {
- format_part_reply (root);
- talloc_free (root);
- }
-
- return 0;
-}
-
-static int
-notmuch_reply_format_sprinter(void *ctx,
- notmuch_config_t *config,
- notmuch_message_t *message,
- notmuch_show_params_t *params,
- notmuch_bool_t reply_all,
- sprinter_t *sp)
-{
- GMimeMessage *reply;
- mime_node_t *node;
-
- if (mime_node_open (ctx, message, ¶ms->crypto, &node) != NOTMUCH_STATUS_SUCCESS)
- return 1;
-
- reply = create_reply_message (ctx, config, message, reply_all);
- if (!reply)
- return 1;
-
- sp->begin_map (sp);
-
- /* The headers of the reply message we've created */
- sp->map_key (sp, "reply-headers");
- format_headers_sprinter (sp, reply, TRUE);
- g_object_unref (G_OBJECT (reply));
-
- /* Start the original */
- sp->map_key (sp, "original");
- format_part_sprinter (ctx, sp, node, TRUE, TRUE, FALSE);
-
- /* End */
- sp->end (sp);
-
- return 0;
-}
-
-/* This format is currently tuned for a git send-email --notmuch hook */
-static int
-notmuch_reply_format_headers_only(void *ctx,
- notmuch_config_t *config,
- notmuch_message_t *message,
- unused (notmuch_show_params_t *params),
- notmuch_bool_t reply_all,
- unused (sprinter_t *sp))
-{
- GMimeMessage *reply;
- const char *in_reply_to, *orig_references, *references;
-
- /* The 0 means we do not want headers in a "pretty" order. */
- reply = g_mime_message_new (0);
- if (reply == NULL) {
- fprintf (stderr, "Out of memory\n");
- return 1;
+ subject = notmuch_message_get_header (message, "subject");
+ if (subject) {
+ if (strncasecmp (subject, "Re:", 3))
+ subject = talloc_asprintf (ctx, "Re: %s", subject);
+ g_mime_message_set_subject (reply, subject);
}
- 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);
-
- orig_references = notmuch_message_get_header (message, "references");
-
- /*
- * We print In-Reply-To followed by References because git
- * format-patch treats them specially. Git does not interpret the
- * other headers specially.
- */
- references = talloc_asprintf (ctx, "%s%s%s",
- orig_references ? orig_references : "",
- orig_references ? " " : "",
- in_reply_to);
- g_mime_object_set_header (GMIME_OBJECT (reply), "References", references);
-
- (void)add_recipients_from_message (reply, config, message, reply_all);
-
- show_reply_headers (reply);
-
- g_object_unref (G_OBJECT (reply));
-
- return 0;
+ return reply;
}
enum {
int format,
notmuch_bool_t reply_all)
{
+ GMimeMessage *reply;
+ mime_node_t *node;
notmuch_messages_t *messages;
notmuch_message_t *message;
notmuch_status_t status;
struct sprinter *sp = NULL;
- int ret = 0;
- int (*reply_format_func) (void *ctx,
- notmuch_config_t *config,
- notmuch_message_t *message,
- notmuch_show_params_t *params,
- notmuch_bool_t reply_all,
- struct sprinter *sp);
if (format == FORMAT_JSON || format == FORMAT_SEXP) {
unsigned count;
fprintf (stderr, "Error: search term did not match precisely one message (matched %d messages).\n", count);
return 1;
}
- }
- if (format == FORMAT_HEADERS_ONLY) {
- reply_format_func = notmuch_reply_format_headers_only;
- } else if (format == FORMAT_JSON) {
- reply_format_func = notmuch_reply_format_sprinter;
- sp = sprinter_json_create (config, stdout);
- } else if (format == FORMAT_SEXP) {
- reply_format_func = notmuch_reply_format_sprinter;
- sp = sprinter_sexp_create (config, stdout);
- } else {
- reply_format_func = notmuch_reply_format_default;
+ if (format == FORMAT_JSON)
+ sp = sprinter_json_create (config, stdout);
+ else
+ sp = sprinter_sexp_create (config, stdout);
}
status = notmuch_query_search_messages_st (query, &messages);
{
message = notmuch_messages_get (messages);
- ret = reply_format_func(config, config, message, params, reply_all, sp);
+ if (mime_node_open (config, message, ¶ms->crypto, &node))
+ return 1;
- notmuch_message_destroy (message);
+ reply = create_reply_message (config, config, message,
+ GMIME_MESSAGE (node->part), reply_all,
+ format == FORMAT_HEADERS_ONLY);
+ if (!reply)
+ return 1;
- if (ret)
- break;
+ if (format == FORMAT_JSON || format == FORMAT_SEXP) {
+ sp->begin_map (sp);
+
+ /* The headers of the reply message we've created */
+ sp->map_key (sp, "reply-headers");
+ format_headers_sprinter (sp, reply, TRUE);
+
+ /* Start the original */
+ sp->map_key (sp, "original");
+ format_part_sprinter (config, sp, node, TRUE, TRUE, FALSE);
+
+ /* End */
+ sp->end (sp);
+ } else {
+ show_reply_headers (reply);
+ if (format == FORMAT_DEFAULT)
+ format_part_reply (node);
+ }
+
+ g_object_unref (G_OBJECT (reply));
+ talloc_free (node);
+
+ notmuch_message_destroy (message);
}
- return ret;
+ return 0;
}
int
projects / notmuch / blobdiff