32d40bb
To: vim-dev@vim.org
32d40bb
Subject: patch 7.1.008 (correction
32d40bb
Fcc: outbox
32d40bb
From: Bram Moolenaar <Bram@moolenaar.net>
32d40bb
Mime-Version: 1.0
32d40bb
Content-Type: text/plain; charset=ISO-8859-1
32d40bb
Content-Transfer-Encoding: 8bit
32d40bb
------------
32d40bb
32d40bb
Oops, forgot the src/version.c change.
32d40bb
32d40bb
Patch 7.1.008
32d40bb
Problem:    getfsize() returns a negative number for very big files.
32d40bb
Solution:   Check for overflow and return -2.
32d40bb
Files:	    runtime/doc/eval.txt, src/eval.c
32d40bb
32d40bb
32d40bb
*** ../vim-7.1.007/runtime/doc/eval.txt	Sat May 12 16:38:23 2007
32d40bb
--- runtime/doc/eval.txt	Sat Jun  9 15:48:40 2007
32d40bb
***************
32d40bb
*** 1,4 ****
32d40bb
! *eval.txt*      For Vim version 7.1.  Last change: 2007 May 11
32d40bb
  
32d40bb
  
32d40bb
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
32d40bb
--- 1,4 ----
32d40bb
! *eval.txt*      For Vim version 7.1.  Last change: 2007 Jun 09
32d40bb
  
32d40bb
  
32d40bb
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
32d40bb
***************
32d40bb
*** 2824,2829 ****
32d40bb
--- 2824,2831 ----
32d40bb
  		given file {fname}.
32d40bb
  		If {fname} is a directory, 0 is returned.
32d40bb
  		If the file {fname} can't be found, -1 is returned.
32d40bb
+ 		If the size of {fname} is too big to fit in a Number then -2
32d40bb
+ 		is returned.
32d40bb
  
32d40bb
  getfontname([{name}])					*getfontname()*
32d40bb
  		Without an argument returns the name of the normal font being
32d40bb
*** ../vim-7.1.007/src/eval.c	Thu May 10 21:30:00 2007
32d40bb
--- src/eval.c	Sat Jun  9 15:46:46 2007
32d40bb
***************
32d40bb
*** 10136,10142 ****
32d40bb
--- 10136,10148 ----
32d40bb
  	if (mch_isdir(fname))
32d40bb
  	    rettv->vval.v_number = 0;
32d40bb
  	else
32d40bb
+ 	{
32d40bb
  	    rettv->vval.v_number = (varnumber_T)st.st_size;
32d40bb
+ 
32d40bb
+ 	    /* non-perfect check for overflow */
32d40bb
+ 	    if ((off_t)rettv->vval.v_number != (off_t)st.st_size)
32d40bb
+ 		rettv->vval.v_number = -2;
32d40bb
+ 	}
32d40bb
      }
32d40bb
      else
32d40bb
  	  rettv->vval.v_number = -1;
32d40bb
*** ../vim-7.1.007/src/version.c	Tue Jun 19 16:33:53 2007
32d40bb
--- src/version.c	Tue Jun 19 17:30:50 2007
32d40bb
***************
32d40bb
*** 668,669 ****
32d40bb
--- 668,671 ----
32d40bb
  {   /* Add new patch number below this line */
32d40bb
+ /**/
32d40bb
+     8,
32d40bb
  /**/
32d40bb
32d40bb
32d40bb
-- 
32d40bb
ZOOT:  I'm afraid our life must seem very dull and quiet compared to yours.
32d40bb
       We are but eightscore young blondes, all between sixteen and
32d40bb
       nineteen-and-a-half, cut off in this castle, with no one to protect us.
32d40bb
       Oooh.  It is a lonely life ... bathing ...  dressing ... undressing ...
32d40bb
       making exciting underwear....
32d40bb
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
32d40bb
32d40bb
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
32d40bb
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
32d40bb
\\\        download, build and distribute -- http://www.A-A-P.org        ///
32d40bb
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///