 @@ -1,253 +1,253 @@
-/*   $NetBSD: ins_wch.c,v 1.11 2017/01/31 09:17:53 roy Exp $ */
+/*   $NetBSD: ins_wch.c,v 1.11.4.1 2020/07/07 12:48:42 martin Exp $ */
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
  * All rights reserved.
+ *
  * This code is derived from code donated to the NetBSD Foundation
  * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@gmail.com>.
+ *
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *	notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *	notice, this list of conditions and the following disclaimer in the
  *	documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the NetBSD Foundation nor the names of its
  *	contributors may be used to endorse or promote products derived
  *	from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
  * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ins_wch.c,v 1.11 2017/01/31 09:17:53 roy Exp $");
+__RCSID("$NetBSD: ins_wch.c,v 1.11.4.1 2020/07/07 12:48:42 martin Exp $");
 #endif						  /* not lint */
 #include <string.h>
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 /*
  * ins_wch --
  *	Do an insert-char on the line, leaving (cury, curx) unchanged.
  */
 int
 ins_wch(const cchar_t *wch)
+{
 #ifndef HAVE_WCHAR
 	return ERR;
 #else
 	return wins_wch(stdscr, wch);
 #endif /* HAVE_WCHAR */
+}
 /*
  * mvins_wch --
  *	  Do an insert-char on the line at (y, x).
  */
 int
 mvins_wch(int y, int x, const cchar_t *wch)
+{
 #ifndef HAVE_WCHAR
 	return ERR;
 #else
 	return mvwins_wch(stdscr, y, x, wch);
 #endif /* HAVE_WCHAR */
+}
 /*
  * mvwins_wch --
  *	  Do an insert-char on the line at (y, x) in the given window.
  */
 int
 mvwins_wch(WINDOW *win, int y, int x, const cchar_t *wch)
+{
 #ifndef HAVE_WCHAR
 	return ERR;
 #else
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return wins_wch(stdscr, wch);
+	return wins_wch(win, wch);
 #endif /* HAVE_WCHAR */
+}
 /*
  * wins_wch --
  *	Do an insert-char on the line, leaving (cury, curx) unchanged.
  */
 int
 wins_wch(WINDOW *win, const cchar_t *wch)
