Mercurial > vim
diff src/channel.c @ 8062:7fe3b9dc132b v7.4.1325
commit https://github.com/vim/vim/commit/2368917d8f0c0a997eac7a51ddfaa748dc528392
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Feb 15 22:37:37 2016 +0100
patch 7.4.1325
Problem: Channel test fails on difference between Unix and DOS line endings.
Solution: Strip off CR. Make assert show difference better.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 15 Feb 2016 22:45:05 +0100 |
| parents | 19304db153bc |
| children | e4c3f6720b03 |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -1262,6 +1262,8 @@ channel_save(channel_T *channel, char_u { 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 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;