From: Hitoshi Mitake Date: Fri, 12 Feb 2010 11:36:12 GMT Subject: [PATCH v4 2/2] git-imap-send: Convert LF to CRLF before storing patch to draft box Message-ID: <1265974572-6282-2-git-send-email-mitake@dcl.info.waseda.ac.jp> In-Reply-To: <1265717345-2118-1-git-send-email-mitake@dcl.info.waseda.ac.jp> According to RFC of IMAP, all messages must not have "bare newlines ('\n')". '\n' should be converted to "\r\n" before storing messages to IMAP's mailbox. This patch implements the converting function to git-imap-send. --- v4: Based on Junio's indication, now lf_to_crlf() consider about message with CRLF. And struct msg_data doesn't have the bitfield member crlf now. Cc: Erik Faye-Lund Cc: Jakub Narebski Cc: Linus Torvalds Cc: Jeff King Signed-off-by: Hitoshi Mitake --- imap-send.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 deletions(-) diff --git a/imap-send.c b/imap-send.c index c5958a3..624ede3 100644 --- a/imap-send.c +++ b/imap-send.c @@ -95,7 +95,6 @@ struct msg_data { char *data; int len; unsigned char flags; - unsigned int crlf:1; }; static const char imap_send_usage[] = "git imap-send < "; @@ -1280,6 +1279,44 @@ static int imap_make_flags(int flags, char *buf) return d; } +static void lf_to_crlf(struct msg_data *msg) +{ + char *new; + int i, j, lfnum = 0; + + if (msg->data[0] == '\n') + lfnum++; + for (i = 1; i < msg->len; i++) { + if (msg->data[i - 1] != '\r' && msg->data[i] == '\n') + lfnum++; + } + + new = xcalloc(msg->len + lfnum, sizeof(char)); + if (msg->data[0] == '\n') { + new[0] = '\r'; + new[1] = '\n'; + i = 1; + j = 2; + } else { + new[0] = msg->data[0]; + i = 1; + j = 1; + } + for ( ; i < msg->len; i++) { + if (msg->data[i] != '\n') { + new[j++] = msg->data[i]; + continue; + } + if (!(msg->data[i - 1] == '\r')) + new[j++] = '\r'; + /* else: This '\n' is already not bare newline*/ + new[j++] = '\n'; + } + msg->len += lfnum; + free(msg->data); + msg->data = new; +} + static int imap_store_msg(struct store *gctx, struct msg_data *data) { struct imap_store *ctx = (struct imap_store *)gctx; @@ -1289,6 +1326,7 @@ static int imap_store_msg(struct store *gctx, struct msg_data *data) int ret, d; char flagstr[128]; + lf_to_crlf(data); memset(&cb, 0, sizeof(cb)); cb.dlen = data->len; -- 1.7.0.rc1.52.gf7cc2.dirty