From 5245a04d4d6dbbe90f84f6705298e43504945430 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 11 Feb 1992 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1992-02-11

---
 gnot/main.c   | 2 +-
 gnot/screen.c | 2 +-
 pc/kbd.c      | 3 ++-
 pc/main.c     | 3 ++-
 port/devbit.c | 6 +++---
 port/stip.c   | 7 +++----
 ss/main.c     | 2 +-
 ss/screen.c   | 2 +-
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/gnot/main.c b/gnot/main.c
index 9725fe8f8882fc1686897ac4c156787d4ed5e872..62355bd1add09f00a4fd54367ea9a0c0749bb38c 100644
--- a/gnot/main.c
+++ b/gnot/main.c
@@ -7,7 +7,7 @@
 #include	"ureg.h"
 #include	"init.h"
 
-#include	<libng.h>
+#include	<libg.h>
 #include	<gnot.h>
 
 typedef struct Boot Boot;
diff --git a/gnot/screen.c b/gnot/screen.c
index 680e6d5370c09685c39a5df846c21c3f644ff52d..3984f3eba32122114763f4a3ff1dcee0cb0a20da 100644
--- a/gnot/screen.c
+++ b/gnot/screen.c
@@ -7,7 +7,7 @@
 #include	"ureg.h"
 #include	"../port/error.h"
 
-#include	<libng.h>
+#include	<libg.h>
 #include	<gnot.h>
 #include	"screen.h"
 
diff --git a/pc/kbd.c b/pc/kbd.c
index 867ec4bb61c8039e5f7599744307a0cb6ba0cdd3..c9f802558dea445895bf2f02621ba759d801f0ec 100644
--- a/pc/kbd.c
+++ b/pc/kbd.c
@@ -351,7 +351,7 @@ kbdintr0(void)
 		c = kbtabesc1[c];
 		esc1 = 0;
 		if(!keyup)
-			kbdputc(&kbdq, c);
+			goto dochar;
 		return 0;
 	} else if(esc2){
 		esc2--;
@@ -385,6 +385,7 @@ kbdintr0(void)
 	/*
  	 *  normal character
 	 */
+dochar:
 	if(!(c & Spec)){
 		if(ctl)
 			c &= 0x1f;
diff --git a/pc/main.c b/pc/main.c
index b744b3613a054cba95abb371eb45a606a092bcf2..9d36e0e25f6a2a7cc6f54fa9751b94c9ceee91bc 100644
--- a/pc/main.c
+++ b/pc/main.c
@@ -220,7 +220,8 @@ confinit(void)
 	conf.nsrv = 16*mul;			/* was 32 */
 	conf.nbitmap = 512*mul;
 	conf.nbitbyte = conf.nbitmap*1024*screenbits();
-	conf.nsubfont = 10*mul;
+	conf.nfont = 10*mul;
+	conf.nsubfont = 30*mul;
 	conf.nnoifc = 1;
 	conf.nnoconv = 32;
 	conf.nurp = 32;
diff --git a/port/devbit.c b/port/devbit.c
index 88b8227c7b46b2821e735440505433d087d95bff..48e36bddea8760175e8f6328d15694d5e2666329 100644
--- a/port/devbit.c
+++ b/port/devbit.c
@@ -7,7 +7,7 @@
 
 #include	"devtab.h"
 
-#include	<libng.h>
+#include	<libg.h>
 #include	<gnot.h>
 #include	"screen.h"
 
@@ -1302,10 +1302,10 @@ bitstring(GBitmap *bp, Point pt, GFont *f, uchar *p, long l, Fcode fc)
 
 	while(l > 0){
 		r = GSHORT(p);
-		if(r >= NFCACHE+NFLOOK)
-			error(Ebadblt);
 		p += 2;
 		l -= 2;
+		if(r >= NFCACHE+NFLOOK)
+			continue;
 		c = &f->cache[r];
 		if(!full){
 			rect.min.y = c->top;
diff --git a/port/stip.c b/port/stip.c
index 8f38150069787291dedcf6f16d9b273544dde7c7..6829af1eee6b3cf0c71dcbebec90a042044fe492 100644
--- a/port/stip.c
+++ b/port/stip.c
@@ -175,7 +175,9 @@ ipetheroput(Queue *q, Block *bp)
 
 	if(bp->type != M_DATA){
 		/* Allow one setting of the ip address */
-		if(!Myip && streamparse("setip", bp)) {
+		if(streamparse("setip", bp)) {
+			if(strncmp(eve, u->p->user, sizeof(eve)) != 0)
+				error(Eperm);
 			ptr = bp->rptr;
 			Myip = ipparse((char *)ptr);
 			Netmyip[0] = (Myip>>24)&0xff;
@@ -187,9 +189,6 @@ ipetheroput(Queue *q, Block *bp)
 				ptr++;
 			if(*ptr)
 				Mymask = ipparse((char *)ptr);
-			/*
-			 * Temporary Until we understand real subnets
-			 */
 			Mynetmask = Mymask;
 			freeb(bp);
 		}
diff --git a/ss/main.c b/ss/main.c
index f26da5389061ac2c84a9c818ea52cafaea5eb53d..960d05725a273295433bc5f357fc92a9a4c82b0c 100644
--- a/ss/main.c
+++ b/ss/main.c
@@ -6,7 +6,7 @@
 #include	"io.h"
 #include	"init.h"
 
-#include	<libng.h>
+#include	<libg.h>
 #include	<gnot.h>
 
 uchar *intrreg;
diff --git a/ss/screen.c b/ss/screen.c
index e43790d9020a803b77b7a82e2d36f00fd6a1283e..75dcdb214f31a042138a4353b14882884992d4c2 100644
--- a/ss/screen.c
+++ b/ss/screen.c
@@ -6,7 +6,7 @@
 #include	"io.h"
 #include	"../port/error.h"
 
-#include	<libng.h>
+#include	<libg.h>
 #include	<gnot.h>
 #include	"screen.h"