git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
To: gitster@pobox.com
To: gitster@pobox.com
Cc: git@vger.kernel.org,
	Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>,
	Erik Faye-Lund <kusmabite@googlemail.com>,
	Jakub Narebski <jnareb@gmail.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Jeff King <peff@peff.net>
Subject: [PATCH v2 2/2] git-imap-send: Convert LF to CRLF before storing patch to draft box
Date: Thu, 11 Feb 2010 23:45:13 +0900	[thread overview]
Message-ID: <1265899513-11567-2-git-send-email-mitake@dcl.info.waseda.ac.jp> (raw)
In-Reply-To: <1265717345-2118-1-git-send-email-mitake@dcl.info.waseda.ac.jp>

Sorry, I wrote wrong address of Jeff King,
copying email address from Thunderbird is irritant thing for me...
This is resending.

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.

Cc: Erik Faye-Lund <kusmabite@googlemail.com>
Cc: Jakub Narebski <jnareb@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jeff King <peff@peff.net>
Signed-off-by: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
---
 imap-send.c |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/imap-send.c b/imap-send.c
index dcd8a2a..dbc72ca 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1279,6 +1279,30 @@ 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;
+
+	for (i = 0; i < msg->len; i++) {
+		if (msg->data[i] == '\n')
+			lfnum++;
+	}
+	new = xcalloc(msg->len + lfnum, sizeof(char));
+	for (i = 0, j = 0; i < msg->len; i++) {
+		if (msg->data[i] != '\n') {
+			new[j++] = msg->data[i];
+			continue;
+		}
+		new[j++] = '\r';
+		new[j++] = '\n';
+	}
+	msg->len += lfnum;
+	free(msg->data);
+	msg->data = new;
+	msg->crlf = 1;
+}
+
 static int imap_store_msg(struct store *gctx, struct msg_data *data)
 {
 	struct imap_store *ctx = (struct imap_store *)gctx;
@@ -1288,6 +1312,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.6.5.2


  parent reply	other threads:[~2010-02-11 14:45 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-06 19:26 imap.preformattedHTML and imap.sslverify Junio C Hamano
2010-02-08 22:31 ` Jeremy White
2010-02-08 23:05   ` Junio C Hamano
2010-02-09 12:09     ` [PATCH 0/4] Some improvements for git-imap-send Hitoshi Mitake
2010-02-09 15:06       ` Jeff King
2010-02-09 15:13         ` Erik Faye-Lund
2010-02-09 16:57           ` Jeff King
2010-02-09 18:37             ` Erik Faye-Lund
2010-02-09 18:54               ` Jeff King
2010-02-11 14:38       ` [PATCH v2 1/2] git-imap-send: Add CRAM-MD5 authenticate method support Hitoshi Mitake
2010-02-11 14:55         ` Erik Faye-Lund
2010-02-11 14:59           ` Hitoshi Mitake
2010-02-11 15:06           ` [PATCH v3 " Hitoshi Mitake
2010-02-11 20:30             ` Junio C Hamano
2010-02-12 11:23               ` Hitoshi Mitake
2010-02-11 14:38       ` [PATCH v2 2/2] git-imap-send: Convert LF to CRLF before storing patch to draft box Hitoshi Mitake
2010-02-11 20:48         ` Junio C Hamano
2010-02-12 11:24           ` Hitoshi Mitake
2010-02-11 14:45       ` [PATCH v2 1/2] git-imap-send: Add CRAM-MD5 authenticate method support Hitoshi Mitake
2010-02-11 14:45       ` Hitoshi Mitake [this message]
2010-02-12 11:36       ` [PATCH v4 " Hitoshi Mitake
2010-02-12 12:41         ` Erik Faye-Lund
2010-02-13  4:21           ` Hitoshi Mitake
2010-02-12 21:44         ` Junio C Hamano
2010-02-13  6:49           ` Hitoshi Mitake
2010-02-13  6:56             ` [PATCH v5 " Hitoshi Mitake
2010-02-13  7:42             ` [PATCH v4 " Junio C Hamano
2010-02-16  6:34               ` Junio C Hamano
2010-02-17  9:17                 ` Hitoshi Mitake
2010-02-17  9:18                   ` [PATCH v6 " Hitoshi Mitake
2010-02-17 18:31                   ` [PATCH v4 " Junio C Hamano
2010-02-18 15:45                     ` Hitoshi Mitake
2010-02-17  8:51               ` Hitoshi Mitake
2010-02-12 11:36       ` [PATCH v4 2/2] git-imap-send: Convert LF to CRLF before storing patch to draft box Hitoshi Mitake
2010-02-09 12:09     ` [PATCH 1/4] Add base64 encoder and decoder Hitoshi Mitake
2010-02-09 14:45       ` Erik Faye-Lund
2010-02-11 14:37         ` Hitoshi Mitake
2010-02-09 12:09     ` [PATCH 2/4] Add stuffs for MD5 hash algorithm Hitoshi Mitake
2010-02-09 12:09     ` [PATCH 3/4] git-imap-send: Implement CRAM-MD5 auth method Hitoshi Mitake
2010-02-09 14:22       ` Erik Faye-Lund
2010-02-11 14:55         ` Hitoshi Mitake
2010-02-11 14:59           ` Erik Faye-Lund
2010-02-11 15:11             ` Hitoshi Mitake
2010-02-09 12:09     ` [PATCH 4/4] git-imap-send: Add method to convert from LF to CRLF Hitoshi Mitake
2010-02-09 16:15       ` Jakub Narebski
2010-02-11 14:37         ` Hitoshi Mitake
2010-02-09 17:24       ` Linus Torvalds
2010-02-09 18:20         ` Junio C Hamano
2010-02-11 14:38           ` Hitoshi Mitake

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=1265899513-11567-2-git-send-email-mitake@dcl.info.waseda.ac.jp \
    --to=mitake@dcl.info.waseda.ac.jp \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jnareb@gmail.com \
    --cc=kusmabite@googlemail.com \
    --cc=peff@peff.net \
    --cc=torvalds@linux-foundation.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.
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).