8 files changed, 14 insertions(+), 13 deletions(-)

M gnot/main.c
M gnot/screen.c
M pc/kbd.c
M pc/main.c
M port/devbit.c
M port/stip.c
M ss/main.c
M ss/screen.c

@@ 7,7 7,7 @@
 #include	"ureg.h"
 #include	"init.h"
 
-#include	<libng.h>
+#include	<libg.h>
 #include	<gnot.h>
 
 typedef struct Boot Boot;

@@ 7,7 7,7 @@
 #include	"ureg.h"
 #include	"../port/error.h"
 
-#include	<libng.h>
+#include	<libg.h>
 #include	<gnot.h>
 #include	"screen.h"
 

@@ 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;

@@ 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;

@@ 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;

@@ 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);
 		}

@@ 6,7 6,7 @@
 #include	"io.h"
 #include	"init.h"
 
-#include	<libng.h>
+#include	<libg.h>
 #include	<gnot.h>
 
 uchar *intrreg;

@@ 6,7 6,7 @@
 #include	"io.h"
 #include	"../port/error.h"
 
-#include	<libng.h>
+#include	<libg.h>
 #include	<gnot.h>
 #include	"screen.h"