lobo/isync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

factor out copy_msg_bytes()

Browse source
This commit is contained in:
Oswald Buddenhagen 2016-11-05 18:32:49 +01:00
parent 509a191474
commit 951b7e77f8
1 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/sync.c
View file

@ -301,6 +301,36 @@ copy_msg( copy_vars_t *vars )
static void msg_stored( int sts, int uid, void *aux ); static void msg_stored( int sts, int uid, void *aux );
static void
copy_msg_bytes( char **out_ptr, const char *in_buf, int *in_idx, int in_len, int in_cr, int out_cr )
{
char *out = *out_ptr;
int idx = *in_idx;
if (out_cr != in_cr) {
char c;
if (out_cr) {
for (; idx < in_len; idx++) {
if ((c = in_buf[idx]) != '\r') {
if (c == '\n')
*out++ = '\r';
*out++ = c;
}
}
} else {
for (; idx < in_len; idx++) {
if ((c = in_buf[idx]) != '\r')
*out++ = c;
}
}
} else {
memcpy( out, in_buf + idx, in_len - idx );
out += in_len - idx;
idx = in_len;
}
*out_ptr = out;
*in_idx = idx;
}
static void static void
msg_fetched( int sts, void *aux ) msg_fetched( int sts, void *aux )
{ {
@ -376,23 +406,7 @@ msg_fetched( int sts, void *aux )
buf = vars->data.data = nfmalloc( vars->data.len ); buf = vars->data.data = nfmalloc( vars->data.len );
i = 0; i = 0;
if (vars->srec) { if (vars->srec) {
if (tcr != scr) { copy_msg_bytes( &buf, fmap, &i, sbreak, scr, tcr );
if (tcr) {
for (; i < sbreak; i++)
if ((c = fmap[i]) != '\r') {
if (c == '\n')
*buf++ = '\r';
*buf++ = c;
}
} else {
for (; i < sbreak; i++)
if ((c = fmap[i]) != '\r')
*buf++ = c;
}
} else {
memcpy( buf, fmap, sbreak );
buf += sbreak;
}
memcpy( buf, "X-TUID: ", 8 ); memcpy( buf, "X-TUID: ", 8 );
buf += 8; buf += 8;
@ -403,21 +417,7 @@ msg_fetched( int sts, void *aux )
*buf++ = '\n'; *buf++ = '\n';
i = ebreak; i = ebreak;
} }
if (tcr != scr) { copy_msg_bytes( &buf, fmap, &i, len, scr, tcr );
if (tcr) {
for (; i < len; i++)
if ((c = fmap[i]) != '\r') {
if (c == '\n')
*buf++ = '\r';
*buf++ = c;
}
} else {
for (; i < len; i++)
if ((c = fmap[i]) != '\r')
*buf++ = c;
}
} else
memcpy( buf, fmap + i, len - i );
free( fmap ); free( fmap );
} }