diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-05-15 23:21:05 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-05-15 23:21:05 +0200 |
commit | 50157ef1c2e36d8696e79fd688bdd08312196bc6 (patch) | |
tree | a109334af9ba94e328cde5acc060622a12888834 | |
parent | 0820f4de5872bfbdc25bf6cba6ec5646dbcec156 (diff) |
patch 8.2.2856: get readonly error for device that can't be written tov8.2.2856
Problem: Get readonly error for device that can't be written to.
Solution: Check for being able to write first. (closes #8205)
-rw-r--r-- | src/ex_cmds.c | 19 | ||||
-rw-r--r-- | src/testdir/test_writefile.vim | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 06109d57fb..e1497a5a4a 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -1856,6 +1856,19 @@ ex_write(exarg_T *eap) (void)do_write(eap); } +#ifdef UNIX + static int +check_writable(char_u *fname) +{ + if (mch_nodetype(fname) == NODE_OTHER) + { + semsg(_("E503: \"%s\" is not a file or writable device"), fname); + return FAIL; + } + return OK; +} +#endif + /* * write current buffer to file 'eap->arg' * if 'eap->append' is TRUE, append to the file @@ -1942,7 +1955,11 @@ do_write(exarg_T *eap) #ifdef FEAT_QUICKFIX bt_dontwrite_msg(curbuf) || #endif - check_fname() == FAIL || check_readonly(&eap->forceit, curbuf))) + check_fname() == FAIL +#ifdef UNIX + || check_writable(curbuf->b_ffname) == FAIL +#endif + || check_readonly(&eap->forceit, curbuf))) goto theend; if (!other) diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim index 8470d4e302..75dda81d6d 100644 --- a/src/testdir/test_writefile.vim +++ b/src/testdir/test_writefile.vim @@ -285,7 +285,7 @@ func Test_write_errors() \ && getftype('/dev/loop0') == 'bdev' && !IsRoot() new edit /dev/loop0 - call assert_fails('write', 'E505: ') + call assert_fails('write', 'E503: ') call assert_fails('write!', 'E503: ') close! endif diff --git a/src/version.c b/src/version.c index 1aef3c7d38..70e02ed8ed 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2856, +/**/ 2855, /**/ 2854, |