Skip to content

Commit dd0a9c5

Browse files
committed
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)
1 parent 84f7979 commit dd0a9c5

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/eval.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14980,7 +14980,10 @@ f_resolve(argvars, rettv)
1498014980

1498114981
len = STRLEN(p);
1498214982
if (len > 0 && after_pathsep(p, p + len))
14983+
{
1498314984
has_trailing_pathsep = TRUE;
14985+
p[len - 1] = NUL; /* the trailing slash breaks readlink() */
14986+
}
1498414987

1498514988
q = getnextcomp(p);
1498614989
if (*q != NUL)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,8 @@ static char *(features[]) =
709709

710710
static int included_patches[] =
711711
{ /* Add new patch number below this line */
712+
/**/
713+
194,
712714
/**/
713715
193,
714716
/**/

0 commit comments

Comments
 (0)