Mercurial > vim
changeset 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 | abd64cf67bcf |
| children | b158efd26f38 |
| files | src/channel.c src/eval.c src/version.c |
| diffstat | 3 files changed, 46 insertions(+), 5 deletions(-) [+] |
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;
--- a/src/eval.c +++ b/src/eval.c @@ -9184,6 +9184,38 @@ prepare_assert_error(garray_T *gap) } /* + * Append "str" to "gap", escaping unprintable characters. + * Changes NL to \n, CR to \r, etc. + */ + static void +ga_concat_esc(garray_T *gap, char_u *str) +{ + char_u *p; + char_u buf[NUMBUFLEN]; + + for (p = str; *p != NUL; ++p) + switch (*p) + { + case BS: ga_concat(gap, (char_u *)"\\b"); break; + case ESC: ga_concat(gap, (char_u *)"\\e"); break; + case FF: ga_concat(gap, (char_u *)"\\f"); break; + case NL: ga_concat(gap, (char_u *)"\\n"); break; + case TAB: ga_concat(gap, (char_u *)"\\t"); break; + case CAR: ga_concat(gap, (char_u *)"\\r"); break; + case '\\': ga_concat(gap, (char_u *)"\\\\"); break; + default: + if (*p < ' ') + { + vim_snprintf((char *)buf, NUMBUFLEN, "\\x%02x", *p); + ga_concat(gap, buf); + } + else + ga_append(gap, *p); + break; + } +} + +/* * Fill "gap" with information about an assert error. */ static void @@ -9207,13 +9239,13 @@ fill_assert_error( ga_concat(gap, (char_u *)"Expected "); if (exp_str == NULL) { - ga_concat(gap, tv2string(exp_tv, &tofree, numbuf, 0)); + ga_concat_esc(gap, tv2string(exp_tv, &tofree, numbuf, 0)); vim_free(tofree); } else - ga_concat(gap, exp_str); + ga_concat_esc(gap, exp_str); ga_concat(gap, (char_u *)" but got "); - ga_concat(gap, tv2string(got_tv, &tofree, numbuf, 0)); + ga_concat_esc(gap, tv2string(got_tv, &tofree, numbuf, 0)); vim_free(tofree); } }