From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 4/7] cli: sanitize the received header before scanning for replies
Date: Sat, 30 Nov 2013 17:33:53 +0200 [thread overview]
Message-ID: <90e472ab54b58786c2462ae3656aafdc27d10ca5.1385825425.git.jani@nikula.org> (raw)
In-Reply-To: <cover.1385825425.git.jani@nikula.org>
In-Reply-To: <cover.1385825425.git.jani@nikula.org>
This makes the from guessing agnostic to header folding by spaces or
tabs.
---
notmuch-reply.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/notmuch-reply.c b/notmuch-reply.c
index ca41405..a2eee17 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -21,6 +21,7 @@
*/
#include "notmuch-client.h"
+#include "string-util.h"
#include "sprinter.h"
static void
@@ -463,14 +464,21 @@ guess_from_received_header (notmuch_config_t *config,
notmuch_message_t *message)
{
const char *received, *addr;
+ char *sanitized;
received = notmuch_message_get_header (message, "received");
if (! received)
return NULL;
- addr = guess_from_received_for (config, received);
+ sanitized = sanitize_string (config, received);
+ if (! sanitized)
+ return NULL;
+
+ addr = guess_from_received_for (config, sanitized);
if (! addr)
- addr = guess_from_received_by (config, received);
+ addr = guess_from_received_by (config, sanitized);
+
+ talloc_free (sanitized);
return addr;
}
--
1.8.4.2
next prev parent reply other threads:[~2013-11-30 15:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-30 15:33 [PATCH v2 0/7] lib: replace the message header parser with gmime Jani Nikula
2013-11-30 15:33 ` [PATCH v2 1/7] cli: sanitize tabs and newlines to spaces in notmuch search Jani Nikula
2013-11-30 15:33 ` [PATCH v2 2/7] cli: refactor reply from guessing Jani Nikula
2014-02-02 18:21 ` Mark Walters
2013-11-30 15:33 ` [PATCH v2 3/7] util: make sanitize string available in string util for reuse Jani Nikula
2014-02-02 18:24 ` Mark Walters
2013-11-30 15:33 ` Jani Nikula [this message]
2013-11-30 15:33 ` [PATCH v2 5/7] lib: replace the header parser with gmime Jani Nikula
2013-11-30 15:33 ` [PATCH v2 6/7] lib: parse messages only once Jani Nikula
2013-11-30 15:33 ` [PATCH v2 7/7] HACK: fix broken messages in the perf test corpus Jani Nikula
2013-11-30 17:48 ` David Bremner
2014-01-15 18:03 ` [PATCH v2 0/7] lib: replace the message header parser with gmime David Bremner
2014-02-02 13:03 ` Jani Nikula
2014-02-02 18:15 ` Mark Walters
2014-02-02 19:32 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=90e472ab54b58786c2462ae3656aafdc27d10ca5.1385825425.git.jani@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).