mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-11 22:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2343: Vim9: return type of readfile() is any (#20896)

Browse Source 
Problem:    Vim9: return type of readfile() is any.
Solution:   Add readblob() so that readfile() can be expected to always
            return a list of strings. (closes vim/vim#7671)

c423ad77ed

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2022-11-01 20:21:48 +08:00
committed by GitHub
parent c3aba403c6
commit c46d46e9f1
5 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/eval/funcs.c
View File

@@ -5872,11 +5872,11 @@ static void f_readdir(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
ga_clear_strings(&ga);
}
/// "readfile()" function
static void f_readfile(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
/// "readfile()" or "readblob()" function
static void read_file_or_blob(typval_T *argvars, typval_T *rettv, bool always_blob)
{
bool binary = false;
bool blob = false;
bool blob = always_blob;
FILE *fd;
char buf[(IOSIZE/256) * 256]; // rounded to avoid odd + 1
int io_size = sizeof(buf);
@@ -6011,8 +6011,8 @@ static void f_readfile(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
int adjust_prevlen = 0;
if (dest < buf) { // -V782
adjust_prevlen = (int)(buf - dest); // -V782
// adjust_prevlen must be 1 or 2.
adjust_prevlen = (int)(buf - dest); // -V782
dest = buf;
}
if (readlen > p - buf + 1) {
@@ -6055,6 +6055,18 @@ static void f_readfile(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
fclose(fd);
}
/// "readblob()" function
static void f_readblob(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
{
read_file_or_blob(argvars, rettv, true);
}
/// "readfile()" function
static void f_readfile(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
{
read_file_or_blob(argvars, rettv, false);
}
/// "getreginfo()" function
static void f_getreginfo(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
{