updated for version 7.3.194

Problem:    When "b" is a symlink to directory "a", resolve("b/") doesn't
            result in "a/".  (ZyX)
Solution:   Remove the trailing slash. (Jean-Rene David)

diff --git a/src/eval.c b/src/eval.c
index db7b1063802f10775d25fa76ca87d35559a07c27..64ed72ae0b16a48bb0d82d4b03a6393fb846df17 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -14980,7 +14980,10 @@ f_resolve(argvars, rettv)
 
        len = STRLEN(p);
        if (len > 0 && after_pathsep(p, p + len))
+       {
            has_trailing_pathsep = TRUE;
+           p[len - 1] = NUL; /* the trailing slash breaks readlink() */
+       }
 
        q = getnextcomp(p);
        if (*q != NUL)

diff --git a/src/version.c b/src/version.c
index 1bd1858448119e925bfd58c453e7881eb52a88a6..b505c29466b2ebcfacdfa4ab1b6eed52223565ec 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    194,
 /**/
     193,
 /**/