290fee4
To: vim_dev@googlegroups.com
290fee4
Subject: Patch 7.3.194
290fee4
Fcc: outbox
290fee4
From: Bram Moolenaar <Bram@moolenaar.net>
290fee4
Mime-Version: 1.0
290fee4
Content-Type: text/plain; charset=UTF-8
290fee4
Content-Transfer-Encoding: 8bit
290fee4
------------
290fee4
290fee4
Patch 7.3.194
290fee4
Problem:    When "b" is a symlink to directory "a", resolve("b/") doesn't
290fee4
	    result in "a/".  (ZyX)
290fee4
Solution:   Remove the trailing slash. (Jean-Rene David)
290fee4
Files:	    src/eval.c
290fee4
290fee4
290fee4
*** ../vim-7.3.193/src/eval.c	2011-05-19 13:40:47.000000000 +0200
290fee4
--- src/eval.c	2011-05-19 14:55:27.000000000 +0200
290fee4
***************
290fee4
*** 14980,14986 ****
290fee4
--- 14980,14989 ----
290fee4
  
290fee4
  	len = STRLEN(p);
290fee4
  	if (len > 0 && after_pathsep(p, p + len))
290fee4
+ 	{
290fee4
  	    has_trailing_pathsep = TRUE;
290fee4
+ 	    p[len - 1] = NUL; /* the trailing slash breaks readlink() */
290fee4
+ 	}
290fee4
  
290fee4
  	q = getnextcomp(p);
290fee4
  	if (*q != NUL)
290fee4
*** ../vim-7.3.193/src/version.c	2011-05-19 14:50:49.000000000 +0200
290fee4
--- src/version.c	2011-05-19 14:54:40.000000000 +0200
290fee4
***************
290fee4
*** 711,712 ****
290fee4
--- 711,714 ----
290fee4
  {   /* Add new patch number below this line */
290fee4
+ /**/
290fee4
+     194,
290fee4
  /**/
290fee4
290fee4
-- 
290fee4
Momento mori, ergo carpe diem
290fee4
290fee4
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
290fee4
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
290fee4
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
290fee4
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///