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

eval: Fix error messages from writefile

Browse Source 
1. When calling writefile(list, fname, []) do not show error message twice.
2. Do not allow file name to be overwritten for writefile([1], 2).
3. Do not show “Can’t open file with an empty name” error after error like 
   “using Float as a String” when type of the second argument is not correct.
4. Do not give multiple error messages and still continue for code like 
   `writefile(["test", [], [], [], "tset"])`.

Note that to fix 4. ideally I need tv_check_str_or_nr which is currently present 
in two PRs: #6114 and #5119. I would want to avoid copying this function into 
a yet another PR.

Ref vim/vim#1476.
This commit is contained in:
ZyX
2017-02-14 20:46:12 +03:00
parent 066e6b8e9b
commit f489827b5f
2 changed files with 83 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/eval.c
View File

@@ -18033,7 +18033,11 @@ static bool write_list(FileDescriptor *const fp, const list_T *const list,
{
int error = 0;
for (const listitem_T *li = list->lv_first; li != NULL; li = li->li_next) {
const char *const s = (const char *)get_tv_string((typval_T *)&li->li_tv);
const char *const s = (const char *)get_tv_string_chk(
(typval_T *)&li->li_tv);
if (s == NULL) {
return false;
}
const char *hunk_start = s;
for (const char *p = hunk_start;; p++) {
if (*p == NUL || *p == NL) {
@@ -18168,15 +18172,24 @@ static void f_writefile(typval_T *argvars, typval_T *rettv, FunPtr fptr)
bool binary = false;
bool append = false;
if (argvars[2].v_type != VAR_UNKNOWN) {
if (vim_strchr(get_tv_string(&argvars[2]), 'b')) {
const char *const flags = (const char *)get_tv_string_chk(&argvars[2]);
if (flags == NULL) {
return;
}
if (strchr(flags, 'b')) {
binary = true;
}
if (vim_strchr(get_tv_string(&argvars[2]), 'a')) {
if (strchr(flags, 'a')) {
append = true;
}
}
const char *const fname = (const char *)get_tv_string(&argvars[1]);
const char buf[NUMBUFLEN];
const char *const fname = (const char *)get_tv_string_buf_chk(&argvars[1],
(char_u *)buf);
if (fname == NULL) {
return;
}
FileDescriptor *fp;
int error;
rettv->vval.v_number = -1;