===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/ch.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/less/ch.c	2018/03/17 13:29:12	1.20
--- src/usr.bin/less/ch.c	2019/09/03 23:08:42	1.21
***************
*** 122,128 ****
  static int maxbufs = -1;
  
  extern int autobuf;
- extern volatile sig_atomic_t sigs;
  extern int secure;
  extern int screen_trashed;
  extern int follow_mode;
--- 122,127 ----
***************
*** 304,310 ****
  				}
  			}
  		}
! 		if (sigs)
  			return (EOI);
  	}
  
--- 303,309 ----
  				}
  			}
  		}
! 		if (any_sigs())
  			return (EOI);
  	}
  
***************
*** 361,367 ****
  		tried = TRUE;
  		ierror("Finishing logfile", NULL);
  		while (ch_forw_get() != EOI)
! 			if (ABORT_SIGS())
  				break;
  	}
  	close(logfile);
--- 360,366 ----
  		tried = TRUE;
  		ierror("Finishing logfile", NULL);
  		while (ch_forw_get() != EOI)
! 			if (abort_sigs())
  				break;
  	}
  	close(logfile);
***************
*** 447,453 ****
  		while (ch_fpos < pos) {
  			if (ch_forw_get() == EOI)
  				return (1);
! 			if (ABORT_SIGS())
  				return (1);
  		}
  		return (0);
--- 446,452 ----
  		while (ch_fpos < pos) {
  			if (ch_forw_get() == EOI)
  				return (1);
! 			if (abort_sigs())
  				return (1);
  		}
  		return (0);
***************
*** 482,488 ****
  	 * Do it the slow way: read till end of data.
  	 */
  	while (ch_forw_get() != EOI)
! 		if (ABORT_SIGS())
  			return (1);
  	return (0);
  }
--- 481,487 ----
  	 * Do it the slow way: read till end of data.
  	 */
  	while (ch_forw_get() != EOI)
! 		if (abort_sigs())
  			return (1);
  	return (0);
  }