Mercurial > vim
diff src/channel.c @ 9434:8f904a323b3f v7.4.1998
commit https://github.com/vim/vim/commit/bf2cc5f36d5ffd5de445e6970602000c7869b65a
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jul 7 20:45:06 2016 +0200
patch 7.4.1998
Problem: When writing buffer lines to a job there is no NL to NUL
conversion.
Solution: Make it work symmetrical with writing lines from a job into a
buffer.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 07 Jul 2016 21:00:06 +0200 |
| parents | 2465b6cda394 |
| children | 69ed2c9d34a6 |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -1313,14 +1313,20 @@ write_buf_line(buf_T *buf, linenr_T lnum char_u *line = ml_get_buf(buf, lnum, FALSE); int len = (int)STRLEN(line); char_u *p; + int i; /* Need to make a copy to be able to append a NL. */ if ((p = alloc(len + 2)) == NULL) return; memcpy((char *)p, (char *)line, len); + + for (i = 0; i < len; ++i) + if (p[i] == NL) + p[i] = NUL; + p[len] = NL; p[len + 1] = NUL; - channel_send(channel, PART_IN, p, "write_buf_line()"); + channel_send(channel, PART_IN, p, len + 1, "write_buf_line()"); vim_free(p); } @@ -2185,7 +2191,7 @@ channel_exe_cmd(channel_T *channel, int { channel_send(channel, part == PART_SOCK ? PART_SOCK : PART_IN, - json, (char *)cmd); + json, (int)STRLEN(json), (char *)cmd); vim_free(json); } } @@ -3380,9 +3386,8 @@ channel_handle_events(void) * Return FAIL or OK. */ int -channel_send(channel_T *channel, int part, char_u *buf, char *fun) +channel_send(channel_T *channel, int part, char_u *buf, int len, char *fun) { - int len = (int)STRLEN(buf); int res; sock_T fd; @@ -3470,7 +3475,7 @@ send_common( opt->jo_callback, opt->jo_partial, id); } - if (channel_send(channel, part_send, text, fun) == OK + if (channel_send(channel, part_send, text, (int)STRLEN(text), fun) == OK && opt->jo_callback == NULL) return channel; return NULL;