===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/input.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/less/input.c	2014/04/25 13:38:21	1.7
--- src/usr.bin/less/input.c	2015/11/05 22:08:44	1.8
***************
*** 6,15 ****
   *
   * For more information, see the README file.
   */
  
- 
  /*
!  * High level routines dealing with getting lines of input 
   * from the file being viewed.
   *
   * When we speak of "lines" here, we mean PRINTABLE lines;
--- 6,18 ----
   *
   * For more information, see the README file.
   */
+ /*
+  * Modified for use with illumos.
+  * Copyright 2014 Garrett D'Amore <garrett@damore.org>
+  */
  
  /*
!  * High level routines dealing with getting lines of input
   * from the file being viewed.
   *
   * When we speak of "lines" here, we mean PRINTABLE lines;
***************
*** 27,38 ****
  extern volatile sig_atomic_t sigs;
  extern int ignore_eoi;
  extern int status_col;
! extern POSITION start_attnpos;
! extern POSITION end_attnpos;
! #if HILITE_SEARCH
  extern int hilite_search;
  extern int size_linebuf;
- #endif
  
  /*
   * Get the next line.
--- 30,39 ----
  extern volatile sig_atomic_t sigs;
  extern int ignore_eoi;
  extern int status_col;
! extern off_t start_attnpos;
! extern off_t end_attnpos;
  extern int hilite_search;
  extern int size_linebuf;
  
  /*
   * Get the next line.
***************
*** 41,64 ****
   * a line.  The new position is the position of the first character
   * of the NEXT line.  The line obtained is the line starting at curr_pos.
   */
