diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-01-10 13:05:20 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-01-10 13:05:20 +0100 |
| commit | b1cb35f785d2d7a1c94268218cf5eb3d8087c55e (patch) | |
| tree | 5e1a197aa11fdef4a777fa2de6d53743793ae928 | |
| parent | 438f67a0040ab4f517c68f446f4a03a6c9e9096d (diff) | |
updated for version 7.4.136v7.4.136
Problem: MS-Windows: When saving a file with a UNC path the file becomes
read-only.
Solution: Don't mix up Win32 attributes and Unix attributes. (Ken Takata)
| -rw-r--r-- | src/os_mswin.c | 14 | ||||
| -rw-r--r-- | src/os_win32.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/src/os_mswin.c b/src/os_mswin.c index 95c3d17380..4b2f3cf073 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -617,8 +617,22 @@ vim_stat(const char *name, struct stat *stp) p = buf + strlen(buf); if (p > buf) mb_ptr_back(buf, p); + + /* Remove trailing '\\' except root path. */ if (p > buf && (*p == '\\' || *p == '/') && p[-1] != ':') *p = NUL; + + if ((buf[0] == '\\' && buf[1] == '\\') || (buf[0] == '/' && buf[1] == '/')) + { + /* UNC root path must be followed by '\\'. */ + p = vim_strpbrk(buf + 2, "\\/"); + if (p != NULL) + { + p = vim_strpbrk(p + 1, "\\/"); + if (p == NULL) + STRCAT(buf, "\\"); + } + } #ifdef FEAT_MBYTE if (enc_codepage >= 0 && (int)GetACP() != enc_codepage # ifdef __BORLANDC__ diff --git a/src/os_win32.c b/src/os_win32.c index 5f671a7e91..b006a0db21 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -2890,9 +2890,6 @@ mch_getperm(char_u *name) struct stat st; int n; - if (name[0] == '\\' && name[1] == '\\') - /* UNC path */ - return (long)win32_getattrs(name); n = mch_stat(name, &st); return n == 0 ? (long)st.st_mode : -1L; } diff --git a/src/version.c b/src/version.c index 3400e6b025..8eb9e4085d 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 136, +/**/ 135, /**/ 134, |