diff options
| author |  Austin Clements <amdragon@MIT.EDU> | 2013-08-16 11:35:42 -0400 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2013-08-17 09:05:44 +0200 |
| commit | 6cdab6e0b77041791f70345ac729d63d865bae5e (patch) | |
| tree | dfa453493e1688d390b3fb5dc829ea14327be054 /notmuch-reply.c | |
| parent | ad7bb423fb26f2b2fb801d3c2e3ceef9c7e3e622 (diff) | |
reply: Remove extraneous space from generated References
Previously, the References header code seemed to assume
notmuch_message_get_header would return NULL if the header was not
present, but it actually returns "". As a result of this, it was
inserting an unnecessary space when concatenating an empty or missing
original references header with the new reference.
This shows up in only two tests because the text reply format later
passes the whole reply template through g_mime_filter_headers, which
has the side effect of stripping out this extra space.
Diffstat (limited to 'notmuch-reply.c')
| -rw-r--r-- | notmuch-reply.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/notmuch-reply.c b/notmuch-reply.c index 3b2b58d1..472a002e 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -537,9 +537,12 @@ create_reply_message(void *ctx, "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 ? " " : "", + *orig_references ? orig_references : "", + *orig_references ? " " : "", in_reply_to); g_mime_object_set_header (GMIME_OBJECT (reply), "References", references); |