From c11e90fdc02d91a6e810189f77d7b1ef922cd20c Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 25 Jul 1992 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1992-07-25

---
 boot/boot.c    |  1 -
 boot/key.c     |  4 +++-
 gnot/dat.h     |  1 -
 gnot/main.c    |  3 ---
 pc/dat.h       |  1 -
 pc/main.c      |  5 -----
 port/devcons.c | 24 ++++++++++++------------
 port/portdat.h |  1 +
 port/portfns.h |  1 -
 port/stasync.c |  2 +-
 port/swap.c    |  5 ++---
 power/conf.h   |  1 -
 power/dat.h    |  1 -
 power/main.c   |  3 +--
 ss/dat.h       |  1 -
 ss/main.c      |  1 -
 16 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/boot/boot.c b/boot/boot.c
index e1a1ac8f251fe98a8d52613c8ca100e04bd43724..97388b091bfdb3bf82d81266443d391f46d0faf3 100644
--- a/boot/boot.c
+++ b/boot/boot.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");/**/
diff --git a/boot/key.c b/boot/key.c
index 4a17391605b7551dac1c4da58a636577ff93dad5..64807ed3d4736c2c7b519814f0d64d659036a276 100644
--- a/boot/key.c
+++ b/boot/key.c
@@ -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);
diff --git a/gnot/dat.h b/gnot/dat.h
index ad67d13d2c6b3235ab626084711a649ad9f43bac..2bb64b796610e7203a3097e87ef684cb5b8aba44 100644
--- a/gnot/dat.h
+++ b/gnot/dat.h
@@ -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 */
 };
 
diff --git a/gnot/main.c b/gnot/main.c
index 08a35fc5c9f583d8abc9c60327babea8b5b8b24d..28f5d20041dc6f4ab5e3fc08cc57eb43517b63ec 100644
--- a/gnot/main.c
+++ b/gnot/main.c
@@ -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);
 }
 
 /*
diff --git a/pc/dat.h b/pc/dat.h
index 77aae0e9c5ce67db6ab7343c3494306cc291581d..1b19a51ef9530af4b4247c5221c3dc38c5c7836a 100644
--- a/pc/dat.h
+++ b/pc/dat.h
@@ -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 */
 };
diff --git a/pc/main.c b/pc/main.c
index a2785e6c9394857b66cab2159d4712c5ccb84f35..62bc68fc563eed83d723bc9e6235336ac20a6c91 100644
--- a/pc/main.c
+++ b/pc/main.c
@@ -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[] =
diff --git a/port/devcons.c b/port/devcons.c
index a31ba8249f530f53b98442cf6981b7c4f543de68..9ba151eb34bff9fb51a58f6917e5f620c8a0ba89 100644
--- a/port/devcons.c
+++ b/port/devcons.c
@@ -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);
diff --git a/port/portdat.h b/port/portdat.h
index a741e9b34c9bf067c8119f0c3534e093d7ed7f60..41884123d7a68e04c08d4028d17ec8a40bdec0ac 100644
--- a/port/portdat.h
+++ b/port/portdat.h
@@ -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
diff --git a/port/portfns.h b/port/portfns.h
index 975a2e9cf14e1962ebd860a70e296328c7da1b51..46d9fe94199b9fa2df05317c60dc04df724a5fc6 100644
--- a/port/portfns.h
+++ b/port/portfns.h
@@ -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);
diff --git a/port/stasync.c b/port/stasync.c
index 8c638c0cc41480f79ce596683bfae9c215136643..9bddbb260daed53bb3661b5649956f63da2f948c 100644
--- a/port/stasync.c
+++ b/port/stasync.c
@@ -85,7 +85,7 @@ Qinfo asyncinfo =
 };
 
 static int	debugcount = 6;
-int asyncdebug = 3;
+int asyncdebug;
 int asyncerror;
 
 static ushort crc_table[256] = {
diff --git a/port/swap.c b/port/swap.c
index 7b80afabeee9758e17796a3147d2801186d74381..cc836c47201ae94648ac0fe7f986ed39cada3c3f 100644
--- a/port/swap.c
+++ b/port/swap.c
@@ -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");
diff --git a/power/conf.h b/power/conf.h
index d97fd5396c9929156f25752832dc91aa1cc77f42..310e61886a24002fa1604508091f9bf8db9f4f2f 100644
--- a/power/conf.h
+++ b/power/conf.h
@@ -14,7 +14,6 @@ Conftab conftab[] = {
 	{"ip", &conf.ip },
 	{"arp", &conf.arp },
 	{"frag", &conf.frag },
-	{"cntrlp", &conf.cntrlp },
 	{ 0, 0 },
 };
 
diff --git a/power/dat.h b/power/dat.h
index f25a668a5cf2ce7a63b1c1cc0f48ed5b6f46c41d..760e829c630105a4ba14c5e126fda424547f3d19 100644
--- a/power/dat.h
+++ b/power/dat.h
@@ -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 */
 };
 
 /*
diff --git a/power/main.c b/power/main.c
index 31a30f7c0b7e32a497a9c3feeca6fedb8a4d09f6..cbae89f275234d3db5e43112ab23015989be0a3f 100644
--- a/power/main.c
+++ b/power/main.c
@@ -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;
 }
 
 /*
diff --git a/ss/dat.h b/ss/dat.h
index 95527a0c9624d9c6f309e30df7d1c1475021b3e4..06f4e6bd2c3bec92021945e0fd573700e3333b5e 100644
--- a/ss/dat.h
+++ b/ss/dat.h
@@ -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 */
 };
 
 /*
diff --git a/ss/main.c b/ss/main.c
index 3574845d54fa08dcfea4da83ffbf3c092cdaaac5..6bac384bb62023e8989e844f999c0652dc58c33b 100644
--- a/ss/main.c
+++ b/ss/main.c
@@ -220,7 +220,6 @@ confinit(void)
 	conf.ip = 64;
 	conf.arp = 32;
 	conf.frag = 32;
-	conf.cntrlp = 0;
 }
 
 /*