+{
 #ifndef HAVE_WCHAR
 	return ERR;
 #else
 	__LDATA	*start, *temp1, *temp2;
 	__LINE *lnp;
 	int cw, pcw, x, y, sx, ex, newx, i;
 	nschar_t *np, *tnp;
 	wchar_t ws[] = L"		";
 	/* check for non-spacing characters */
 	if (!wch)
 		return OK;
 	cw = wcwidth(wch->vals[0]);
 	if (cw < 0)
 		cw = 1;
 	if (!cw)
 		return wadd_wch( win, wch );
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT, "--before--\n");
 	for (x = 0; x < win->maxx; x++)
 		__CTRACE(__CTRACE_INPUT, "wins_wch: (0,%d)=(%x,%x,%p)\n", x,
 		    win->alines[0]->line[x].ch,
 		    win->alines[0]->line[x].attr,
 		    win->alines[0]->line[x].nsp);
 #endif /* DEBUG */
 	x = win->curx;
 	y = win->cury;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT, "wins_wch: (%d,%d)\n", y, x);
 #endif /* DEBUG */
 	switch (wch->vals[0]) {
 		case L'\b':
 			if (--x < 0)
 				x = 0;
 			win->curx = x;
 			return OK;
 		case L'\r':
 			win->curx = 0;
 			return OK;
 		case L'\n':
 			wclrtoeol(win);
 			if (y == win->scr_b) {
 				if (!(win->flags & __SCROLLOK))
 					return ERR;
 				scroll(win);
+			}
 			return OK;
 		case L'\t':
 			if (wins_nwstr(win, ws, min(win->maxx - x,
 			    TABSIZE - (x % TABSIZE))) == ERR)
 				return ERR;
 			return OK;
+	}
 	/* locate current cell */
 	x = win->curx;
 	y = win->cury;
 	lnp = win->alines[y];
 	start = &win->alines[y]->line[x];
 	sx = x;
 	pcw = WCOL(*start);
 	if (pcw < 0) {
 		start += pcw;
 		sx += pcw;
+	}
 	if (cw > win->maxx - sx)
 		return ERR;
 	lnp->flags |= __ISDIRTY;
 	newx = sx + win->ch_off;
 	if (newx < *lnp->firstchp)
 		*lnp->firstchp = newx;
 	/* shift all complete characters */
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT, "wins_wch: shift all characters\n");
 #endif /* DEBUG */
 	temp1 = &win->alines[y]->line[win->maxx - 1];
 	temp2 = temp1 - cw;
 	pcw = WCOL(*(temp2 + 1));
 	if (pcw < 0) {
 #ifdef DEBUG
 		__CTRACE(__CTRACE_INPUT, "wins_wch: clear EOL\n");
 #endif /* DEBUG */
 		temp2 += pcw;
 		while (temp1 > temp2 + cw) {
 			np = temp1->nsp;
 			if (np) {
 				while (np) {
 					tnp = np->next;
 					free(np);
 					np = tnp;
+				}
 				temp1->nsp = NULL;
+			}
 			temp1->ch = (wchar_t)btowc((int)win->bch );
 			if (_cursesi_copy_nsp(win->bnsp, temp1) == ERR)
 				return ERR;
 			temp1->attr = win->battr;
 			SET_WCOL(*temp1, 1);
 			temp1--;
+		}
+	}
 	while (temp2 >= start) {
 		(void)memcpy(temp1, temp2, sizeof(__LDATA));
 		temp1--, temp2--;
+	}
 	/* update character under cursor */
 	start->nsp = NULL;
 	start->ch = wch->vals[0];
 	start->attr = wch->attributes & WA_ATTRIBUTES;
 	SET_WCOL(*start, cw);
 	if (wch->elements > 1) {
 		for (i = 1; i < wch->elements; i++) {
 			np = malloc(sizeof(nschar_t));
 			if (!np)
 				return ERR;
 			np->ch = wch->vals[i];
 			np->next = start->nsp;
 			start->nsp = np;
+		}
+	}
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT, "wins_wch: insert (%x,%x,%p)\n",
 	    start->ch, start->attr, start->nsp);
 #endif /* DEBUG */
 	temp1 = start + 1;
 	ex = x + 1;
 	while (ex - x < cw) {
 		temp1->ch = wch->vals[0];
 		SET_WCOL(*temp1, x - ex);
 		temp1->nsp = NULL;
 		ex++, temp1++;
+	}
 #ifdef DEBUG
+	{
 		__CTRACE(__CTRACE_INPUT, "--after---\n");
 		for (x = 0; x < win->maxx; x++)
 			__CTRACE(__CTRACE_INPUT,
 			    "wins_wch: (0,%d)=(%x,%x,%p)\n", x,
 			    win->alines[0]->line[x].ch,
 			    win->alines[0]->line[x].attr,
 			    win->alines[0]->line[x].nsp);
+	}
 #endif /* DEBUG */
 	newx = win->maxx - 1 + win->ch_off;
 	if (newx > *lnp->lastchp)
 		*lnp->lastchp = newx;
 	__touchline(win, y, sx, (int)win->maxx - 1);
 	__sync(win);
 	return OK;
 #endif /* HAVE_WCHAR */
+}

 @@ -1,334 +1,334 @@
-/*   $NetBSD: ins_wstr.c,v 1.11 2017/01/31 09:17:53 roy Exp $ */
+/*   $NetBSD: ins_wstr.c,v 1.11.4.1 2020/07/07 12:48:42 martin Exp $ */
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
  * All rights reserved.
+ *
  * This code is derived from code donated to the NetBSD Foundation
  * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@gmail.com>.
+ *
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *	notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *	notice, this list of conditions and the following disclaimer in the
  *	documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the NetBSD Foundation nor the names of its
  *	contributors may be used to endorse or promote products derived
  *	from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
  * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ins_wstr.c,v 1.11 2017/01/31 09:17:53 roy Exp $");
+__RCSID("$NetBSD: ins_wstr.c,v 1.11.4.1 2020/07/07 12:48:42 martin Exp $");
 #endif						  /* not lint */
 #include <string.h>
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 /*
  * ins_wstr --
  *	insert a multi-character wide-character string into the current window
  */
 int
 ins_wstr(const wchar_t *wstr)
+{
 	return wins_wstr(stdscr, wstr);
+}
 /*
  * ins_nwstr --
  *	insert a multi-character wide-character string into the current window
  *	with at most n characters
  */
 int
 ins_nwstr(const wchar_t *wstr, int n)
