kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(eval): correct failure return value for readfile/blob (#27722)

Browse Source 
Currently returns 0 on failure, but should return an empty list (or blob).

Regressed in the big blob port of '21 (#15211).
This commit is contained in:
Sean Dewar 2024-03-03 22:33:28 +00:00 committed by GitHub
parent 3971797be1
commit bf0c69e504
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6005,6 +6005,12 @@ static void read_file_or_blob(typval_T *argvars, typval_T *rettv, bool always_bl
} }
} }
if (blob) {
tv_blob_alloc_ret(rettv);
} else {
tv_list_alloc_ret(rettv, kListLenUnknown);
}
// Always open the file in binary mode, library functions have a mind of // Always open the file in binary mode, library functions have a mind of
// their own about CR-LF conversion. // their own about CR-LF conversion.
const char *const fname = tv_get_string(&argvars[0]); const char *const fname = tv_get_string(&argvars[0]);
@ -6019,7 +6025,6 @@ static void read_file_or_blob(typval_T *argvars, typval_T *rettv, bool always_bl
} }
if (blob) { if (blob) {
tv_blob_alloc_ret(rettv);
if (read_blob(fd, rettv, offset, size) == FAIL) { if (read_blob(fd, rettv, offset, size) == FAIL) {
semsg(_(e_notread), fname); semsg(_(e_notread), fname);
} }
@ -6027,7 +6032,7 @@ static void read_file_or_blob(typval_T *argvars, typval_T *rettv, bool always_bl
return; return;
} }
list_T *const l = tv_list_alloc_ret(rettv, kListLenUnknown); list_T *const l = rettv->vval.v_list;
while (maxline < 0 || tv_list_len(l) < maxline) { while (maxline < 0 || tv_list_len(l) < maxline) {
int readlen = (int)fread(buf, 1, (size_t)io_size, fd); int readlen = (int)fread(buf, 1, (size_t)io_size, fd);