From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: xzer <xiaozhu@gmail.com>, git@vger.kernel.org
Subject: [PATCH 3/3] format-patch: rfc2047-encode newlines in headers
Date: Wed, 23 Feb 2011 04:59:18 -0500 [thread overview]
Message-ID: <20110223095917.GC9222@sigill.intra.peff.net> (raw)
In-Reply-To: <20110223094844.GA9205@sigill.intra.peff.net>
These should generally never happen, as we already
concatenate multiples in subjects into a single line. But
let's be defensive, since not encoding them means we will
output malformed headers.
Signed-off-by: Jeff King <peff@peff.net>
---
pretty.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pretty.c b/pretty.c
index 0e167f4..65d20a7 100644
--- a/pretty.c
+++ b/pretty.c
@@ -228,7 +228,7 @@ static void add_rfc2047(struct strbuf *sb, const char *line, int len,
for (i = 0; i < len; i++) {
int ch = line[i];
- if (non_ascii(ch))
+ if (non_ascii(ch) || ch == '\n')
goto needquote;
if ((i + 1 < len) && (ch == '=' && line[i+1] == '?'))
goto needquote;
@@ -254,7 +254,7 @@ needquote:
* many programs do not understand this and just
* leave the underscore in place.
*/
- if (is_rfc2047_special(ch) || ch == ' ') {
+ if (is_rfc2047_special(ch) || ch == ' ' || ch == '\n') {
strbuf_addf(sb, "=%02X", ch);
line_len += 3;
}
--
1.7.2.5.15.gfdd1c
next prev parent reply other threads:[~2011-02-23 9:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-14 8:09 [PATCH] generate a valid rfc2047 mail header for multi-line subject xzer
2011-02-22 20:43 ` Junio C Hamano
2011-02-23 8:08 ` Jeff King
2011-02-23 9:48 ` Jeff King
2011-02-23 9:50 ` [PATCH 1/3] strbuf: add fixed-length version of add_wrapped_text Jeff King
2011-02-23 9:58 ` [PATCH 2/3] format-patch: wrap long header lines Jeff King
2011-02-23 9:59 ` Jeff King [this message]
2011-02-23 21:47 ` [PATCH 3/3] format-patch: rfc2047-encode newlines in headers Junio C Hamano
2011-02-24 7:15 ` Jeff King
2011-02-23 15:16 ` [PATCH] generate a valid rfc2047 mail header for multi-line subject xzer
2011-02-23 16:35 ` Jeff King
2011-02-23 17:34 ` Junio C Hamano
2011-02-24 7:34 ` Jeff King
2011-02-23 15:34 ` xzer
2011-02-23 17:45 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110223095917.GC9222@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=xiaozhu@gmail.com \
/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.
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 NNTP newsgroup(s).