|
 |
d6ba96 |
To: vim_dev@googlegroups.com
|
|
|
d6ba96 |
Subject: Patch 7.4.096
|
|
|
d6ba96 |
Fcc: outbox
|
|
|
d6ba96 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d6ba96 |
Mime-Version: 1.0
|
|
|
d6ba96 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6ba96 |
Content-Transfer-Encoding: 8bit
|
|
|
d6ba96 |
------------
|
|
|
d6ba96 |
|
|
|
d6ba96 |
Patch 7.4.096
|
|
|
d6ba96 |
Problem: Can't change directory to an UNC path.
|
|
|
d6ba96 |
Solution: Use win32_getattrs() in mch_getperm(). (Christian Brabandt)
|
|
|
d6ba96 |
Files: src/os_win32.c
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.095/src/os_win32.c 2013-09-25 19:13:32.000000000 +0200
|
|
|
d6ba96 |
--- src/os_win32.c 2013-11-21 12:31:52.000000000 +0100
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 2841,2858 ****
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/*
|
|
|
d6ba96 |
! * get file permissions for `name'
|
|
|
d6ba96 |
! * -1 : error
|
|
|
d6ba96 |
! * else mode_t
|
|
|
d6ba96 |
*/
|
|
|
d6ba96 |
long
|
|
|
d6ba96 |
mch_getperm(char_u *name)
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
struct stat st;
|
|
|
d6ba96 |
! int n;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
n = mch_stat(name, &st);
|
|
|
d6ba96 |
! return n == 0 ? (int)st.st_mode : -1;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--- 2841,2860 ----
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/*
|
|
|
d6ba96 |
! * Get file permissions for "name".
|
|
|
d6ba96 |
! * Return mode_t or -1 for error.
|
|
|
d6ba96 |
*/
|
|
|
d6ba96 |
long
|
|
|
d6ba96 |
mch_getperm(char_u *name)
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
struct stat st;
|
|
|
d6ba96 |
! int n;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
+ if (name[0] == '\\' && name[1] == '\\')
|
|
|
d6ba96 |
+ /* UNC path */
|
|
|
d6ba96 |
+ return (long)win32_getattrs(name);
|
|
|
d6ba96 |
n = mch_stat(name, &st);
|
|
|
d6ba96 |
! return n == 0 ? (long)st.st_mode : -1L;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 3094,3101 ****
|
|
|
d6ba96 |
* -1 : error
|
|
|
d6ba96 |
* else FILE_ATTRIBUTE_* defined in winnt.h
|
|
|
d6ba96 |
*/
|
|
|
d6ba96 |
! static
|
|
|
d6ba96 |
! int
|
|
|
d6ba96 |
win32_getattrs(char_u *name)
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
int attr;
|
|
|
d6ba96 |
--- 3096,3102 ----
|
|
|
d6ba96 |
* -1 : error
|
|
|
d6ba96 |
* else FILE_ATTRIBUTE_* defined in winnt.h
|
|
|
d6ba96 |
*/
|
|
|
d6ba96 |
! static int
|
|
|
d6ba96 |
win32_getattrs(char_u *name)
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
int attr;
|
|
|
d6ba96 |
*** ../vim-7.4.095/src/version.c 2013-11-21 12:17:46.000000000 +0100
|
|
|
d6ba96 |
--- src/version.c 2013-11-21 12:32:46.000000000 +0100
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 740,741 ****
|
|
|
d6ba96 |
--- 740,743 ----
|
|
|
d6ba96 |
{ /* Add new patch number below this line */
|
|
|
d6ba96 |
+ /**/
|
|
|
d6ba96 |
+ 96,
|
|
|
d6ba96 |
/**/
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--
|
|
|
d6ba96 |
If your company is not involved in something called "ISO 9000" you probably
|
|
|
d6ba96 |
have no idea what it is. If your company _is_ involved in ISO 9000 then you
|
|
|
d6ba96 |
definitely have no idea what it is.
|
|
|
d6ba96 |
(Scott Adams - The Dilbert principle)
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d6ba96 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d6ba96 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d6ba96 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|