This is v3 of id:cover.1385825425.git.jani at nikula.org As before, patches 1-4 are prep work that could be merged on their own, and patches 5-6 actually make the change.
The only changes since v2 are cosmetic: rebase, changes in comments, function names, and commit messages. BR, Jani. Jani Nikula (6): cli: sanitize tabs and newlines to spaces in notmuch search cli: refactor reply from guessing util: make sanitize string available in string util for reuse cli: sanitize the received header before scanning for replies lib: replace the header parser with gmime lib: parse messages only once lib/database.cc | 6 +- lib/index.cc | 70 +-------- lib/message-file.c | 354 +++++++++++++++------------------------------ lib/message.cc | 6 + lib/notmuch-private.h | 20 ++- notmuch-reply.c | 206 ++++++++++++++++---------- notmuch-search.c | 17 --- test/T090-search-output.sh | 2 +- util/string-util.c | 22 +++ util/string-util.h | 7 + 10 files changed, 313 insertions(+), 397 deletions(-) -- 1.8.5.2