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.
diff --git a/src/channel.c b/src/channel.c
index c86304b..d5d7ffb 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1262,6 +1262,8 @@
{
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 @@
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;