From 4246f3df6d370e560bd55cba62879d39fdebcd49 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sun, 17 Mar 1991 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1991-03-17

---
 port/proc.c       |  1 +
 port/stream.c     | 18 ++++++++++++------
 power/devhotrod.c |  1 -
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/port/proc.c b/port/proc.c
index f0df4ab4e45ac96ab2984906aa5d1be5a31137de..b7392cd0f4c89b1ed7289731917ed04a87508682 100644
--- a/port/proc.c
+++ b/port/proc.c
@@ -173,6 +173,7 @@ loop:
 		p->nchild = 0;
 		p->child = 0;
 		p->exiting = 0;
+		p->pgrp = 0;
 		p->fpstate = FPinit;
 		memset(p->pidonmach, 0, sizeof p->pidonmach);
 		memset(p->seg, 0, sizeof p->seg);
diff --git a/port/stream.c b/port/stream.c
index 56baf6c2a51172464f97fd8797fa042ed57a5e4a..388e6790d12b920ae8d6d79563e9e53f19978d2c 100644
--- a/port/stream.c
+++ b/port/stream.c
@@ -457,7 +457,7 @@ blen(Block *bp)
 }
 
 /*
- * bround - round a block to chain to some 2^n number of bytes
+ * bround - round a block chain to some 2^n number of bytes
  */
 int
 bround(Block *bp, int amount)
@@ -466,7 +466,8 @@ bround(Block *bp, int amount)
 	int len, pad;
 
 	len = 0;
-	SET(last);
+	SET(last);	/* Ken's magic */
+
 	while(bp) {
 		len += BLEN(bp);
 		last = bp;
@@ -476,9 +477,12 @@ bround(Block *bp, int amount)
 	pad = ((len + amount) & ~amount) - len;
 	if(pad) {
 		last->next = allocb(pad);
-		memset(last->next->rptr, 0, pad);
-		last->next->flags |= S_DELIM;
 		last->flags &= ~S_DELIM;
+		last = last->next;
+		memset(last->wptr, 0, pad);
+		last->wptr += pad;
+		last->flags |= S_DELIM;
+		
 	}
 
 	return len + pad;
@@ -1362,14 +1366,16 @@ void
 dumpqueues(void)
 {
 	Queue *q;
-	int count;
+	int count, qcount;
 	Block *bp;
 	Bclass *bcp;
 
 	print("\n");
+	qcount = 0;
 	for(q = qlist; q < qlist + conf.nqueue; q++, q++){
 		if(!(q->flag & QINUSE))
 			continue;
+		qcount++;
 		print("%s %ux  R n %d l %d f %ux r %ux", q->info->name, q, q->nb,
 			q->len, q->flag, &(q->r));
 		print("  W n %d l %d f %ux r %ux\n", WR(q)->nb, WR(q)->len, WR(q)->flag,
@@ -1377,7 +1383,7 @@ dumpqueues(void)
 		dumpblocks(q, 'R');
 		dumpblocks(WR(q), 'W');
 	}
-	print("\n");
+	print("%d queues\n", qcount);
 	for(bcp=bclass; bcp<&bclass[Nclass]; bcp++){
 		lock(bcp);
 		for(count = 0, bp = bcp->first; bp; count++, bp = bp->next)
diff --git a/power/devhotrod.c b/power/devhotrod.c
index 8b1bfcc6e1c0861640afe1499ab8247c209b05b6..888a3d44252a19a9bdb9e1a6b8c6c3cbcbd8c8ae 100644
--- a/power/devhotrod.c
+++ b/power/devhotrod.c
@@ -13,7 +13,6 @@
 /*
  * If defined, ENABMEMTEST causes memory test to be run at device open
  */
-#define	ENABMEMTEST
 #ifdef	ENABMEMTEST
 void	mem(Hot*, ulong*, ulong);
 #define	NTESTBUF	256