To: vim-dev@vim.org
Subject: Patch 6.1.153
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.153
Problem:    Searching in included files may search recursively when the path
	    starts with "../".  (Sven Berkvens-Matthijsse)
Solution:   Compare full file names, use inode/device when possible.
Files:	    src/search.c


*** ../vim61.152/src/search.c	Sat Jun 29 15:57:43 2002
--- src/search.c	Tue Aug 13 19:49:28 2002
***************
*** 3531,3537 ****
  			i = old_files;
  		    if (i == max_path_depth)
  			break;
! 		    if (STRCMP(new_fname, files[i].name) == 0)
  		    {
  			if (type != CHECK_PATH &&
  				action == ACTION_SHOW_ALL && files[i].matched)
--- 3531,3537 ----
  			i = old_files;
  		    if (i == max_path_depth)
  			break;
! 		    if (fullpathcmp(new_fname, files[i].name, TRUE) & FPC_SAME)
  		    {
  			if (type != CHECK_PATH &&
  				action == ACTION_SHOW_ALL && files[i].matched)
*** ../vim61.152/src/version.c	Mon Aug 12 20:57:48 2002
--- src/version.c	Tue Aug 13 21:33:44 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     153,
  /**/

-- 
% cat /usr/include/sys/errno.h
#define	EPERM		1		/* Operation not permitted */
#define	ENOENT		2		/* No such file or directory */
#define	ESRCH		3		/* No such process */
[...]
#define EMACS		666		/* Too many macros */
%

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///