fix paranoia, chartorune never returns <=0

3 files changed, 2 insertions, 21 deletions

diff --git a/sys/src/9/pc/cga.c b/sys/src/9/pc/cga.c
index 66b49b5eb..2d8c42f2b 100644
--- a/sys/src/9/pc/cga.c
+++ b/sys/src/9/pc/cga.c
@@ -154,11 +154,6 @@ cgascreenputs(char* s, int n)
 
 	while(n > 0){
 		i = chartorune(&r, s);
-		if(i <= 0){
-			s++;
-			--n;
-			continue;
-		}
 		cgascreenputc(r);
 		s += i;
 		n -= i;
diff --git a/sys/src/9/pc/vga.c b/sys/src/9/pc/vga.c
index 30c207d24..1dae2d193 100644
--- a/sys/src/9/pc/vga.c
+++ b/sys/src/9/pc/vga.c
@@ -148,11 +148,6 @@ vgascreenputs(char* s, int n)
 
 	while(n > 0){
 		i = chartorune(&r, s);
-		if(i <= 0){
-			s++;
-			--n;
-			continue;
-		}
 		memmove(buf, s, i);
 		buf[i] = 0;
 		n -= i;
diff --git a/sys/src/cmd/aux/kbdfs.c b/sys/src/cmd/aux/kbdfs.c
index 853e7212d..a6852bfd3 100644
--- a/sys/src/cmd/aux/kbdfs.c
+++ b/sys/src/cmd/aux/kbdfs.c
@@ -401,7 +401,7 @@ void
 consproc(void *)
 {
 	char *p, *e, *x, buf[64];
-	int n, i;
+	int n;
 	Rune r;
 
 	threadsetname("consproc");
@@ -411,12 +411,7 @@ consproc(void *)
 	while((n = read(consfd, p, e - p)) > 0){
 		x = buf + n;
 		while(p < x && fullrune(p, x - p)){
-			i = chartorune(&r, p);
-			if(i <= 0){
-				p++;
-				continue;
-			}
-			p += i;
+			p += chartorune(&r, p);
 			if(r)
 				send(rawchan, &r);
 		}
@@ -462,10 +457,6 @@ lineproc(void *aux)
 					int i;
 
 					i = chartorune(&x, s);
-					if(i <= 0){
-						s++;
-						continue;
-					}
 					s += i;
 					if(r == '\b'){
 						if(s >= p){