patch 8.0.1305: writefile() never calls fsync()

Problem:    Writefile() never calls fsync().
Solution:   Follow the 'fsync' option with override to enable or disable.

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index f754892caad0b4f713de967a002b2c3f16bd4a56..c001f6f2b73f71cc993dbe71925be4cd1a8e3726 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*     For Vim version 8.0.  Last change: 2017 Oct 28
+*eval.txt*     For Vim version 8.0.  Last change: 2017 Nov 16
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -8721,7 +8721,7 @@ winwidth({nr})                                            *winwidth()*
                Examples: >
   :echo "The current window has " . winwidth(0) . " columns."
   :if winwidth(0) <= 50
-  :  exe "normal 50\<C-W>|"
+  :  50 wincmd |
   :endif
 <              For getting the terminal or screen size, see the 'columns'
                option.
@@ -8762,8 +8762,17 @@ writefile({list}, {fname} [, {flags}])
                appended to the file: >
                        :call writefile(["foo"], "event.log", "a")
                        :call writefile(["bar"], "event.log", "a")
-
-<              All NL characters are replaced with a NUL character.
+<
+               When {flags} contains "s" then fsync() is called after writing
+               the file.  This flushes the file to disk, if possible.  This
+               takes more time but avoids losing the file if the system
+               crashes.
+               When {flags} does not contain "S" or "s" then fsync is called
+               if the 'fsync' option is set.
+               When {flags} contains "S" then fsync() is not called, even
+               when 'fsync' is set.
+
+               All NL characters are replaced with a NUL character.
                Inserting CR characters needs to be done before passing {list}
                to writefile().
                An existing file is overwritten, if possible.

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 1991aa7c627ac4a79c6a8c60a1bdf2add3774238..25b28bb3a2500710abec1f2f80639b2cce74964d 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -13348,6 +13348,9 @@ f_writefile(typval_T *argvars, typval_T *rettv)
 {
     int                binary = FALSE;
     int                append = FALSE;
+#ifdef HAVE_FSYNC
+    int                do_fsync = p_fs;
+#endif
     char_u     *fname;
     FILE       *fd;
     int                ret = 0;
@@ -13380,6 +13383,12 @@ f_writefile(typval_T *argvars, typval_T *rettv)
            binary = TRUE;
        if (vim_strchr(arg2, 'a') != NULL)
            append = TRUE;
+#ifdef HAVE_FSYNC
+       if (vim_strchr(arg2, 's') != NULL)
+           do_fsync = TRUE;
+       else if (vim_strchr(arg2, 'S') != NULL)
+           do_fsync = FALSE;
+#endif
     }
 
     fname = get_tv_string_chk(&argvars[1]);
@@ -13398,6 +13407,10 @@ f_writefile(typval_T *argvars, typval_T *rettv)
     {
        if (write_list(fd, list, binary) == FAIL)
            ret = -1;
+#ifdef HAVE_FSYNC
+       else if (do_fsync && fsync(fileno(fd)) != 0)
+           EMSG(_(e_fsync));
+#endif
        fclose(fd);
     }
 

diff --git a/src/fileio.c b/src/fileio.c
index fbc164a914d621289fe4784dbdfd9dd9c066fc8e..e76e3d19aaf7420a27ff86e403fe355d8db037a0 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4771,7 +4771,7 @@ restore_backup:
         */
        if (p_fs && fsync(fd) != 0 && !device)
        {
-           errmsg = (char_u *)_("E667: Fsync failed");
+           errmsg = (char_u *)_(e_fsync);
            end = 0;
        }
 #endif

diff --git a/src/globals.h b/src/globals.h
index 318363230b585c043d4afae32cbd3cec779b52ad..ae62710d5781b0ca1bb9ed8ac5cfb7ee8b6c577f 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1449,6 +1449,9 @@ EXTERN char_u e_isadir2[] INIT(= N_("E17: \"%s\" is a directory"));
 #ifdef FEAT_LIBCALL
 EXTERN char_u e_libcall[]      INIT(= N_("E364: Library call failed for \"%s()\""));
 #endif
+#ifdef HAVE_FSYNC
+EXTERN char_u e_fsync[]                INIT(= N_("E667: Fsync failed"));
+#endif
 #if defined(DYNAMIC_PERL) \
        || defined(DYNAMIC_PYTHON) || defined(DYNAMIC_PYTHON3) \
        || defined(DYNAMIC_RUBY) \

diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim
index f462d049c0ef4117c09546fbd7c4044eec3563d3..9703323b07939a8eab7b8e944dabef7bb6aee2a7 100644 (file)
--- a/src/testdir/test_writefile.vim
+++ b/src/testdir/test_writefile.vim
@@ -93,3 +93,10 @@ func Test_nowrite_quit_split()
   endif
   bwipe Xfile
 endfunc
+
+func Test_writefile_sync_arg()
+  " This doesn't check if fsync() works, only that the argument is accepted.
+  call writefile(['one'], 'Xtest', 's')
+  call writefile(['two'], 'Xtest', 'S')
+  call delete('Xtest')
+endfunc

diff --git a/src/version.c b/src/version.c
index 1dd52da3510f3688fd6a5f24b50aa77c1daaf848..1cffd61817c459530816daa7c0fbd6b1862e2e72 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1305,
 /**/
     1304,
 /**/