diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-13 22:18:01 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-13 22:18:01 +0200 |
| commit | 71eeb74a608ddae2b52fb43766616672d0cdda18 (patch) | |
| tree | 1d2942c8b45fd77feb46fe89412d5bf7c7a8307b | |
| parent | 072412ed45aa20a67aaa7e387d7f6bf59c7d3fbe (diff) | |
| download | vim-git-71eeb74a608ddae2b52fb43766616672d0cdda18.tar.gz | |
patch 8.0.1101: channel write fails if writing to log failsv8.0.1101
Problem: Channel write fails if writing to log fails.
Solution: Ignore return value of fwrite(). (Ozaki Kiichi, closes #2081)
| -rw-r--r-- | src/channel.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/channel.c b/src/channel.c index fa1898db9..49bab16d1 100644 --- a/src/channel.c +++ b/src/channel.c @@ -138,7 +138,7 @@ ch_log_active(void) } static void -ch_log_lead(char *what, channel_T *ch) +ch_log_lead(const char *what, channel_T *ch) { if (log_fd != NULL) { @@ -1813,12 +1813,11 @@ channel_save(channel_T *channel, ch_part_T part, char_u *buf, int len, head->rq_prev = node; } - if (log_fd != NULL && lead != NULL) + if (ch_log_active() && lead != NULL) { ch_log_lead(lead, channel); fprintf(log_fd, "'"); - if (fwrite(buf, len, 1, log_fd) != 1) - return FAIL; + ignored = (int)fwrite(buf, len, 1, log_fd); fprintf(log_fd, "'\n"); } return OK; @@ -3385,7 +3384,7 @@ channel_read_block(channel_T *channel, ch_part_T part, int timeout) channel_consume(channel, part, (int)(nl - buf) + 1); } } - if (log_fd != NULL) + if (ch_log_active()) ch_log(channel, "Returning %d bytes", (int)STRLEN(msg)); return msg; } @@ -3670,7 +3669,7 @@ channel_send( return FAIL; } - if (log_fd != NULL) + if (ch_log_active()) { ch_log_lead("SEND ", channel); fprintf(log_fd, "'"); diff --git a/src/version.c b/src/version.c index a62d1901c..259b576ec 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1101, +/**/ 1100, /**/ 1099, |