+{
 	return wins_nwstr(stdscr, wstr, n);
+}
 /*
  * mvins_wstr --
  *	  Do an insert-string on the line at (y, x).
  */
 int
 mvins_wstr(int y, int x, const wchar_t *wstr)
+{
 	return mvwins_wstr(stdscr, y, x, wstr);
+}
 /*
  * mvins_nwstr --
  *	  Do an insert-n-string on the line at (y, x).
  */
 int
 mvins_nwstr(int y, int x, const wchar_t *wstr, int n)
+{
 	return mvwins_nwstr(stdscr, y, x, wstr, n);
+}
 /*
  * mvwins_wstr --
  *	  Do an insert-string on the line at (y, x) in the given window.
  */
 int
 mvwins_wstr(WINDOW *win, int y, int x, const wchar_t *wstr)
+{
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return wins_wstr(stdscr, wstr);
+	return wins_wstr(win, wstr);
+}
 /*
  * mvwins_nwstr --
  *	  Do an insert-n-string on the line at (y, x) in the given window.
  */
 int
 mvwins_nwstr(WINDOW *win, int y, int x, const wchar_t *wstr, int n)
+{
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return wins_nwstr(stdscr, wstr, n);
+	return wins_nwstr(win, wstr, n);
+}
 /*
  * wins_wstr --
  *	Do an insert-string on the line, leaving (cury, curx) unchanged.
  */
 int
 wins_wstr(WINDOW *win, const wchar_t *wstr)
+{
 	return wins_nwstr(win, wstr, -1);
+}
 /*
  * wins_nwstr --
  *	Do an insert-n-string on the line, leaving (cury, curx) unchanged.
  */
 int
 wins_nwstr(WINDOW *win, const wchar_t *wstr, int n)
+{
 #ifndef HAVE_WCHAR
 	return ERR;
 #else
 	__LDATA	 *start, *temp1, *temp2;
 	__LINE	  *lnp;
 	const wchar_t *scp;
 	int width, len, sx, x, y, cw, pcw, newx;
 	nschar_t *np;
 	wchar_t ws[] = L"		";
 	/* check for leading non-spacing character */
 	if (!wstr)
 		return OK;
 	cw = wcwidth(*wstr);
 	if (cw < 0)
 		cw = 1;
 	if (!cw)
 		return ERR;
 	scp = wstr + 1;
 	width = cw;
 	len = 1;
 	n--;
 	while (*scp) {
 		int w;
 		if (!n)
 			break;
 		w = wcwidth(*scp);
 		if (w < 0)
 			w = 1;
 		n--, len++, width += w;
 		scp++;
+	}
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT, "wins_nwstr: width=%d,len=%d\n", width, len);
 #endif /* DEBUG */
 	if (cw > win->maxx - win->curx + 1)
 		return ERR;
 	start = &win->alines[win->cury]->line[win->curx];
 	sx = win->curx;
 	lnp = win->alines[win->cury];
 	pcw = WCOL(*start);
 	if (pcw < 0) {
 		sx += pcw;
 		start += pcw;
+	}
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT, "wins_nwstr: start@(%d)\n", sx);
 #endif /* DEBUG */
 	pcw = WCOL(*start);
 	lnp->flags |= __ISDIRTY;
 	newx = sx + win->ch_off;
 	if (newx < *lnp->firstchp)
 		*lnp->firstchp = newx;
 #ifdef DEBUG
