16 files changed, 20 insertions(+), 35 deletions(-)

M boot/boot.c
M boot/key.c
M gnot/dat.h
M gnot/main.c
M pc/dat.h
M pc/main.c
M port/devcons.c
M port/portdat.h
M port/portfns.h
M port/stasync.c
M port/swap.c
M power/conf.h
M power/dat.h
M power/main.c
M ss/dat.h
M ss/main.c

@@ 39,7 39,6 @@ boot(int argc, char *argv[])
 	open("#c/cons", OREAD);
 	open("#c/cons", OWRITE);
 	open("#c/cons", OWRITE);
-
 /*	for(fd = 0; fd < argc; fd++)
 		print("%s ", argv[fd]);
 	print("\n");/**/

@@ 42,8 42,10 @@ getp:
 	}
 	close(fd);
 	fd = open("#c/key", OWRITE);
-	if(fd < 0)
+	if(fd < 0){
 		warning("can't open #c/key");
+		return;
+	}
 	else if(write(fd, safe.machkey, DESKEYLEN) != DESKEYLEN)
 		warning("can't set #c/key");
 	close(fd);

@@ 81,7 81,6 @@ struct Conf
 	int	nlapd;		/* number of dragnet protocol modules */
 	int	copymode;	/* 0 is copy on write, 1 is copy on reference */
 	int	portispaged;	/* ??? */
-	int	cntrlp;		/* panic on ^P */
 	int	nconc;		/* number of datakit concentrators */
 };
 

@@ 331,10 331,7 @@ confinit(void)
 	conf.nimage = 50;
 	conf.copymode = 0;		/* copy on write */
 	conf.portispaged = 0;
-	conf.cntrlp = 0;
 	conf.nconc = 2;
-
-	confinit1(mul);
 }
 
 /*

@@ 66,7 66,6 @@ struct Conf
 	ulong	ip;		/* Ip conversations per interface */
 	ulong	arp;		/* Arp table size */
 	ulong	frag;		/* Ip fragment assemble queue size */
-	ulong	cntrlp;		/* panic on ^P */
 	ulong	nfloppy;	/* number of floppy drives */
 	ulong	nhard;		/* number of hard drives */
 };

@@ 198,7 198,6 @@ void
 confinit(void)
 {
 	long x, i, j, *l;
-	int mul;
 	ulong ktop;
 
 	/*


@@ 247,7 246,6 @@ confinit(void)
 	/* for meminit() */
 	conf.topofmem = i*MB;
 
-	mul = 1;
 	conf.nproc = 30 + i*5;
 	conf.nswap = conf.nproc*80;
 	conf.nimage = 50;


@@ 256,11 254,8 @@ confinit(void)
 	conf.ip = 64;
 	conf.arp = 32;
 	conf.frag = 32;
-	conf.cntrlp = 0;
 	conf.nfloppy = 2;
 	conf.nhard = 1;
-
-	confinit1(mul);
 }
 
 char *mathmsg[] =

@@ 171,7 171,7 @@ panic(char *fmt, ...)
 	buf[n] = '\n';
 	putstrn(buf, n+1);
 	dumpstack();
-	if(conf.cntrlp)
+	if(cpuserver)
 		exit();
 	else
 		for(;;);


@@ 217,7 217,7 @@ echo(Rune r, char *buf, int n)
 	/*
 	 * ^p hack
 	 */
