===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/line.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/less/line.c	2019/02/26 11:01:54	1.24
--- src/usr.bin/less/line.c	2019/03/01 14:31:34	1.25
***************
*** 112,118 ****
  /*
   * Is a character ASCII?
   */
! int
  is_ascii_char(LWCHAR ch)
  {
  	return (ch <= 0x7F);
--- 112,118 ----
  /*
   * Is a character ASCII?
   */
! static int
  is_ascii_char(LWCHAR ch)
  {
  	return (ch <= 0x7F);
***************
*** 458,487 ****
  }
  
  /*
-  * Are we currently within a recognized ANSI escape sequence?
-  */
- static int
- in_ansi_esc_seq(void)
- {
- 	int i;
- 
- 	/*
- 	 * Search backwards for either an ESC (which means we ARE in a seq);
- 	 * or an end char (which means we're NOT in a seq).
- 	 */
- 	for (i = curr - 1; i >= 0; i--) {
- 		if (linebuf[i] == ESC)
- 			return (1);
- 		if (!is_ansi_middle(linebuf[i]))
- 			return (0);
- 	}
- 	return (0);
- }
- 
- /*
   * Is a character the end of an ANSI escape sequence?
   */
! int
  is_ansi_end(LWCHAR ch)
  {
  	if (!is_ascii_char(ch))
--- 458,466 ----
  }
  
  /*
   * Is a character the end of an ANSI escape sequence?
   */
! static int
  is_ansi_end(LWCHAR ch)
  {
  	if (!is_ascii_char(ch))
***************
*** 512,517 ****
--- 491,497 ----
  static int
  store_char(LWCHAR ch, char a, char *rep, off_t pos)
  {
+ 	int i;
  	int w;
  	int replen;
  	char cs;
***************
*** 529,550 ****
  		}
  	}
  
! 	if (ctldisp == OPT_ONPLUS && in_ansi_esc_seq()) {
! 		if (!is_ansi_end(ch) && !is_ansi_middle(ch)) {
  			/* Remove whole unrecognized sequence.  */
! 			do {
! 				curr--;
! 			} while (curr > 0 && linebuf[curr] != ESC);
  			return (0);
  		}
! 		a = AT_ANSI;	/* Will force re-AT_'ing around it.  */
! 		w = 0;
! 	} else if (ctldisp == OPT_ONPLUS && ch == ESC) {
! 		a = AT_ANSI;	/* Will force re-AT_'ing around it.  */
! 		w = 0;
! 	} else {
! 		char *p = &linebuf[curr];
! 		LWCHAR prev_ch = step_char(&p, -1, linebuf);
  		w = pwidth(ch, a, prev_ch);
  	}
  
--- 509,551 ----
  		}
  	}
  
! 	w = -1;
! 	if (ctldisp == OPT_ONPLUS) {
! 		/*
! 		 * Set i to the beginning of an ANSI escape sequence
! 		 * that was begun and not yet ended, or to -1 otherwise.
! 		 */
! 		for (i = curr - 1; i >= 0; i--) {
! 			if (linebuf[i] == ESC)
! 				break;
! 			if (!is_ansi_middle(linebuf[i]))
! 				i = 0;
! 		}
! 		if (i >= 0 && !is_ansi_end(ch) && !is_ansi_middle(ch)) {
  			/* Remove whole unrecognized sequence.  */
! 			curr = i;
  			return (0);
  		}
! 		if (i >= 0 || ch == ESC) {
! 			a = AT_ANSI;  /* Will force re-AT_'ing around it. */
! 			w = 0;
! 		}
! 	}
! 	if (w == -1) {
! 		wchar_t prev_ch;
! 
! 		if (utf_mode) {
! 			for (i = curr - 1; i >= 0; i--)
! 				if (!IS_UTF8_TRAIL(linebuf[i]))
! 					break;
! 			if (i >= 0) {
! 				w = mbtowc(&prev_ch, linebuf + i, curr - i);
! 				if (w == -1 || i + w < curr)
! 					prev_ch = L' ';
! 			} else
! 				prev_ch = L' ';
! 		} else
! 			prev_ch = curr > 0 ? linebuf[curr - 1] : L' ';
  		w = pwidth(ch, a, prev_ch);
  	}