+	{
 		__CTRACE(__CTRACE_INPUT, "========before=======\n");
 		for (x = 0; x < win->maxx; x++)
 			__CTRACE(__CTRACE_INPUT,
 			    "wins_nwstr: (%d,%d)=(%x,%x,%p)\n",
 			    (int) win->cury, x,
 			    win->alines[win->cury]->line[x].ch,
 			    win->alines[win->cury]->line[x].attr,
 			    win->alines[win->cury]->line[x].nsp);
+	}
 #endif /* DEBUG */
 	/* shift all complete characters */
 	if (sx + width + pcw <= win->maxx) {
 #ifdef DEBUG
 		__CTRACE(__CTRACE_INPUT, "wins_nwstr: shift all characters\n");
 #endif /* DEBUG */
 		temp1 = &win->alines[win->cury]->line[win->maxx - 1];
 		temp2 = temp1 - width;
 		pcw = WCOL(*(temp2 + 1));
 		if (pcw < 0) {
 #ifdef DEBUG
 			__CTRACE(__CTRACE_INPUT,
 			    "wins_nwstr: clear from %d to EOL(%d)\n",
 			    win->maxx + pcw, win->maxx - 1);
 #endif /* DEBUG */
 			temp2 += pcw;
 			while (temp1 > temp2 + width) {
 				temp1->ch = (wchar_t)btowc((int) win->bch);
 				if (_cursesi_copy_nsp(win->bnsp, temp1) == ERR)
 					return ERR;
 				temp1->attr = win->battr;
 				SET_WCOL(*temp1, 1);
 #ifdef DEBUG
 				__CTRACE(__CTRACE_INPUT,
 				    "wins_nwstr: empty cell(%p)\n", temp1);
 #endif /* DEBUG */
 				temp1--;
+			}
+		}
 		while (temp2 >= start) {
 			(void)memcpy(temp1, temp2, sizeof(__LDATA));
 			temp1--, temp2--;
+		}
 #ifdef DEBUG
+		{
 			__CTRACE(__CTRACE_INPUT, "=====after shift====\n");
 			for (x = 0; x < win->maxx; x++)
 				__CTRACE(__CTRACE_INPUT,
 				    "wins_nwstr: (%d,%d)=(%x,%x,%p)\n",
 				    (int) win->cury, x,
 				    win->alines[win->cury]->line[x].ch,
 				    win->alines[win->cury]->line[x].attr,
 				    win->alines[win->cury]->line[x].nsp);
+		}
 #endif /* DEBUG */
+	}
 	/* update string columns */
 	x = win->curx;
 	y = win->cury;
 	for (scp = wstr, temp1 = start; len; len--, scp++) {
 		switch (*scp) {
 			case L'\b':
 				if (--x < 0)
 					x = 0;
 				win->curx = x;
 				continue;;
 			case L'\r':
 				win->curx = 0;
 				continue;
 			case L'\n':
 				wclrtoeol(win);
 				if (y == win->scr_b) {
 					if (!(win->flags & __SCROLLOK))
 						return ERR;
 					scroll(win);
+				}
 				continue;
 			case L'\t':
 				if (wins_nwstr(win, ws,
 				    min(win->maxx - x, TABSIZE - (x % TABSIZE)))
 				    == ERR)
 					return ERR;
 				continue;
+		}
 		cw = wcwidth(*scp);
 		if (cw < 0)
 			cw = 1;
 		if (cw) {
 			/* 1st column */
 			temp1->ch = (wchar_t)*scp;
 			temp1->attr = win->wattr;
 			SET_WCOL(*temp1, cw);
 			temp1->nsp = NULL;
 #ifdef DEBUG
 			__CTRACE(__CTRACE_INPUT,
 			    "wins_nwstr: add spacing char(%x)\n", temp1->ch);
 #endif /* DEBUG */
 			temp2 = temp1++;
 			if (cw > 1) {
 				x = -1;
 				while (temp1 < temp2 + cw) {
 					/* the rest columns */
 					temp1->ch = (wchar_t)*scp;
 					temp1->attr = win->wattr;
 					temp1->nsp = NULL;
 					SET_WCOL(*temp1, x);
 					temp1++, x--;
+				}
 				temp1--;
+			}
 		} else {
 			/* non-spacing character */
 			np = malloc(sizeof(nschar_t));
 			if (!np)
 				return ERR;
 			np->ch = *scp;
 			np->next = temp1->nsp;
 			temp1->nsp = np;
 #ifdef DEBUG
 			__CTRACE(__CTRACE_INPUT,
 			    "wins_nstr: add non-spacing char(%x)\n", np->ch);
 #endif /* DEBUG */
+		}
+	}
 #ifdef DEBUG
+	{
 		__CTRACE(__CTRACE_INPUT, "========after=======\n");
 		for (x = 0; x < win->maxx; x++)
 			__CTRACE(__CTRACE_INPUT,
 			    "wins_nwstr: (%d,%d)=(%x,%x,%p)\n",
 			    (int) win->cury, x,
 			    win->alines[win->cury]->line[x].ch,
 			    win->alines[win->cury]->line[x].attr,
 			    win->alines[win->cury]->line[x].nsp);
+	}
 #endif /* DEBUG */
 	newx = win->maxx - 1 + win->ch_off;
 	if (newx > *lnp->lastchp)
 		*lnp->lastchp = newx;
 	__touchline(win, (int) win->cury, sx, (int) win->maxx - 1);
 	__sync(win);
 	return OK;
 #endif /* HAVE_WCHAR */
+}

 @@ -1,133 +1,133 @@
