logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0003-Revert-Fix-for-PR-lib-56224.patch (2451B)

    

  1. From 6e3a7ba743db0e7e22ef50d038690b3f1e46bba3 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Tue, 8 Jun 2021 20:00:53 -0700
  4. Subject: [PATCH] Revert "Fix for PR lib/56224"
  6. This reverts commit deeb100e95f3d981cbe4ece4744fe6c34a5a2f05.
  7. ---
  8.  lib/libcurses/addbytes.c | 38 +-------------------------------------
  9.  1 file changed, 1 insertion(+), 37 deletions(-)
  11. diff --git a/lib/libcurses/addbytes.c b/lib/libcurses/addbytes.c
  12. index a678939f..9fd917ca 100644
  13. --- a/lib/libcurses/addbytes.c
  14. +++ b/lib/libcurses/addbytes.c
  15. @@ -1,4 +1,4 @@
  16. -/*	$NetBSD: addbytes.c,v 1.55 2021/06/06 05:06:44 blymn Exp $	*/
  17. +/*	$NetBSD: addbytes.c,v 1.54 2021/02/13 14:30:37 rillig Exp $	*/
  18.  
  19.  /*
  20.   * Copyright (c) 1987, 1993, 1994
  21. @@ -161,15 +161,6 @@ _cursesi_waddbytes(WINDOW *win, const char *bytes, int count, attr_t attr,
  22.  		} else if (wc == 0) {
  23.  			break;
  24.  		}
  25. -
  26. -		/* if scrollok is false and we are at the bottom of
  27. -		 * screen and this character would take us past the
  28. -		 * end of the line then we are done.
  29. -		 */
  30. -		if ((win->curx + n >= win->maxx) && 
  31. -		    (!(win->flags & __SCROLLOK)) &&
  32. -		    (win->cury == win->scr_b))
  33. -			break;
  34.  #ifdef DEBUG
  35.  		__CTRACE(__CTRACE_INPUT,
  36.  		    "ADDBYTES WIDE(0x%x [%s], %x) at (%d, %d), ate %d bytes\n",
  37. @@ -214,19 +205,6 @@ _cursesi_addbyte(WINDOW *win, __LINE **lp, int *y, int *x, int c,
  38.  		case '\t':
  39.  			tabsize = win->screen->TABSIZE;
  40.  			newx = tabsize - (*x % tabsize);
  41. -			/* if at the bottom of the window and
  42. -			   not allowed to scroll then just do
  43. -			   what we can */
  44. -			if ((*y == win->scr_b) &&
  45. -			    !(win->flags & __SCROLLOK)) {
  46. -				if ((*lp)->flags & __ISPASTEOL) {
  47. -					return OK;
  48. -				}
  49. -
  50. -				if (*x + newx > win->maxx - 1)
  51. -					newx = win->maxx - *x - 1;
  52. -			}
  53. -
  54.  			for (i = 0; i < newx; i++) {
  55.  				if (waddbytes(win, blank, 1) == ERR)
  56.  					return ERR;
  57. @@ -379,20 +357,6 @@ _cursesi_addwchar(WINDOW *win, __LINE **lnp, int *y, int *x,
  58.  			cc.attributes = win->wattr;
  59.  			tabsize = win->screen->TABSIZE;
  60.  			newx = tabsize - (*x % tabsize);
  61. -
  62. -			/* if at the bottom of the window and
  63. -			   not allowed to scroll then just do
  64. -			   what we can */
  65. -			if ((*y == win->scr_b) &&
  66. -			    !(win->flags & __SCROLLOK)) {
  67. -				if ((*lnp)->flags & __ISPASTEOL) {
  68. -					return OK;
  69. -				}
  70. -
  71. -				if (*x + newx > win->maxx - 1)
  72. -					newx = win->maxx - *x - 1;
  73. -			}
  74. -
  75.  			for (i = 0; i < newx; i++) {
  76.  				if (wadd_wch(win, &cc) == ERR)
  77.  					return ERR;
  78. -- 
  79. 2.31.1