-	if(r==0x10 && conf.cntrlp)
+	if(r==0x10 && cpuserver)
 		panic("^p");
 
 	/*


@@ 616,7 616,7 @@ consread(Chan *c, void *buf, long n, ulong offset)
 	case Qkey:
 		if(offset!=0 || n!=DESKEYLEN)
 			error(Ebadarg);
-		if(strcmp(u->p->user, eve)!=0 || conf.cntrlp==0)
+		if(strcmp(u->p->user, eve)!=0 || !cpuserver)
 			error(Eperm);
 		memmove(buf, evekey, DESKEYLEN);
 		return n;


@@ 818,16 818,16 @@ conswrite(Chan *c, void *va, long n, ulong offset)
 		break;
 
 	case Quser:
-		if(offset != 0 || n >= NAMELEN-1)
+		if(offset!=0 || n>=NAMELEN-1)
 			error(Ebadarg);
-		if(n==strlen("none") && strncmp(a, "none", n)==0
-		|| n==strlen(u->p->user) && strncmp(a, u->p->user, n)==0
-		|| strcmp(u->p->user, eve)==0){
-			memmove(u->p->user, a, n);
-			u->p->user[n] = '\0';
-		}else
+		strncpy(buf, a, NAMELEN);
+		if(strcmp(buf, "none")==0
+		|| strcmp(buf, u->p->user)==0
+		|| strcmp(u->p->user, eve)==0)
+			memmove(u->p->user, buf, NAMELEN);
+		else
 			error(Eperm);
-		if(!conf.cntrlp && strcmp(eve, "bootes") == 0)
+		if(!cpuserver && strcmp(eve, "bootes")==0)
 			memmove(eve, u->p->user, NAMELEN);
 		break;
 


@@ 878,7 878,7 @@ conswrite(Chan *c, void *va, long n, ulong offset)
 			kickpager();		/* start a pager if not already started */
 			break;
 		}
-		if(conf.cntrlp && strcmp(u->p->user, eve) != 0)
+		if(cpuserver && strcmp(u->p->user, eve) != 0)
 			error(Eperm);
 		if(buf[0]<'0' || '9'<buf[0])
 			error(Ebadarg);

@@ 697,6 697,7 @@ extern	char	sysname[NAMELEN];
 extern	Talarm	talarm;
 extern	Palloc 	palloc;
 extern	Pgrps 	pgrpalloc;
+extern	int	cpuserver;
 
 #define	CHDIR		0x80000000L
 #define	CHAPPEND 	0x40000000L

@@ 26,7 26,6 @@ void		closemount(Mount*);
 void		closepgrp(Pgrp*);
 long		clrfpintr(void);
 void		confinit(void);
-void		confinit1(int);
 int		consactive(void);
 void		consdebug(void);
 Block*		copyb(Block*, int);

@@ 85,7 85,7 @@ Qinfo asyncinfo =
 };
 
 static int	debugcount = 6;
-int asyncdebug = 3;
+int asyncdebug;
 int asyncerror;
 
 static ushort crc_table[256] = {

@@ 132,9 132,8 @@ loop:
 		}
 		else 
 		if(palloc.freecount < swapalloc.highwater) {
-			/* Rob made me do it ! */
-			if(conf.cntrlp == 0)
-				freebroken();
+			if(!cpuserver)
+				freebroken();	/* can use the memory */
 
 			/* Emulate the old system if no swap channel */
 			print("no physical memory\n");

@@ 14,7 14,6 @@ Conftab conftab[] = {
 	{"ip", &conf.ip },
 	{"arp", &conf.arp },
 	{"frag", &conf.frag },
-	{"cntrlp", &conf.cntrlp },
 	{ 0, 0 },
 };
 

@@ 50,7 50,6 @@ struct Conf
 	ulong	ip;		/* Ip conversations per interface */
 	ulong	arp;		/* Arp table size */
 	ulong	frag;		/* Ip fragment assemble queue size */
-	ulong	cntrlp;		/* panic on ^P */
 };
 
 /*

@@ 346,7 346,7 @@ exit(void)
 	for(i=0; i<2000000; i++)
 		;
 	duartenable0();
-	firmware(conf.cntrlp ? PROM_AUTOBOOT : PROM_REINIT);
+	firmware(cpuserver ? PROM_AUTOBOOT : PROM_REINIT);
 }
 
 typedef struct Conftab {


@@ 549,7 549,6 @@ confinit(void)
 		panic("confinit");
 
 	conf.copymode = 1;		/* copy on reference */
-	conf.cntrlp = cpuserver;
 }
 
 /*

@@ 72,7 72,6 @@ struct Conf
 	ulong	ip;		/* Ip conversations per interface */
 	ulong	arp;		/* Arp table size */
 	ulong	frag;		/* Ip fragment assemble queue size */
-	int	cntrlp;		/* panic on ^P */
 };
 
 /*

@@ 220,7 220,6 @@ confinit(void)
 	conf.ip = 64;
 	conf.arp = 32;
 	conf.frag = 32;
-	conf.cntrlp = 0;
 }
 
 /*