aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-15 23:14:06 -05:00
Code Activity

patch 7.4.1325

Browse Source 
Problem:    Channel test fails on difference between Unix and DOS line endings.
Solution:   Strip off CR.  Make assert show difference better.
This commit is contained in:
Bram Moolenaar
2016-02-15 22:37:37 +01:00
parent 38a55639d6
commit 2368917d8f
3 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/channel.c
View File

@@ -1262,6 +1262,8 @@ channel_save(channel_T *channel, char_u *buf, int len)
{
readq_T *node;
readq_T *head = &channel->ch_head;
char_u *p;
int i;
node = (readq_T *)alloc(sizeof(readq_T));
if (node == NULL)
@@ -1272,8 +1274,13 @@ channel_save(channel_T *channel, char_u *buf, int len)
vim_free(node);
return FAIL; /* out of memory */
}
mch_memmove(node->rq_buffer, buf, (size_t)len);
node->rq_buffer[len] = NUL;
/* TODO: don't strip CR when channel is in raw mode */
p = node->rq_buffer;
for (i = 0; i < len; ++i)
if (buf[i] != CAR || i + 1 >= len || buf[i + 1] != NL)
*p++ = buf[i];
*p = NUL;
/* append node to the tail of the queue */
node->rq_next = NULL;