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

vim-patch:8.0.0642: writefile() continues after detecting an error

Browse Source 
Problem:    writefile() continues after detecting an error.
Solution:   Bail out as soon as an error is detected. (suggestions by Nikolai
            Pavlov, closes vim/vim#1476)
8cf91286ca
This commit is contained in:
Jan Edmund Lazo
2018-06-21 21:44:18 -04:00
parent 38fb835854
commit 39e284772d
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/eval.c
View File

@@ -17675,7 +17675,7 @@ static void f_wordcount(typval_T *argvars, typval_T *rettv, FunPtr fptr)
/// "writefile()" function /// "writefile()" function
static void f_writefile(typval_T *argvars, typval_T *rettv, FunPtr fptr) static void f_writefile(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{ {
rettv->vval.v_number = 0; // Assuming success. rettv->vval.v_number = -1;
if (check_restricted() || check_secure()) { if (check_restricted() || check_secure()) {
return; return;
@@ -17685,6 +17685,12 @@ static void f_writefile(typval_T *argvars, typval_T *rettv, FunPtr fptr)
EMSG2(_(e_listarg), "writefile()"); EMSG2(_(e_listarg), "writefile()");
return; return;
} }
const list_T *const list = argvars[0].vval.v_list;
TV_LIST_ITER_CONST(list, li, {
if (!tv_check_str_or_nr(TV_LIST_ITEM_TV(li))) {
return;
}
});
bool binary = false; bool binary = false;
bool append = false; bool append = false;
@@ -17716,7 +17722,6 @@ static void f_writefile(typval_T *argvars, typval_T *rettv, FunPtr fptr)
} }
FileDescriptor fp; FileDescriptor fp;
int error; int error;
rettv->vval.v_number = -1;
if (*fname == NUL) { if (*fname == NUL) {
EMSG(_("E482: Can't open file with an empty name")); EMSG(_("E482: Can't open file with an empty name"));
} else if ((error = file_open(&fp, fname, } else if ((error = file_open(&fp, fname,
@@ -17725,7 +17730,7 @@ static void f_writefile(typval_T *argvars, typval_T *rettv, FunPtr fptr)
emsgf(_("E482: Can't open file %s for writing: %s"), emsgf(_("E482: Can't open file %s for writing: %s"),
fname, os_strerror(error)); fname, os_strerror(error));
} else { } else {
if (write_list(&fp, argvars[0].vval.v_list, binary)) { if (write_list(&fp, list, binary)) {
rettv->vval.v_number = 0; rettv->vval.v_number = 0;
} }
if ((error = file_close(&fp, do_fsync)) != 0) { if ((error = file_close(&fp, do_fsync)) != 0) {

21
src/nvim/testdir/test_writefile.vim
View File

@@ -1,5 +1,6 @@
" Tests for the writefile() function.
function! Test_WriteFile() func Test_writefile()
let f = tempname() let f = tempname()
call writefile(["over","written"], f, "b") call writefile(["over","written"], f, "b")
call writefile(["hello","world"], f, "b") call writefile(["hello","world"], f, "b")
@@ -13,4 +14,20 @@ function! Test_WriteFile()
call assert_equal("morning", l[3]) call assert_equal("morning", l[3])
call assert_equal("vimmers", l[4]) call assert_equal("vimmers", l[4])
call delete(f) call delete(f)
endfunction endfunc
func Test_writefile_fails_gently()
call assert_fails('call writefile(["test"], "Xfile", [])', 'E730:')
call assert_false(filereadable("Xfile"))
call delete("Xfile")
call assert_fails('call writefile(["test", [], [], [], "tset"], "Xfile")', 'E730:')
call assert_false(filereadable("Xfile"))
call delete("Xfile")
call assert_fails('call writefile([], "Xfile", [])', 'E730:')
call assert_false(filereadable("Xfile"))
call delete("Xfile")
call assert_fails('call writefile([], [])', 'E730:')
endfunc