From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 5 Oct 2020 18:38:06 +0000 (+0200)
Subject: patch 8.2.1804: resolve('/') returns an empty string
X-Git-Tag: v8.2.1804
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50c4e9e08fb0981892e33afb9fe3751aa6df1fa4;p=vim

patch 8.2.1804: resolve('/') returns an empty string

Problem:    resolve('/') returns an empty string.
Solution:   Don't remove single slash. (closes #7074)
---

diff --git a/src/filepath.c b/src/filepath.c
index e2131a4b7..b692e227c 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -1889,7 +1889,7 @@ f_resolve(typval_T *argvars, typval_T *rettv)
 	    is_relative_to_current = TRUE;
 
 	len = STRLEN(p);
-	if (len > 0 && after_pathsep(p, p + len))
+	if (len > 1 && after_pathsep(p, p + len))
 	{
 	    has_trailing_pathsep = TRUE;
 	    p[len - 1] = NUL; // the trailing slash breaks readlink()
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 45b997f50..b81612548 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -339,6 +339,8 @@ func Test_resolve_unix()
   call assert_equal('Xlink2', resolve('Xlink1'))
   call assert_equal('./Xlink2', resolve('./Xlink1'))
   call delete('Xlink1')
+
+  call assert_equal('/', resolve('/'))
 endfunc
 
 func s:normalize_fname(fname)
diff --git a/src/version.c b/src/version.c
index e4bc870cc..cfd0d5458 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1804,
 /**/
     1803,
 /**/