aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-02-14 20:46:12 +0300
committerZyX <kp-pav@yandex.ru>2017-02-14 20:46:12 +0300
commitf489827b5f9b8b1ecd684768a92871389217aa91 (patch)
tree5b807053245228fc6c7f5922bcd9aa451ce03899 /src/nvim/eval.c
parent066e6b8e9b221df4718accf4aef88142f51eae99 (diff)
downloadrneovim-f489827b5f9b8b1ecd684768a92871389217aa91.tar.gz
rneovim-f489827b5f9b8b1ecd684768a92871389217aa91.tar.bz2
rneovim-f489827b5f9b8b1ecd684768a92871389217aa91.zip
eval: Fix error messages from writefile
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.
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r--src/nvim/eval.c21
1 files changed, 17 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 941f4cd93a..3c2a29bf8a 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -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;