Mercurial > vim
changeset 2747:6146c9859f65 v7.3.150
updated for version 7.3.150
Problem: readline() does not return the last line when the NL is missing.
(Hong Xu)
Solution: When at the end of the file Also check for a previous line.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Fri, 01 Apr 2011 16:07:46 +0200 |
| parents | 058380fbb8f3 |
| children | e5ef158a7e36 |
| files | src/eval.c src/version.c |
| diffstat | 2 files changed, 27 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -14305,9 +14305,9 @@ f_readfile(argvars, rettv) { if (buf[filtd] == '\n' || readlen <= 0) { - /* Only when in binary mode add an empty list item when the - * last line ends in a '\n'. */ - if (!binary && readlen == 0 && filtd == 0) + /* In binary mode add an empty list item when the last + * non-empty line ends in a '\n'. */ + if (!binary && readlen == 0 && filtd == 0 && prev == NULL) break; /* Found end-of-line or end-of-file: add a text line to the @@ -14372,25 +14372,28 @@ f_readfile(argvars, rettv) if (tolist == 0) { - /* "buf" is full, need to move text to an allocated buffer */ - if (prev == NULL) - { - prev = vim_strnsave(buf, buflen); - prevlen = buflen; - } - else - { - s = alloc((unsigned)(prevlen + buflen)); - if (s != NULL) - { - mch_memmove(s, prev, prevlen); - mch_memmove(s + prevlen, buf, buflen); - vim_free(prev); - prev = s; - prevlen += buflen; - } - } - filtd = 0; + if (buflen >= FREAD_SIZE / 2) + { + /* "buf" is full, need to move text to an allocated buffer */ + if (prev == NULL) + { + prev = vim_strnsave(buf, buflen); + prevlen = buflen; + } + else + { + s = alloc((unsigned)(prevlen + buflen)); + if (s != NULL) + { + mch_memmove(s, prev, prevlen); + mch_memmove(s + prevlen, buf, buflen); + vim_free(prev); + prev = s; + prevlen += buflen; + } + } + filtd = 0; + } } else {