-/*	$NetBSD: insch.c,v 1.23 2017/01/06 13:53:18 roy Exp $	*/
+/*	$NetBSD: insch.c,v 1.23.6.1 2020/07/07 12:48:42 martin Exp $	*/
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)insch.c	8.2 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: insch.c,v 1.23 2017/01/06 13:53:18 roy Exp $");
+__RCSID("$NetBSD: insch.c,v 1.23.6.1 2020/07/07 12:48:42 martin Exp $");
 #endif
 #endif				/* not lint */
 #include <string.h>
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 #ifndef _CURSES_USE_MACROS
 /*
  * insch --
  *	Do an insert-char on the line, leaving (cury, curx) unchanged.
  */
 int
 insch(chtype ch)
+{
 	return winsch(stdscr, ch);
+}
 /*
  * mvinsch --
  *	Do an insert-char on the line at (y, x).
  */
 int
 mvinsch(int y, int x, chtype ch)
+{
 	return mvwinsch(stdscr, y, x, ch);
+}
 /*
  * mvwinsch --
  *	Do an insert-char on the line at (y, x) in the given window.
  */
 int
 mvwinsch(WINDOW *win, int y, int x, chtype ch)
+{
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return winsch(stdscr, ch);
+	return winsch(win, ch);
+}
 #endif
 /*
  * winsch --
  *	Do an insert-char on the line, leaving (cury, curx) unchanged.
  */
 int
 winsch(WINDOW *win, chtype ch)
+{
 	__LDATA	*end, *temp1, *temp2;
 	attr_t attr;
 	if (__using_color)
 		attr = win->battr & __COLOR;
 	else
 		attr = 0;
 	end = &win->alines[win->cury]->line[win->curx];
 	temp1 = &win->alines[win->cury]->line[win->maxx - 1];
 	temp2 = temp1 - 1;
 	while (temp1 > end) {
 		(void)memcpy(temp1, temp2, sizeof(__LDATA));
 		temp1--, temp2--;
+	}
 	temp1->ch = (wchar_t)ch & __CHARTEXT;
 	if (temp1->ch == ' ')
 		temp1->ch = win->bch;
 	temp1->attr = (attr_t) ch & __ATTRIBUTES;
 	if (temp1->attr & __COLOR)
 		temp1->attr |= (win->battr & ~__COLOR);
 	else
 		temp1->attr |= win->battr;
 #ifdef HAVE_WCHAR
 	if (_cursesi_copy_nsp(win->bnsp, temp1) == ERR)
 		return ERR;
 	SET_WCOL(*temp1, 1);
 #endif /* HAVE_WCHAR */
 	__touchline(win, (int)win->cury, (int)win->curx, (int)win->maxx - 1);
 	if (win->cury == LINES - 1 &&
 	    (win->alines[LINES - 1]->line[COLS - 1].ch != ' ' ||
 		win->alines[LINES - 1]->line[COLS - 1].attr != attr)) {
 		if (win->flags & __SCROLLOK) {
 			wrefresh(win);
 			scroll(win);
 			win->cury--;
 		} else
 			return ERR;
+	}
 	return OK;
+}

 @@ -1,218 +1,218 @@
-/*   $NetBSD: insstr.c,v 1.5 2017/01/06 13:53:18 roy Exp $ */
+/*   $NetBSD: insstr.c,v 1.5.6.1 2020/07/07 12:48:42 martin Exp $ */
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
  * All rights reserved.
+ *
  * This code is derived from code donated to the NetBSD Foundation
  * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@gmail.com>.
+ *
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *	notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *	notice, this list of conditions and the following disclaimer in the
  *	documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the NetBSD Foundation nor the names of its
  *	contributors may be used to endorse or promote products derived
  *	from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
  * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: insstr.c,v 1.5 2017/01/06 13:53:18 roy Exp $");
+__RCSID("$NetBSD: insstr.c,v 1.5.6.1 2020/07/07 12:48:42 martin Exp $");
 #endif						  /* not lint */
 #include <string.h>
 #include <stdlib.h>
 #include "curses.h"
 #include "curses_private.h"
 #ifndef _CURSES_USE_MACROS
 /*
  * insstr --
  *	insert a multi-byte character string into the current window
  */
 int
 insstr(const char *str)
+{
 	return winsstr(stdscr, str);
+}
 /*
  * insnstr --
  *	insert a multi-byte character string into the current window
  *	with at most n characters
  */
 int
 insnstr(const char *str, int n)
