diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-08-12 08:28:10 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-08-12 08:28:10 +0800 |
| commit | d59e9a2c25c563e3460b1eeb31ab4d5971097331 (patch) | |
| tree | 26f42a8d349db94f9faf87846aaae116582a76e7 /src/nvim/fileio.c | |
| parent | 9a5d309b5743d70832b4daedcea934af5e6cc127 (diff) | |
| parent | f2fd5afb48786c4272105b0adda6977ee1fd6f2e (diff) | |
| download | rneovim-d59e9a2c25c563e3460b1eeb31ab4d5971097331.tar.gz rneovim-d59e9a2c25c563e3460b1eeb31ab4d5971097331.tar.bz2 rneovim-d59e9a2c25c563e3460b1eeb31ab4d5971097331.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/fileio.c')
| -rw-r--r-- | src/nvim/fileio.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 643020df5e..feb16f44d4 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -2570,11 +2570,9 @@ buf_write ( perm = -1; } } -#else /* win32 */ - /* - * Check for a writable device name. - */ - c = os_nodetype((char *)fname); +#else // win32 + // Check for a writable device name. + c = fname == NULL ? NODE_OTHER : os_nodetype((char *)fname); if (c == NODE_OTHER) { SET_ERRMSG_NUM("E503", _("is not a file or writable device")); goto fail; @@ -2594,9 +2592,8 @@ buf_write ( if (overwriting) { os_fileinfo((char *)fname, &file_info_old); } - } -#endif /* !UNIX */ +#endif // !UNIX if (!device && !newfile) { /* |