patch 8.2.3388: fnamemodify('path/..', ':p') differs from using 'path/../'
Problem: fnamemodify('path/..', ':p') differs from using 'path/../'.
Solution: Include the "/.." in the directory name. (closes #8808)
diff --git a/src/os_unix.c b/src/os_unix.c
index b603927..a3e5430 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2602,6 +2602,10 @@
*/
if (p != NULL)
{
+ if (STRCMP(p, "/..") == 0)
+ // for "/path/dir/.." include the "/.."
+ p += 3;
+
#ifdef HAVE_FCHDIR
/*
* Use fchdir() if possible, it's said to be faster and more
@@ -2644,8 +2648,10 @@
vim_strncpy(buf, fname, p - fname);
if (mch_chdir((char *)buf))
retval = FAIL;
- else
+ else if (*p == '/')
fname = p + 1;
+ else
+ fname = p;
*buf = NUL;
}
}
diff --git a/src/testdir/test_fnamemodify.vim b/src/testdir/test_fnamemodify.vim
index bcbdf77..7882f3c 100644
--- a/src/testdir/test_fnamemodify.vim
+++ b/src/testdir/test_fnamemodify.vim
@@ -12,6 +12,8 @@
call assert_equal('r', fnamemodify('.', ':p:h')[-1:])
call assert_equal('t', fnamemodify('test.out', ':p')[-1:])
call assert_equal($HOME .. "/foo" , fnamemodify('~/foo', ':p'))
+ call assert_equal(fnamemodify('.', ':p:h:h:h') .. '/', fnamemodify($HOME .. '/../', ':p'))
+ call assert_equal(fnamemodify('.', ':p:h:h:h') .. '/', fnamemodify($HOME .. '/..', ':p'))
call assert_equal('test.out', fnamemodify('test.out', ':.'))
call assert_equal('a', fnamemodify('../testdir/a', ':.'))
call assert_equal('~/testdir/test.out', fnamemodify('test.out', ':~'))
diff --git a/src/version.c b/src/version.c
index af45ded..7aef272 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3388,
+/**/
3387,
/**/
3386,