! 	public POSITION
! forw_line(curr_pos)
! 	POSITION curr_pos;
  {
! 	POSITION base_pos;
! 	POSITION new_pos;
  	register int c;
  	int blankline;
  	int endline;
  	int backchars;
  
  get_forw_line:
! 	if (curr_pos == NULL_POSITION)
! 	{
  		null_line();
! 		return (NULL_POSITION);
  	}
- #if HILITE_SEARCH
  	if (hilite_search == OPT_ONPLUS || is_filtering() || status_col)
  		/*
  		 * If we are ignoring EOI (command F), only prepare
--- 42,62 ----
   * a line.  The new position is the position of the first character
   * of the NEXT line.  The line obtained is the line starting at curr_pos.
   */
! off_t
! forw_line(off_t curr_pos)
  {
! 	off_t base_pos;
! 	off_t new_pos;
  	register int c;
  	int blankline;
  	int endline;
  	int backchars;
  
  get_forw_line:
! 	if (curr_pos == -1) {
  		null_line();
! 		return (-1);
  	}
  	if (hilite_search == OPT_ONPLUS || is_filtering() || status_col)
  		/*
  		 * If we are ignoring EOI (command F), only prepare
***************
*** 67,97 ****
  		 * If we're not ignoring EOI, we *could* do the same, but
  		 * for efficiency we prepare several lines ahead at once.
  		 */
! 		prep_hilite(curr_pos, curr_pos + 3*size_linebuf, 
! 				ignore_eoi ? 1 : -1);
! #endif
! 	if (ch_seek(curr_pos))
! 	{
  		null_line();
! 		return (NULL_POSITION);
  	}
  
  	/*
  	 * Step back to the beginning of the line.
  	 */
  	base_pos = curr_pos;
! 	for (;;)
! 	{
! 		if (ABORT_SIGS())
! 		{
  			null_line();
! 			return (NULL_POSITION);
  		}
  		c = ch_back_get();
  		if (c == EOI)
  			break;
! 		if (c == '\n')
! 		{
  			(void) ch_forw_get();
  			break;
  		}
--- 65,90 ----
  		 * If we're not ignoring EOI, we *could* do the same, but
  		 * for efficiency we prepare several lines ahead at once.
  		 */
! 		prep_hilite(curr_pos, curr_pos + 3*size_linebuf,
! 		    ignore_eoi ? 1 : -1);
! 	if (ch_seek(curr_pos)) {
  		null_line();
! 		return (-1);
  	}
  
  	/*
  	 * Step back to the beginning of the line.
  	 */
  	base_pos = curr_pos;
! 	for (;;) {
! 		if (ABORT_SIGS()) {
  			null_line();
! 			return (-1);
  		}
  		c = ch_back_get();
  		if (c == EOI)
  			break;
! 		if (c == '\n') {
  			(void) ch_forw_get();
  			break;
  		}
***************
*** 101,122 ****
  	/*
  	 * Read forward again to the position we should start at.
  	 */
!  	prewind();
  	plinenum(base_pos);
  	(void) ch_seek(base_pos);
  	new_pos = base_pos;
! 	while (new_pos < curr_pos)
! 	{
! 		if (ABORT_SIGS())
! 		{
  			null_line();
! 			return (NULL_POSITION);
  		}
  		c = ch_forw_get();
  		backchars = pappend(c, new_pos);
  		new_pos++;
! 		if (backchars > 0)
! 		{
  			pshift_all();
  			new_pos -= backchars;
  			while (--backchars >= 0)
--- 94,112 ----
  	/*
  	 * Read forward again to the position we should start at.
  	 */
! 	prewind();
  	plinenum(base_pos);
  	(void) ch_seek(base_pos);
  	new_pos = base_pos;
! 	while (new_pos < curr_pos) {
! 		if (ABORT_SIGS()) {
  			null_line();
! 			return (-1);
  		}
  		c = ch_forw_get();
  		backchars = pappend(c, new_pos);
  		new_pos++;
! 		if (backchars > 0) {
  			pshift_all();
  			new_pos -= backchars;
  			while (--backchars >= 0)
***************
*** 130,161 ****
  	 * Read the first character to display.
  	 */
  	c = ch_forw_get();
! 	if (c == EOI)
! 	{
  		null_line();
! 		return (NULL_POSITION);
  	}
  	blankline = (c == '\n' || c == '\r');
  
  	/*
  	 * Read each character in the line and append to the line buffer.
  	 */
! 	for (;;)
! 	{
! 		if (ABORT_SIGS())
! 		{
  			null_line();
! 			return (NULL_POSITION);
  		}
! 		if (c == '\n' || c == EOI)
! 		{
  			/*
  			 * End of the line.
  			 */
  			backchars = pflushmbc();
  			new_pos = ch_tell();
! 			if (backchars > 0 && !chopline && hshift == 0)
! 			{
  				new_pos -= backchars + 1;
  				endline = FALSE;
  			} else
--- 120,146 ----
  	 * Read the first character to display.
  	 */
  	c = ch_forw_get();
! 	if (c == EOI) {
  		null_line();
! 		return (-1);
  	}
  	blankline = (c == '\n' || c == '\r');
  
  	/*
  	 * Read each character in the line and append to the line buffer.
  	 */
! 	for (;;) {
! 		if (ABORT_SIGS()) {
  			null_line();
! 			return (-1);
  		}
! 		if (c == '\n' || c == EOI) {
  			/*
  			 * End of the line.
  			 */
  			backchars = pflushmbc();
  			new_pos = ch_tell();
! 			if (backchars > 0 && !chopline && hshift == 0) {
  				new_pos -= backchars + 1;
  				endline = FALSE;
  			} else
***************
*** 169,197 ****
  		 * Append the char to the line and get the next char.
  		 */
  		backchars = pappend(c, ch_tell()-1);
! 		if (backchars > 0)
! 		{
  			/*
  			 * The char won't fit in the line; the line
  			 * is too long to print in the screen width.
  			 * End the line here.
  			 */
! 			if (chopline || hshift > 0)
! 			{
! 				do
! 				{
! 					if (ABORT_SIGS())
! 					{
  						null_line();
! 						return (NULL_POSITION);
  					}
  					c = ch_forw_get();
  				} while (c != '\n' && c != EOI);
  				new_pos = ch_tell();
  				endline = TRUE;
  				quit_if_one_screen = FALSE;
! 			} else
! 			{
  				new_pos = ch_tell() - backchars;
  				endline = FALSE;
  			}
--- 154,177 ----
  		 * Append the char to the line and get the next char.
  		 */
  		backchars = pappend(c, ch_tell()-1);
! 		if (backchars > 0) {
  			/*
  			 * The char won't fit in the line; the line
  			 * is too long to print in the screen width.
  			 * End the line here.
  			 */
! 			if (chopline || hshift > 0) {
! 				do {
! 					if (ABORT_SIGS()) {
  						null_line();
! 						return (-1);
  					}
  					c = ch_forw_get();
  				} while (c != '\n' && c != EOI);
  				new_pos = ch_tell();
  				endline = TRUE;
  				quit_if_one_screen = FALSE;
! 			} else {
  				new_pos = ch_tell() - backchars;
  				endline = FALSE;
  			}
***************
*** 202,210 ****
  
  	pdone(endline, 1);
  
! #if HILITE_SEARCH
! 	if (is_filtered(base_pos))
! 	{
  		/*
  		 * We don't want to display this line.
  		 * Get the next line.
--- 182,188 ----
  
  	pdone(endline, 1);
  
! 	if (is_filtered(base_pos)) {
  		/*
  		 * We don't want to display this line.
  		 * Get the next line.
***************
*** 215,234 ****
  
  	if (status_col && is_hilited(base_pos, ch_tell()-1, 1, NULL))
  		set_status_col('*');
- #endif
  
! 	if (squeeze && blankline)
! 	{
  		/*
  		 * This line is blank.
  		 * Skip down to the last contiguous blank line
  		 * and pretend it is the one which we are returning.
  		 */
  		while ((c = ch_forw_get()) == '\n' || c == '\r')
! 			if (ABORT_SIGS())
! 			{
  				null_line();
! 				return (NULL_POSITION);
  			}
  		if (c != EOI)
  			(void) ch_back_get();
--- 193,209 ----
  
  	if (status_col && is_hilited(base_pos, ch_tell()-1, 1, NULL))
  		set_status_col('*');
  
! 	if (squeeze && blankline) {
  		/*
  		 * This line is blank.
  		 * Skip down to the last contiguous blank line
  		 * and pretend it is the one which we are returning.
  		 */
  		while ((c = ch_forw_get()) == '\n' || c == '\r')
! 			if (ABORT_SIGS()) {
  				null_line();
! 				return (-1);
  			}
  		if (c != EOI)
  			(void) ch_back_get();
***************
*** 245,303 ****
   * a line.  The new position is the position of the first character
   * of the PREVIOUS line.  The line obtained is the one starting at new_pos.
   */
! 	public POSITION
! back_line(curr_pos)
! 	POSITION curr_pos;
  {
! 	POSITION new_pos, begin_new_pos, base_pos;
  	int c;
  	int endline;
  	int backchars;
  
  get_back_line:
! 	if (curr_pos == NULL_POSITION || curr_pos <= ch_zero())
! 	{
  		null_line();
! 		return (NULL_POSITION);
  	}
- #if HILITE_SEARCH
  	if (hilite_search == OPT_ONPLUS || is_filtering() || status_col)
! 		prep_hilite((curr_pos < 3*size_linebuf) ? 
! 				0 : curr_pos - 3*size_linebuf, curr_pos, -1);
! #endif
! 	if (ch_seek(curr_pos-1))
! 	{
  		null_line();
! 		return (NULL_POSITION);
  	}
  
! 	if (squeeze)
! 	{
  		/*
  		 * Find out if the "current" line was blank.
  		 */
! 		(void) ch_forw_get();    /* Skip the newline */
! 		c = ch_forw_get();       /* First char of "current" line */
! 		(void) ch_back_get();    /* Restore our position */
  		(void) ch_back_get();
  
! 		if (c == '\n' || c == '\r')
! 		{
  			/*
  			 * The "current" line was blank.
  			 * Skip over any preceding blank lines,
  			 * since we skipped them in forw_line().
  			 */
  			while ((c = ch_back_get()) == '\n' || c == '\r')
! 				if (ABORT_SIGS())
! 				{
  					null_line();
! 					return (NULL_POSITION);
  				}
! 			if (c == EOI)
! 			{
  				null_line();
! 				return (NULL_POSITION);
  			}
  			(void) ch_forw_get();
  		}
--- 220,269 ----
   * a line.  The new position is the position of the first character
   * of the PREVIOUS line.  The line obtained is the one starting at new_pos.
   */
! off_t
! back_line(off_t curr_pos)
  {
! 	off_t new_pos, begin_new_pos, base_pos;
  	int c;
  	int endline;
  	int backchars;
  
  get_back_line:
! 	if (curr_pos == -1 || curr_pos <= ch_zero()) {
  		null_line();
! 		return (-1);
  	}
  	if (hilite_search == OPT_ONPLUS || is_filtering() || status_col)
! 		prep_hilite((curr_pos < 3*size_linebuf) ?
! 		    0 : curr_pos - 3*size_linebuf, curr_pos, -1);
! 	if (ch_seek(curr_pos-1)) {
  		null_line();
! 		return (-1);
  	}
  
! 	if (squeeze) {
  		/*
  		 * Find out if the "current" line was blank.
  		 */
! 		(void) ch_forw_get();	/* Skip the newline */
! 		c = ch_forw_get();	/* First char of "current" line */
! 		(void) ch_back_get();	/* Restore our position */
  		(void) ch_back_get();
  
! 		if (c == '\n' || c == '\r') {
  			/*
  			 * The "current" line was blank.
  			 * Skip over any preceding blank lines,
  			 * since we skipped them in forw_line().
  			 */
  			while ((c = ch_back_get()) == '\n' || c == '\r')
! 				if (ABORT_SIGS()) {
  					null_line();
! 					return (-1);
  				}
! 			if (c == EOI) {
  				null_line();
! 				return (-1);
  			}
  			(void) ch_forw_get();
  		}
***************
*** 306,321 ****
  	/*
  	 * Scan backwards until we hit the beginning of the line.
  	 */
! 	for (;;)
! 	{
! 		if (ABORT_SIGS())
! 		{
  			null_line();
! 			return (NULL_POSITION);
  		}
  		c = ch_back_get();
! 		if (c == '\n')
! 		{
  			/*
  			 * This is the newline ending the previous line.
  			 * We have hit the beginning of the line.
--- 272,284 ----
  	/*
  	 * Scan backwards until we hit the beginning of the line.
  	 */
! 	for (;;) {
! 		if (ABORT_SIGS()) {
  			null_line();
! 			return (-1);
  		}
  		c = ch_back_get();
! 		if (c == '\n') {
  			/*
  			 * This is the newline ending the previous line.
  			 * We have hit the beginning of the line.
***************
*** 323,330 ****
  			base_pos = ch_tell() + 1;
  			break;
  		}
! 		if (c == EOI)
! 		{
  			/*
  			 * We have hit the beginning of the file.
  			 * This must be the first line in the file.
--- 286,292 ----
  			base_pos = ch_tell() + 1;
  			break;
  		}
! 		if (c == EOI) {
  			/*
  			 * We have hit the beginning of the file.
  			 * This must be the first line in the file.
***************
*** 341,376 ****
  	 * until we reach the curr_pos.
  	 *
  	 * {{ This algorithm is pretty inefficient if the lines
! 	 *    are much longer than the screen width, 
  	 *    but I don't know of any better way. }}
  	 */
  	new_pos = base_pos;
! 	if (ch_seek(new_pos))
! 	{
  		null_line();
! 		return (NULL_POSITION);
  	}
  	endline = FALSE;
  	prewind();
  	plinenum(new_pos);
!     loop:
  	begin_new_pos = new_pos;
  	(void) ch_seek(new_pos);
  
! 	do
! 	{
  		c = ch_forw_get();
! 		if (c == EOI || ABORT_SIGS())
! 		{
  			null_line();
! 			return (NULL_POSITION);
  		}
  		new_pos++;
! 		if (c == '\n')
! 		{
  			backchars = pflushmbc();
! 			if (backchars > 0 && !chopline && hshift == 0)
! 			{
  				backchars++;
  				goto shift;
  			}
--- 303,333 ----
  	 * until we reach the curr_pos.
  	 *
  	 * {{ This algorithm is pretty inefficient if the lines
! 	 *    are much longer than the screen width,
  	 *    but I don't know of any better way. }}
  	 */
  	new_pos = base_pos;
! 	if (ch_seek(new_pos)) {
  		null_line();
! 		return (-1);
  	}
  	endline = FALSE;
  	prewind();
  	plinenum(new_pos);
! loop:
  	begin_new_pos = new_pos;
  	(void) ch_seek(new_pos);
  
! 	do {
  		c = ch_forw_get();
! 		if (c == EOI || ABORT_SIGS()) {
  			null_line();
! 			return (-1);
  		}
  		new_pos++;
! 		if (c == '\n') {
  			backchars = pflushmbc();
! 			if (backchars > 0 && !chopline && hshift == 0) {
  				backchars++;
  				goto shift;
  			}
***************
*** 378,400 ****
  			break;
  		}
  		backchars = pappend(c, ch_tell()-1);
! 		if (backchars > 0)
! 		{
  			/*
  			 * Got a full printable line, but we haven't
  			 * reached our curr_pos yet.  Discard the line
  			 * and start a new one.
  			 */
! 			if (chopline || hshift > 0)
! 			{
  				endline = TRUE;
  				quit_if_one_screen = FALSE;
  				break;
  			}
  		shift:
  			pshift_all();
! 			while (backchars-- > 0)
! 			{
  				(void) ch_back_get();
  				new_pos--;
  			}
--- 335,354 ----
  			break;
  		}
  		backchars = pappend(c, ch_tell()-1);
! 		if (backchars > 0) {
  			/*
  			 * Got a full printable line, but we haven't
  			 * reached our curr_pos yet.  Discard the line
  			 * and start a new one.
  			 */
! 			if (chopline || hshift > 0) {
  				endline = TRUE;
  				quit_if_one_screen = FALSE;
  				break;
  			}
  		shift:
  			pshift_all();
! 			while (backchars-- > 0) {
  				(void) ch_back_get();
  				new_pos--;
  			}
***************
*** 404,412 ****
  
  	pdone(endline, 0);
  
! #if HILITE_SEARCH
! 	if (is_filtered(base_pos))
! 	{
  		/*
  		 * We don't want to display this line.
  		 * Get the previous line.
--- 358,364 ----
  
  	pdone(endline, 0);
  
! 	if (is_filtered(base_pos)) {
  		/*
  		 * We don't want to display this line.
  		 * Get the previous line.
***************
*** 415,423 ****
  		goto get_back_line;
  	}
  
! 	if (status_col && curr_pos > 0 && is_hilited(base_pos, curr_pos-1, 1, NULL))
  		set_status_col('*');
- #endif
  
  	return (begin_new_pos);
  }
--- 367,375 ----
  		goto get_back_line;
  	}
  
! 	if (status_col && curr_pos > 0 &&
! 	    is_hilited(base_pos, curr_pos-1, 1, NULL))
  		set_status_col('*');
  
  	return (begin_new_pos);
  }
***************
*** 425,442 ****
  /*
   * Set attnpos.
   */
! 	public void
! set_attnpos(pos)
! 	POSITION pos;
  {
  	int c;
  
! 	if (pos != NULL_POSITION)
! 	{
  		if (ch_seek(pos))
  			return;
! 		for (;;)
! 		{
  			c = ch_forw_get();
  			if (c == EOI)
  				return;
--- 377,391 ----
  /*
   * Set attnpos.
   */
! void
! set_attnpos(off_t pos)
  {
  	int c;
  
! 	if (pos != -1) {
  		if (ch_seek(pos))
  			return;
! 		for (;;) {
  			c = ch_forw_get();
  			if (c == EOI)
  				return;
***************
*** 446,453 ****
  		}
  	}
  	start_attnpos = pos;
! 	for (;;)
! 	{
  		c = ch_forw_get();
  		pos++;
  		if (c == EOI || c == '\n' || c == '\r')
--- 395,401 ----
  		}
  	}
  	start_attnpos = pos;
! 	for (;;) {
  		c = ch_forw_get();
  		pos++;
  		if (c == EOI || c == '\n' || c == '\r')