heirloom vi fixes from arch AUR

1 files changed, 13 insertions, 8 deletions

diff --git a/ex_vops.c b/ex_vops.c
index f9a7aa5..6f63fb8 100644
--- a/ex_vops.c
+++ b/ex_vops.c
@@ -173,12 +173,13 @@ vundo (
 		 * with dol through unddol-1.  Hack screen image to
 		 * reflect this replacement.
 		 */
-		if (show)
+		if (show) {
 			if (undkind == UNDMOVE)
 				vdirty(0, TLINES);
 			else
 				vreplace(undap1 - addr, undap2 - undap1,
 				    undkind == UNDPUT ? 0 : unddol - dol);
+		}
 		savenote = notecnt;
 		undo(1);
 		if (show && (vundkind != VMCHNG || addr != dot))
@@ -202,7 +203,7 @@ vundo (
 	case VCHNG:
 	case VCAPU:
 		vundkind = VCHNG;
-		CP(temp, vutmp);
+		lcpy(temp, vutmp, LBSIZE);
 		CP(vutmp, linebuf);
 		doomed = column(vUA2 - 1) - column(vUA1 - 1);
 		strcLIN(temp);
@@ -290,7 +291,7 @@ vmacchng(int fromvis)
 		vudump("before vmacchng hairy case");
 #endif
 		savedot = dot; savedol = dol; savecursor = cursor;
-		CP(savelb, linebuf);
+		lcpy(savelb, linebuf, LBSIZE);
 		nlines = dol - zero;
 		while ((line *) endcore - truedol < nlines)
 			morelines();
@@ -322,7 +323,7 @@ vmacchng(int fromvis)
 		truedol -= nlines;
 		copyw(zero+1, truedol+1, nlines);
 		dot = savedot; dol = savedol ; cursor = savecursor;
-		CP(linebuf, savelb);
+		lcpy(linebuf, savelb, LBSIZE);
 		vch_mac = VC_MANYCHANGE;
 
 		/* Arrange that no further undo saving happens within macro */
@@ -370,6 +371,7 @@ vmove(int unused)
 {
 	register int cnt;
 
+	(void)unused;
 	if (wdot) {
 		if (wdot < one || wdot > dol) {
 			beep();
@@ -530,7 +532,7 @@ vchange(int c)
 			*cursor = 0;
 			strcpy(genbuf, linebuf);
 			getline(*wdot);
-			if (strlen(genbuf) + strlen(wcursor) > LBSIZE - 2) {
+			if ((ssize_t)(strlen(genbuf) + strlen(wcursor)) > LBSIZE - 2) {
 				getDOT();
 				beep();
 				return;
@@ -730,7 +732,7 @@ voOpen (
 	sigset_t set, oset;
 #endif
 
-	if (value(SLOWOPEN) || value(REDRAW) && AL && DL)
+	if (value(SLOWOPEN) || (value(REDRAW) && AL && DL))
 		cnt = 1;
 #ifdef	SIGWINCH
 	sigemptyset(&set);
@@ -804,6 +806,7 @@ vshftop(int unused)
 	register line *addr;
 	register int cnt;
 
+	(void)unused;
 	if ((cnt = xdw()) < 0)
 		return;
 	addr = dot;
@@ -834,6 +837,7 @@ vfilter(int unused)
 	cell cuxb[UXBSIZE + 2];
 #endif
 
+	(void)unused;
 	if ((cnt = xdw()) < 0)
 		return;
 	if (vglobp)
@@ -968,7 +972,7 @@ xdw(void)
 void 
 vshift(int unused)
 {
-
+	(void)unused;
 	shift(op, 1);
 }
 
@@ -981,7 +985,7 @@ vrep(register int cnt)
 {
 	register int i, c;
 
-	if (cnt > strlen(cursor)) {
+	if (cnt > (ssize_t)strlen(cursor)) {
 		beep();
 		return;
 	}
@@ -1024,6 +1028,7 @@ vyankit(int unused)
 {
 	register int cnt;
 
+	(void)unused;
 	if (wdot) {
 		if ((cnt = xdw()) < 0)
 			return;