Re: [PATCH] git-imap-send: Strip smtp From_ header from imap message.

From

Junio C Hamano <junkio@cox.net>

Date

Oct 18, 2006, 06:04 UTC

Message-ID

<7vlknegnwk.fsf@assigned-by-dhcp.cox.net>

In-Reply-To

<452EBF77.7040301@oribi.org>

Markus Amsler <markus.amsler@oribi.org> writes:

> Cyrus imap refuses messages with a 'From ' Header.
>
> Signed-off-by: Markus Amsler <markus.amsler@oribi.org>

Mike, are you Ok with this change?

---
  imap-send.c |    8 ++++++++
  1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/imap-send.c b/imap-send.c
index 362e474..16804ab 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1226,6 +1226,14 @@ split_msg( msg_data_t *all_msgs, msg_dat
 	if (msg->len < 5 || strncmp( data, "From ", 5 ))
 		return 0;

+	p = strchr( data, '\n' );
+	if (p) {
+		p = &p[1];
+		msg->len -= p-data;
+		*ofs += p-data;
+		data = p;
+	}
+
 	p = strstr( data, "\nFrom " );
 	if (p)
 		msg->len = &p[1] - data;