Fix erroneous EOF calculation when F command is interrupted.

gwsw · May 10, 2020 · 87599e9 · 87599e9
1 parent c99bb26
commit 87599e9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/NEWS.VER b/NEWS.VER
@@ -23,6 +23,8 @@
 * Fix regression: make screen repaint when "squished" and 
  a no-movement command is given.
 
+* Fix erroneous EOF calculation when F command is interrupted.
+
 * Make WIN32C version include this fix from 551:
  Don't count lines in initial screen if using -X with -F.
 

diff --git a/ch.c b/ch.c
@@ -836,7 +836,8 @@ seekable(f)
  public void
 ch_set_eof(VOID_PARAM)
 {
- ch_fsize = ch_fpos;
+ if (ch_fsize != NULL_POSITION && ch_fsize < ch_fpos)
+ ch_fsize = ch_fpos;
 }
 
 

diff --git a/version.c b/version.c
@@ -884,7 +884,7 @@ v558 4/17/20 Don't init terminal if -F and file fits on one screen (WIN32).
 v559 4/19/20 Handle deinit correctly on WIN32.
 v560 5/3/20 Fix regression when command results in no movement;
  fix some less.nro issues (thanks to Bjarni I. Gislason).
-v561x 
+v561x  Fix erroneous EOF calculation when F command is interrupted.
 */
 
 char version[] = "561x";