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