+{
 	return winsnstr(stdscr, str, n);
+}
 /*
  * mvinsstr --
  *	  Do an insert-string on the line at (y, x).
  */
 int
 mvinsstr(int y, int x, const char *str)
+{
 	return mvwinsstr(stdscr, y, x, str);
+}
 /*
  * mvinsnstr --
  *	  Do an insert-n-string on the line at (y, x).
  */
 int
 mvinsnstr(int y, int x, const char *str, int n)
+{
 	return mvwinsnstr(stdscr, y, x, str, n);
+}
 /*
  * mvwinsstr --
  *	  Do an insert-string on the line at (y, x) in the given window.
  */
 int
 mvwinsstr(WINDOW *win, int y, int x, const char *str)
+{
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return winsstr(stdscr, str);
+	return winsstr(win, str);
+}
 /*
  * mvwinsnstr --
  *	  Do an insert-n-string on the line at (y, x) in the given window.
  */
 int
 mvwinsnstr(WINDOW *win, int y, int x, const char *str, int n)
+{
 	if (wmove(win, y, x) == ERR)
 		return ERR;
-	return winsnstr(stdscr, str, n);
+	return winsnstr(win, str, n);
+}
 #endif
 /*
  * winsstr --
  *	Do an insert-string on the line, leaving (cury, curx) unchanged.
  *	No wrapping.
  */
 int
 winsstr(WINDOW *win, const char *str)
+{
 	return winsnstr(win, str, -1);
+}
 /*
  * winsnstr --
  *	Do an insert-n-string on the line, leaving (cury, curx) unchanged.
  *	Performs wrapping.
  */
 int
 winsnstr(WINDOW *win, const char *str, int n)
+{
 	__LDATA	*end, *temp1, *temp2;
 	const char *scp;
 	int len, x;
 	__LINE *lnp;
 #ifdef HAVE_WCHAR
 	nschar_t *np, *tnp;
 #endif /* HAVE_WCHAR */
 	/* find string length */
 	if (n > 0)
 		for (scp = str, len = 0; n-- && *scp++; ++len);
 	else
 		for (scp = str, len = 0; *scp++; ++len);
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT, "winsnstr: len = %d\n", len);
 #endif /* DEBUG */
 	/* move string */
 	end = &win->alines[win->cury]->line[win->curx];
 	if (len < win->maxx - win->curx) {
 #ifdef DEBUG
 		__CTRACE(__CTRACE_INPUT, "winsnstr: shift %d cells\n", len);
 #endif /* DEBUG */
 		temp1 = &win->alines[win->cury]->line[win->maxx - 1];
 		temp2 = temp1 - len;
 		while (temp2 >= end) {
 #ifdef HAVE_WCHAR
 			np = temp1->nsp;
 			if (np){
 				while (np) {
 					tnp = np->next;
 					free(np);
 					np = tnp;
+				}
 				temp1->nsp = NULL;
+			}
 #endif /* HAVE_WCHAR */
 			(void)memcpy(temp1, temp2, sizeof(__LDATA));
 			temp1--, temp2--;
+		}
+	}
 	for (scp = str, temp1 = end, x = win->curx;
 	     *scp && x < len + win->curx && x < win->maxx;
 	     scp++, temp1++, x++)
+	{
 		temp1->ch = (wchar_t)*scp & __CHARTEXT;
 		temp1->attr = win->wattr;
 #ifdef HAVE_WCHAR
 		SET_WCOL(*temp1, 1);
 #endif /* HAVE_WCHAR */
+	}
 #ifdef DEBUG
+	{
 		int i;
 		for (i = win->curx; i < win->curx + len; i++) {
 			__CTRACE(__CTRACE_INPUT,
 			    "winsnstr: (%d,%d)=('%c',%x)\n", win->cury, i,
 			    win->alines[win->cury]->line[i].ch,
 			    win->alines[win->cury]->line[i].attr);
+		}
+	}
 #endif /* DEBUG */
 	lnp = win->alines[win->cury];
 	lnp->flags |= __ISDIRTY;
 	if (win->ch_off < *lnp->firstchp)
 		*lnp->firstchp = win->ch_off;
 	if (win->ch_off + win->maxx - 1 > *lnp->lastchp)
 		*lnp->lastchp = win->ch_off + win->maxx - 1;
 	__touchline(win, (int)win->cury, (int)win->curx, (int)win->maxx - 1);
 	__sync(win);
 	return OK;
+}