thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 7.4.1007

Browse Source 
Problem:    When a symbolic link points to a file in the root directory, the
            swapfile is not correct.
Solution:   Do not try getting the full name of a file in the root directory.
            (Milly, closes #501)
This commit is contained in:
Bram Moolenaar 2015-12-31 18:29:46 +01:00
parent 96c664af27
commit e3303cb081
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/os_unix.c
View File

@ -2507,8 +2507,10 @@ mch_FullName(fname, buf, len, force)
fname = posix_fname;
#endif
/* expand it if forced or not an absolute path */
if (force || !mch_isFullName(fname))
/* Expand it if forced or not an absolute path.
* Do not do it for "/file", the result is always "/". */
if ((force || !mch_isFullName(fname))
&& ((p = vim_strrchr(fname, '/')) == NULL || p != fname))
{
/*
* If the file name has a path, change to that directory for a moment,
@ -2517,11 +2519,11 @@ mch_FullName(fname, buf, len, force)
*/
#ifdef OS2
only_drive = 0;
if (((p = vim_strrchr(fname, '/')) != NULL)
if (p != NULL
|| ((p = vim_strrchr(fname, '\\')) != NULL)
|| (((p = vim_strchr(fname, ':')) != NULL) && ++only_drive))
#else
if ((p = vim_strrchr(fname, '/')) != NULL)
if (p != NULL)
#endif
{
#ifdef HAVE_FCHDIR

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1007,
/**/
1006,
/**/