summaryrefslogtreecommitdiff
path: root/imap-send.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-03 06:55:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-03 06:55:03 (GMT)
commitbe8198b236e2eeaf08618185f4f7ad83896bb704 (patch)
tree374fa60820b040cb7896fe3d5296d51c320fbaf2 /imap-send.c
parenta886ba2801cbe0a4d6bbc34714cb09996dbcc127 (diff)
parent67d176300c0a79d5cf65402c641fcec7c5388f29 (diff)
downloadgit-be8198b236e2eeaf08618185f4f7ad83896bb704.zip
git-be8198b236e2eeaf08618185f4f7ad83896bb704.tar.gz
git-be8198b236e2eeaf08618185f4f7ad83896bb704.tar.bz2
Merge branch 'hm/maint-imap-send-crlf' into maint
* hm/maint-imap-send-crlf: git-imap-send: Convert LF to CRLF before storing patch to draft box
Diffstat (limited to 'imap-send.c')
-rw-r--r--imap-send.c40
1 files changed, 39 insertions, 1 deletions
diff --git a/imap-send.c b/imap-send.c
index ba72fa4..5631930 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -91,7 +91,6 @@ struct msg_data {
char *data;
int len;
unsigned char flags;
- unsigned int crlf:1;
};
static const char imap_send_usage[] = "git imap-send < <mbox>";
@@ -1162,6 +1161,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 = xmalloc(msg->len + lfnum);
+ 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';
+ /* otherwise it already had CR before */
+ 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;
@@ -1171,6 +1208,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;