aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-04-03 02:11:27 +0300
committerZyX <kp-pav@yandex.ru>2017-04-03 02:11:27 +0300
commit97a7f4745dd1d75cd176dede1a4430bc4e28f8f7 (patch)
tree61d1be3481822dfbc6f1183c2e07a89ab536cbe5 /src
parent5dcf2804455f45eac8aad7d900bf60464a4b2888 (diff)
downloadrneovim-97a7f4745dd1d75cd176dede1a4430bc4e28f8f7.tar.gz
rneovim-97a7f4745dd1d75cd176dede1a4430bc4e28f8f7.tar.bz2
rneovim-97a7f4745dd1d75cd176dede1a4430bc4e28f8f7.zip
eval: Add s flag, use p_fs by default, error out on unknown flag
Diffstat (limited to 'src')
-rw-r--r--src/nvim/eval.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 8a3e3f3e22..7ab07fe6a2 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -17421,20 +17421,24 @@ static void f_writefile(typval_T *argvars, typval_T *rettv, FunPtr fptr)
bool binary = false;
bool append = false;
- bool do_fsync = true;
+ bool do_fsync = !!p_fs;
if (argvars[2].v_type != VAR_UNKNOWN) {
const char *const flags = tv_get_string_chk(&argvars[2]);
if (flags == NULL) {
return;
}
- if (strchr(flags, 'b')) {
- binary = true;
- }
- if (strchr(flags, 'a')) {
- append = true;
- }
- if (strchr(flags, 'S')) {
- do_fsync = false;
+ for (const char *p = flags; *p; p++) {
+ switch (*p) {
+ case 'b': { binary = true; break; }
+ case 'a': { append = true; break; }
+ case 's': { do_fsync = true; break; }
+ case 'S': { do_fsync = false; break; }
+ default: {
+ // Using %s, p and not %c, *p to preserve multibyte characters
+ emsgf(_("E5060: Unknown flag: %s"), p);
+ return;
+ }
+ }
}
}