mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hm/maint-imap-send-crlf'

Browse Source 
* hm/maint-imap-send-crlf:
  git-imap-send: Convert LF to CRLF before storing patch to draft box
This commit is contained in:
Junio C Hamano
2010-02-21 12:00:21 -08:00
parent 5f8a0de98b 67d176300c
commit db3df36a3d
1 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
imap-send.c
View File

@ -91,7 +91,6 @@ struct msg_data {
char *data; char *data;
int len; int len;
unsigned char flags; unsigned char flags;
unsigned int crlf:1;
}; };
static const char imap_send_usage[] = "git imap-send < <mbox>"; 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; 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) static int imap_store_msg(struct store *gctx, struct msg_data *data)
{ {
struct imap_store *ctx = (struct imap_store *)gctx; 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; int ret, d;
char flagstr[128]; char flagstr[128];
lf_to_crlf(data);
memset(&cb, 0, sizeof(cb)); memset(&cb, 0, sizeof(cb));
cb.dlen = data->len; cb.dlen = data->len;