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

---
 boot/boot.c       |   1 -
 boot/local.c      |   2 +-
 gnot/bbmalloc.c   |   2 +-
 gnot/clock.c      |   2 +-
 gnot/devduart.c   |   2 +-
 gnot/devincon.c   |   2 +-
 gnot/devport.c    |   2 +-
 gnot/disk.c       |   2 +-
 gnot/fault68020.c |   2 +-
 gnot/lib.h        | 124 ----------------------------------------------
 gnot/main.c       |   2 +-
 gnot/mmu.c        |   2 +-
 gnot/screen.c     |   2 +-
 gnot/trap.c       |   2 +-
 pc/bbmalloc.c     |   2 +-
 pc/cga.c          |   2 +-
 pc/clock.c        |   2 +-
 pc/devfloppy.c    |   2 +-
 pc/devhard.c      |   2 +-
 pc/devincon.c     |   2 +-
 pc/devlpt.c       |   2 +-
 pc/devrtc.c       |   2 +-
 pc/devuart.c      |   2 +-
 pc/dma.c          |   2 +-
 pc/fault386.c     |   2 +-
 pc/headland.c     |   2 +-
 pc/kbd.c          |   2 +-
 pc/main.c         |   6 +--
 pc/mmu.c          |   6 +--
 pc/pmu.c          |   2 +-
 pc/trap.c         |   2 +-
 pc/vga.c          |   2 +-
 port/alarm.c      |   2 +-
 port/chan.c       |   2 +-
 port/dev.c        |   2 +-
 port/devXXX.c     |   2 +-
 port/devarp.c     |   2 +-
 port/devbit.c     |   2 +-
 port/devboot.c    |   2 +-
 port/devcons.c    |  20 +++++++-
 port/devdk.c      |   2 +-
 port/devdup.c     |   2 +-
 port/devenv.c     |   2 +-
 port/devip.c      |   2 +-
 port/deviproute.c |   2 +-
 port/devkprof.c   |   2 +-
 port/devlance.c   |   2 +-
 port/devmnt.c     |   2 +-
 port/devmux.c     |   2 +-
 port/devpipe.c    |   2 +-
 port/devproc.c    |   2 +-
 port/devroot.c    |   2 +-
 port/devscc.c     |   2 +-
 port/devscsi.c    |   2 +-
 port/devsrv.c     |   2 +-
 port/devwren.c    |   2 +-
 port/fault.c      |   2 +-
 port/ipdat.h      |   4 +-
 port/net.c        |   2 +-
 port/netXXX.c     |   2 +-
 port/page.c       |   2 +-
 port/pgrp.c       |   2 +-
 port/portdat.h    |   5 ++
 port/print.c      |   2 +-
 port/proc.c       |   2 +-
 port/qlock.c      |   2 +-
 port/queue.c      |   2 +-
 port/segment.c    |   2 +-
 port/stasync.c    |   2 +-
 port/stfcall.c    |   2 +-
 port/stil.c       |  12 +++--
 port/stip.c       |   2 +-
 port/stream.c     |   2 +-
 port/streboot.c   |   2 +-
 port/sturp.c      |   2 +-
 port/swap.c       |   2 +-
 port/sysfile.c    |   2 +-
 port/sysproc.c    |   2 +-
 port/taslock.c    |   2 +-
 port/tcpif.c      |   2 +-
 port/tcpinput.c   |   2 +-
 port/tcpoutput.c  |   2 +-
 port/tcptimer.c   |   2 +-
 power/clock.c     |   2 +-
 power/devduart.c  |   2 +-
 power/devhotrod.c |   2 +-
 power/devhs.c     |   2 +-
 power/devrtc.c    |   2 +-
 power/faultmips.c |   2 +-
 power/lock.c      |   2 +-
 power/main.c      |   7 +--
 power/mmu.c       |   2 +-
 power/trap.c      |   2 +-
 ss/bbmalloc.c     |   2 +-
 ss/clock.c        |   2 +-
 ss/faultsparc.c   |   2 +-
 ss/main.c         |   2 +-
 ss/mmu.c          |   2 +-
 ss/screen.c       |   2 +-
 ss/trap.c         |   2 +-
 100 files changed, 131 insertions(+), 236 deletions(-)
 delete mode 100644 gnot/lib.h

diff --git a/boot/boot.c b/boot/boot.c
index 0eaf79371d743f771b1955ecf835e7f889eb692c..4b9663322f81b1d4bd73058fddb4d5e6e3a22fff 100644
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -77,7 +77,6 @@ main(int argc, char *argv[])
 		session(fd);
 		if(cfs)
 			fd = (*cfs)(fd);
-		srvcreate(sys, fd);
 	}
 	srvcreate("boot", fd);
 
diff --git a/boot/local.c b/boot/local.c
index 8f7f4f1760e54219de24829504494ca2a32616d5..8f9a2627a3cef001290259bd16f98cc84def18d8 100644
--- a/boot/local.c
+++ b/boot/local.c
@@ -33,7 +33,7 @@ connectlocal(void)
 	sprint(partition, "%sfs", disk ? disk : bootdisk);
 	if(stat(partition, d) < 0)
 		return -1;
-
+	print("kfs...");
 	if(bind("#c", "/dev", MREPL) < 0)
 		fatal("bind #c");
 	if(bind("#p", "/proc", MREPL) < 0)
diff --git a/gnot/bbmalloc.c b/gnot/bbmalloc.c
index d6b62fea4d5da86694148948fa670fdb26f8a5bb..ba58450d3c6b74034541b129362ff24e067ce1c0 100644
--- a/gnot/bbmalloc.c
+++ b/gnot/bbmalloc.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/gnot/clock.c b/gnot/clock.c
index b2bcc64e1b074c55c48e360b6e2d1c941838ee3b..5f231b5e80859ae5efbe472ddd87f362b251cd4c 100644
--- a/gnot/clock.c
+++ b/gnot/clock.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/gnot/devduart.c b/gnot/devduart.c
index bd20c5d194603b4279dd09243e0a6e41df0481ea..e71288ce392f0cd5267277c76ce31cbf14132ef5 100644
--- a/gnot/devduart.c
+++ b/gnot/devduart.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/gnot/devincon.c b/gnot/devincon.c
index 8f1e781f86458b4cec8e6b2cf1095f6724fd514d..ed3d990ee72ac51adc9af9319a75cac2c17d3809 100644
--- a/gnot/devincon.c
+++ b/gnot/devincon.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/gnot/devport.c b/gnot/devport.c
index b2b2aec66ea6ff9e42f5fd54ffc9f8cdc123efe8..06cb435acc7c62f0a83b920dd32aa39291430470 100644
--- a/gnot/devport.c
+++ b/gnot/devport.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/gnot/disk.c b/gnot/disk.c
index e3669d21c87cf5ab33ccac368e2c2176d940aff5..4892094ebe6ac5c301e821a293dd0f444047d1b0 100644
--- a/gnot/disk.c
+++ b/gnot/disk.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/gnot/fault68020.c b/gnot/fault68020.c
index a07712c67ada0f8b5958665b202b6a04d176e0e1..ba6f00bd6c82c514ac5fd46219b50abaf8a15760 100644
--- a/gnot/fault68020.c
+++ b/gnot/fault68020.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/gnot/lib.h b/gnot/lib.h
deleted file mode 100644
index a47eababc62403d45314ba20f36101077a07c3c4..0000000000000000000000000000000000000000
--- a/gnot/lib.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * functions (possibly) linked in, complete, from libc.
- */
-
-/*
- * mem routines
- */
-extern	void	*memccpy(void*, void*, int, long);
-extern	void	*memset(void*, int, long);
-extern	int	memcmp(void*, void*, long);
-extern	void	*memmove(void*, void*, long);
-extern	void	*memchr(void*, int, long);
-
-/*
- * string routines
- */
-extern	char	*strcat(char*, char*);
-extern	char	*strchr(char*, char);
-extern	int	strcmp(char*, char*);
-extern	char	*strcpy(char*, char*);
-extern	char	*strncat(char*, char*, long);
-extern	char	*strncpy(char*, char*, long);
-extern	int	strncmp(char*, char*, long);
-extern	long	strlen(char*);
-extern	int	atoi(char*);
-
-/*
- * rune routines
- */
-extern	int	runetochar(char*, Rune*);
-extern	int	chartorune(Rune*, char*);
-extern	int	countrune(char*);
-extern	char*	utfrune(char*, long);
-
-/*
- * print routines
- */
-
-#define	FUNSIGN	4
-#define	FSHORT	2
-#define	FLONG	1
-
-typedef struct Op	Op;
-struct Op
-{
-	char	*p;
-	char	*ep;
-	void	*argp;
-	int	f1;
-	int	f2;
-	int	f3;
-};
-extern	void	strconv(char*, Op*, int, int);
-extern	int	numbconv(Op*, int);
-extern	char	*doprint(char*, char*, char*, void*);
-extern	int	fmtinstall(char, int (*)(Op*));
-extern	int	sprint(char*, char*, ...);
-extern	int	print(char*, ...);
-
-/*
- * one-of-a-kind
- */
-extern	long	strtol(char*, char**, int);
-extern	ulong	strtoul(char*, char**, int);
-extern	char	etext[];
-extern	char	edata[];
-extern	char	end[];
-/*
- * Syscall data structures
- */
-
-#define	MORDER	0x0003	/* mask for bits defining order of mounting */
-#define	MREPL	0x0000	/* mount replaces object */
-#define	MBEFORE	0x0001	/* mount goes before others in union directory */
-#define	MAFTER	0x0002	/* mount goes after others in union directory */
-#define	MCREATE	0x0004	/* permit creation in mounted directory */
-#define	MMASK	0x0007	/* all bits on */
-
-#define	OREAD	0	/* open for read */
-#define	OWRITE	1	/* write */
-#define	ORDWR	2	/* read and write */
-#define	OEXEC	3	/* execute, == read but check execute permission */
-#define	OTRUNC	16	/* or'ed in (except for exec), truncate file first */
-#define	OCEXEC	32	/* or'ed in, close on exec */
-#define	ORCLOSE	64	/* or'ed in, remove on close */
-
-#define	NCONT	0	/* continue after note */
-#define	NDFLT	1	/* terminate after note */
-
-typedef struct Qid	Qid;
-typedef struct Dir	Dir;
-typedef struct Waitmsg	Waitmsg;
-
-#define	ERRLEN		64
-#define	DIRLEN		116
-#define	NAMELEN		28
-#define DESKEYLEN	7
-
-struct Qid
-{
-	ulong	path;
-	ulong	vers;
-};
-
-struct Dir
-{
-	char	name[NAMELEN];
-	char	uid[NAMELEN];
-	char	gid[NAMELEN];
-	Qid	qid;
-	ulong	mode;
-	long	atime;
-	long	mtime;
-	Length;
-	short	type;
-	short	dev;
-};
-
-struct Waitmsg
-{
-	char	pid[12];	/* of loved one */
-	char	time[3*12];	/* of loved one and descendants */
-	char	msg[ERRLEN];
-};
diff --git a/gnot/main.c b/gnot/main.c
index 67c686db06f5634e75ba09909ea77285944f9712..64b05b661670fae241a167422c1a73db5a033a5b 100644
--- a/gnot/main.c
+++ b/gnot/main.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/gnot/mmu.c b/gnot/mmu.c
index 1e5eb37130c36846c616d26b58e6e11419a98f48..7be34514b3f14dd22a4fa4336a8c05a3f7a06eea 100644
--- a/gnot/mmu.c
+++ b/gnot/mmu.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/gnot/screen.c b/gnot/screen.c
index 3984f3eba32122114763f4a3ff1dcee0cb0a20da..0915429f61a36729e6cd430943993b5b8170db73 100644
--- a/gnot/screen.c
+++ b/gnot/screen.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/gnot/trap.c b/gnot/trap.c
index 72cddfce5355988ff545208762ca57c5e79030bc..d556a870d7001d067b05ffa69d9e44b84ef898a6 100644
--- a/gnot/trap.c
+++ b/gnot/trap.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/bbmalloc.c b/pc/bbmalloc.c
index 3dde08e9b2f2d30019e5da354d34fabf545fd21d..9dfffb96a468c70f456d31fe0d5c674d806dce7f 100644
--- a/pc/bbmalloc.c
+++ b/pc/bbmalloc.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/cga.c b/pc/cga.c
index 4789a13bf3815187983cbdcdde57957f98e9c6ec..ebf17e6d29cbcc84bfbe7ce2fcd7cb14a96058fb 100644
--- a/pc/cga.c
+++ b/pc/cga.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/clock.c b/pc/clock.c
index 376f3f59189443b6d1467df15416c92e23c9ee60..0b3be7d77406e6b7f9fe6ec7ad025608bc93a121 100644
--- a/pc/clock.c
+++ b/pc/clock.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/devfloppy.c b/pc/devfloppy.c
index c33b83d1133d596ff32c905c403c831f46299047..b8b88a35e01b365b822444584b7bd82cd594c946 100644
--- a/pc/devfloppy.c
+++ b/pc/devfloppy.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/devhard.c b/pc/devhard.c
index 21709f486a27c365e4be0983bf9d04a46f185650..642cf76f97ddc99660bc072569b2bb0f15dcc425 100644
--- a/pc/devhard.c
+++ b/pc/devhard.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/devincon.c b/pc/devincon.c
index c0555e6a2382d645d19f31738d6e8633f25a08d1..a66eeb4d4b200e4184366c08c5f8c4a9a671a0b0 100644
--- a/pc/devincon.c
+++ b/pc/devincon.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/devlpt.c b/pc/devlpt.c
index d3e28b6f315d9fd1e92922263617c75100717114..2760e66f8c753196f0a26300c38bdaaf8eda4088 100644
--- a/pc/devlpt.c
+++ b/pc/devlpt.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/devrtc.c b/pc/devrtc.c
index ee0e78d904f0b89dc4357294cb51457459084256..f0fde64c8e21ddf84f2e851af03d9455135d6b83 100644
--- a/pc/devrtc.c
+++ b/pc/devrtc.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/devuart.c b/pc/devuart.c
index 96fbc2ce8240530b18046712a4d13002e1fbbd60..c03f27dcb4a16f863476e9d57c44e5ddb6472851 100644
--- a/pc/devuart.c
+++ b/pc/devuart.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/dma.c b/pc/dma.c
index a2a211a9b50072fa623c2d826d1f7ec71c82ad75..b63fb1de68b5fc0240152ecd805c5928004895fa 100644
--- a/pc/dma.c
+++ b/pc/dma.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/fault386.c b/pc/fault386.c
index 24be65663d8e93c2e4171281664faa8905ade4a3..28366ba2415bc31ad00d076689f9cfe3b41925c7 100644
--- a/pc/fault386.c
+++ b/pc/fault386.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/headland.c b/pc/headland.c
index 9f33126f83a043b7b4f06a3640ba1bfd19335ea2..09e77c0a1959130b5cf624559b3b58cc6ae85b67 100644
--- a/pc/headland.c
+++ b/pc/headland.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/kbd.c b/pc/kbd.c
index 3a9e905a1a4cd02a65a68204295001933e56da6b..cd5af26ed5b0e63218d2ef876a59c39d6f68fd76 100644
--- a/pc/kbd.c
+++ b/pc/kbd.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/main.c b/pc/main.c
index def1ea1bab5876803996c642e927d7a1b92dc19b..09fb6cb8bb6484832ce410752d7da3a57936567c 100644
--- a/pc/main.c
+++ b/pc/main.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
@@ -7,7 +7,6 @@
 #include	"ureg.h"
 #include	"init.h"
 
-extern long edata;
 int machtype;
 
 void
@@ -34,12 +33,10 @@ main(void)
 	chaninit();
 	alarminit();
 	bigcursor();
-print("chandevreset\n");
 	chandevreset();
 	streaminit();
 	swapinit();
 	pageinit();
-print("userinit\n");
 	userinit();
 
 	schedinit();
@@ -200,7 +197,6 @@ confinit(void)
 	conf.npage1 = ((i-1)*1024*1024 - conf.base1)/BY2PG;
 
 	conf.npage = conf.npage0 + conf.npage1;
-	conf.maxialloc = 2*1024*1024;
 
 	mul = 1;
 	conf.nproc = 30 + i*5;
diff --git a/pc/mmu.c b/pc/mmu.c
index 1850294392126fb0d31ebed1673826ba877b18de..d4be7e34f642110ddbf552ee6ba4a0c60f1d476b 100644
--- a/pc/mmu.c
+++ b/pc/mmu.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
@@ -78,13 +78,13 @@ static ulong	*upt;		/* 2nd level page table for struct User */
  *  offset of virtual address into
  *  top level page table
  */
-#define TOPOFF(v)	((v)>>(2*PGSHIFT-2))
+#define TOPOFF(v)	(((ulong)(v))>>(2*PGSHIFT-2))
 
 /*
  *  offset of virtual address into
  *  bottom level page table
  */
-#define BTMOFF(v)	(((v)>>(PGSHIFT))&(WD2PG-1))
+#define BTMOFF(v)	((((ulong)(v))>>(PGSHIFT))&(WD2PG-1))
 
 /*
  *  Create a prototype page map that maps all of memory into
diff --git a/pc/pmu.c b/pc/pmu.c
index c991abda8c148793cefe77cfcf3157d107e42ccc..e0a453fd5e7444a6f80b4b1d84375b129d178812 100644
--- a/pc/pmu.c
+++ b/pc/pmu.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/trap.c b/pc/trap.c
index 3fbba6a22a576c23014a0a38a9c3fb8a5bdddcc1..b409fda97f0ceff7c7f6d3a52f5687f6a4a1280f 100644
--- a/pc/trap.c
+++ b/pc/trap.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/pc/vga.c b/pc/vga.c
index 765a9135d6e175b8238561d810bf1bf246ee6d37..04cb2e552237e8121b69da4805f7473ed2fdea09 100644
--- a/pc/vga.c
+++ b/pc/vga.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/alarm.c b/port/alarm.c
index 27913a102382fa3a54a8687608c169b8578316cb..5c4e3735ce477074ad3d21e5908fb6fcaedb6053 100644
--- a/port/alarm.c
+++ b/port/alarm.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/chan.c b/port/chan.c
index 8c3844d66096fabb9126d0fa29ece1f13611dd3a..be2e0de284faf62f72d9465fab9ebe4c17a5fa7a 100644
--- a/port/chan.c
+++ b/port/chan.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/dev.c b/port/dev.c
index 1adcb66560c0ad34b8c2ccc4c01115467210dcfd..0a789625a26e9314a92f93993353f50063273569 100644
--- a/port/dev.c
+++ b/port/dev.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devXXX.c b/port/devXXX.c
index 420e1df187f58484bc915d668af5fcec9b5564ab..8f6d94764cdfd35344ecd07eb0471a09eaa1162b 100644
--- a/port/devXXX.c
+++ b/port/devXXX.c
@@ -3,7 +3,7 @@
  */
 
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devarp.c b/port/devarp.c
index 307c96c7e1db786893e8fa72858bd65e5b45d318..4389757e8e42d3618644980a404b9283e54b0ba5 100644
--- a/port/devarp.c
+++ b/port/devarp.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devbit.c b/port/devbit.c
index caca620fa71819220a70e7436ac8e044b6a3e8a9..bdf4a9bc7a578e6477f0bdb09782a84bb1fd5ca8 100644
--- a/port/devbit.c
+++ b/port/devbit.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devboot.c b/port/devboot.c
index 9902f8117b12d4e35e746b4c48ae51bde8510926..d83d83780463e0a7329e7126975706c31549787d 100644
--- a/port/devboot.c
+++ b/port/devboot.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devcons.c b/port/devcons.c
index 405e5c65aa2509809b9541ec4899900de42f8aec..55133b26dcd3fac0745e518dfada8e9d41493b7f 100644
--- a/port/devcons.c
+++ b/port/devcons.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
@@ -23,6 +23,7 @@ static int	raw;			/* true if raw has been requested on a ctl file */
 
 char	eve[NAMELEN] = "bootes";
 char	evekey[DESKEYLEN];
+char	sysname[NAMELEN];
 
 /*
  *  init the queues and set the output routine
@@ -341,6 +342,7 @@ enum{
 	Qcrypt,
 	Qkey,
 	Qchal,
+	Qsysname,
 };
 
 Dirtab consdir[]={
@@ -362,6 +364,7 @@ Dirtab consdir[]={
 	"key",		{Qkey},		DESKEYLEN,	0222,
 	"klog",		{Qklog},	0,		0444,
 	"sysstat",	{Qsysstat},	0,		0666,
+	"sysname",	{Qsysname},	0,		0664,
 	"swap",		{Qswap},	0,		0664,
 };
 
@@ -650,6 +653,10 @@ consread(Chan *c, void *buf, long n, ulong offset)
 				conf.nswap-swapalloc.free, conf.nswap);
 
 		return readstr(offset, buf, n, xbuf);
+
+	case Qsysname:
+		return readstr(offset, buf, n, sysname);
+
 	default:
 		print("consread %lux\n", c->qid);
 		error(Egreg);
@@ -864,6 +871,17 @@ conswrite(Chan *c, void *va, long n, ulong offset)
 		setswapchan(swc);
 		break;
 
+	case Qsysname:
+		if(offset != 0)
+			error(Ebadarg);
+		if(n <= 0 || n >= NAMELEN)
+			error(Ebadarg);
+		strncpy(sysname, a, n);
+		sysname[n] = 0;
+		if(sysname[n-1] == '\n')
+			sysname[n-1] = 0;
+		break;
+
 	default:
 		print("conswrite: %d\n", c->qid.path);
 		error(Egreg);
diff --git a/port/devdk.c b/port/devdk.c
index f3bb7ccb1cb7a864dabc066bf88cfb53cdb366e5..44f25fccb4b4bb1ddb3f31329ba3f66808639275 100644
--- a/port/devdk.c
+++ b/port/devdk.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devdup.c b/port/devdup.c
index 22e8d0b89bc578e17d2de12ddaf21ac7c97df4f8..d2379f58467e540e938c10d37df3941b175f6e5b 100644
--- a/port/devdup.c
+++ b/port/devdup.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devenv.c b/port/devenv.c
index 06a3a0921b50d56d6f3b779548f311dd512b9c1d..d8a9de5eb7ddb2f61bf31cad8bf2a20304214955 100644
--- a/port/devenv.c
+++ b/port/devenv.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devip.c b/port/devip.c
index 8ab322898a20266876c4eada1eeaa3341565f931..24f829c536b0bfe7146796657690fe3cb2d13947 100644
--- a/port/devip.c
+++ b/port/devip.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/deviproute.c b/port/deviproute.c
index 72c21a577f692c9608ebc9eec9b94cc81b598626..ce2df89874984eac60e3e1adaee593fb94700935 100644
--- a/port/deviproute.c
+++ b/port/deviproute.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devkprof.c b/port/devkprof.c
index 18295a2e57aae1d6d2bbfef8f30b682a40ec9194..f2805e581e35a198e89469d41d39b06f0b848cdf 100644
--- a/port/devkprof.c
+++ b/port/devkprof.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devlance.c b/port/devlance.c
index b2964e8da33f42c82d9976b7f069dc55f57fea53..4900448b5be5c12d594e78121b3c96bab5e5ea5f 100644
--- a/port/devlance.c
+++ b/port/devlance.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devmnt.c b/port/devmnt.c
index 31d073b736be6d15b8a492a7d8770c9bc5da90e3..4bf27f798ca5f9894c164cf809245cffb25f9e22 100644
--- a/port/devmnt.c
+++ b/port/devmnt.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devmux.c b/port/devmux.c
index 832b29744c23c7937b34e46bf1841d89bb4150be..320b05f6dc1de679b36ffaea8decedcc9170f1bf 100644
--- a/port/devmux.c
+++ b/port/devmux.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devpipe.c b/port/devpipe.c
index 7aeef8e4387246b269db49e868716e94ef9c4648..ff2d0820a4f6a872ee34628cf57c8f0fa380faf6 100644
--- a/port/devpipe.c
+++ b/port/devpipe.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devproc.c b/port/devproc.c
index b0ff664e486e235869ef5bf67a96891e5336ebfb..24d80a6912c94582adf7777afc0977038611fcee 100644
--- a/port/devproc.c
+++ b/port/devproc.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devroot.c b/port/devroot.c
index d8bb79a9a99211b6cb166d0c07bf73811761e638..3c1cf27a48acd56af40dbc61218ccaddb0ecf159 100644
--- a/port/devroot.c
+++ b/port/devroot.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devscc.c b/port/devscc.c
index 0abf51315a1c20b5e732d2b12f733d8bf710bad8..5593dcb9e0a0c2bd8ec184db676abca52e41bb69 100644
--- a/port/devscc.c
+++ b/port/devscc.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devscsi.c b/port/devscsi.c
index bd67aeb8e092de5c767951423c6e149f525ffba4..c0750da0fc5bafa97d0c668e0b8a6e43fbe24071 100644
--- a/port/devscsi.c
+++ b/port/devscsi.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devsrv.c b/port/devsrv.c
index 49b81faa3594bed4cc70b362e969557f9d70c091..169d015d7988d88abce45eb3a41010cb54f71601 100644
--- a/port/devsrv.c
+++ b/port/devsrv.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/devwren.c b/port/devwren.c
index 2f3f4ccd397093daf7b1ed9e18ae1522014fbf3c..8e65ef50940a544e82285f6cf68e535e8ce8b696 100644
--- a/port/devwren.c
+++ b/port/devwren.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/fault.c b/port/fault.c
index 1aef2270d711d768355a99e1ab2d361d2d51f9b7..e39cb6b6651f2ee11e345176db73564448f07b94 100644
--- a/port/fault.c
+++ b/port/fault.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/ipdat.h b/port/ipdat.h
index d9a1c22182d9111bbbfaf54e178271a8cb2b67a4..69a2b34722f99f907f3cdaac911c87c0c2ab9188 100644
--- a/port/ipdat.h
+++ b/port/ipdat.h
@@ -232,10 +232,10 @@ struct Tctl
 	char	tos;
 
 	Block	*rcvq;
-	ushort	rcvcnt;
+	ulong	rcvcnt;
 
 	Block	*sndq;			/* List of data going out */
-	ushort	sndcnt;			/* Amount of data in send queue */
+	ulong	sndcnt;			/* Amount of data in send queue */
 
 	Reseq	*reseq;			/* Resequencing queue */
 	Timer	timer;			 
diff --git a/port/net.c b/port/net.c
index b1752e8d0dbddbec63605ed20208c81d6176c45a..011fdc267cd22a0d2a07d433e2ecefe66ffd91a0 100644
--- a/port/net.c
+++ b/port/net.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/netXXX.c b/port/netXXX.c
index c2ee63e5609fe4f20108548c6cf419598c6fe5dd..5068b5747a6cccfadca4cea50c14d0e8c07c0b6b 100644
--- a/port/netXXX.c
+++ b/port/netXXX.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/page.c b/port/page.c
index ca3f7dc379aa50a444bfc15cc193de830908e275..b5560100cb156f965e4105bb9385e8aeb45d7000 100644
--- a/port/page.c
+++ b/port/page.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/pgrp.c b/port/pgrp.c
index 15595912367d100e4a3e0d2ed549d0b074ae1b56..fe366737812cdcf90e02110e18677b5a1d2e85a7 100644
--- a/port/pgrp.c
+++ b/port/pgrp.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/portdat.h b/port/portdat.h
index ff5c71be6609b9b6132f071d5c31d82db25eda9f..c654b3dccc8fe182eb57f422d2936b5bf03c63fc 100644
--- a/port/portdat.h
+++ b/port/portdat.h
@@ -696,6 +696,7 @@ extern	Pgrps 	pgrpalloc;
 extern  Image	swapimage;
 extern  char	eve[];
 extern	int	nrdy;
+extern	char	sysname[NAMELEN];
 
 #define	CHDIR		0x80000000L
 #define	CHAPPEND 	0x40000000L
@@ -707,7 +708,11 @@ extern	int	nrdy;
 #define CHLEN		8
 enum{
 	FScchal	= 1,
+	FSschal,
+	FSok,
 	FSctick,
+	FSstick,
+	FSerr,
 
 	RXschal	= 0,
 	RXstick	= 1,
diff --git a/port/print.c b/port/print.c
index d1b5366e68201c6afe57ed7b19a598ccd6d67b8b..4112dc20493af546a1376f584c6e2f4462100d03 100644
--- a/port/print.c
+++ b/port/print.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 
 #define	PTR	sizeof(char*)
 #define	SHORT	sizeof(int)
diff --git a/port/proc.c b/port/proc.c
index 896a7b03284ab7b48b2acea629e1f12f96026b7c..53058a5b08e97c1d6ca306f86d4208ce62166609 100644
--- a/port/proc.c
+++ b/port/proc.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/qlock.c b/port/qlock.c
index 2bb950492ae3021671dd499a641449158ae0c8b7..7cb717dd91e237c7075b25c1a862ebe0e5d6efb5 100644
--- a/port/qlock.c
+++ b/port/qlock.c
@@ -1,5 +1,5 @@
 #include "u.h"
-#include "lib.h"
+#include "../port/lib.h"
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
diff --git a/port/queue.c b/port/queue.c
index a5fab13e3071bb4d67b4762a237c30caf8e85af0..1a9f2ad71ef37681e01eb78537ca0a52e2c50a88 100644
--- a/port/queue.c
+++ b/port/queue.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/segment.c b/port/segment.c
index b3b9cca44a65e2183d0b0d307b90bb2316ff3bc6..aec30e9bd87ff3a5b80ee1bce198a496081763a1 100644
--- a/port/segment.c
+++ b/port/segment.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/stasync.c b/port/stasync.c
index c335e3b7fb8725157938c0528fc18486ddf7122a..94b907c6702cd00f811edcb29f7266d2d9a4e9d5 100644
--- a/port/stasync.c
+++ b/port/stasync.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/stfcall.c b/port/stfcall.c
index c7e176c9c65c61342893e05e0af5aa866424283e..1714ddc0261be2cfb6dc807d6fb47c993fe0288b 100644
--- a/port/stfcall.c
+++ b/port/stfcall.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/stil.c b/port/stil.c
index 84beaa53e9a6eec4f728f57e01f01b95a1ec9594..e802a25ba01426b827ee049b59227130ffc021f5 100644
--- a/port/stil.c
+++ b/port/stil.c
@@ -2,7 +2,7 @@
  * stil - Internet link protocol
  */
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
@@ -16,8 +16,14 @@ int 		ilcksum = 1;
 static 	int 	initseq = 25000;
 static	Rendez	ilackr;
 
-char	*ilstate[] = { "Closed", "Syncer", "Syncee", "Established", "Listening", "Closing" };
-char	*iltype[] =  { "sync", "data", "dataquerey", "ack", "querey", "state", "close" };
+char	*ilstate[] = 
+{ 
+	"Closed", "Syncer", "Syncee", "Established", "Listening", "Closing" 
+};
+char	*iltype[] = 
+{	
+	"sync", "data", "dataquerey", "ack", "querey", "state", "close" 
+};
 static char *etime = "connection timed out";
 
 /* Always Acktime < Fasttime < Slowtime << Ackkeepalive */
diff --git a/port/stip.c b/port/stip.c
index baed0248cbb69c23d2f22d739e49307ba0f91766..9ab8748f3ad240d2086d12ffb4aaff3b1aa74a1c 100644
--- a/port/stip.c
+++ b/port/stip.c
@@ -5,7 +5,7 @@
  *  to demultiplex/multiplex ip conversations.
  */
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/stream.c b/port/stream.c
index bfa40a956765bfa0e5d267f6d61e51bf6821ef49..3bca08a35924108707046824867f8a7c1959261d 100644
--- a/port/stream.c
+++ b/port/stream.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/streboot.c b/port/streboot.c
index c2ebc814fc1fd1b992c9a139fdec0b9620343085..0d35815a1afc3a1e3c5d6e7048e6e1dcf543748e 100644
--- a/port/streboot.c
+++ b/port/streboot.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/sturp.c b/port/sturp.c
index 2f09ef755ede8de24e41c6c2aec852c81bb14897..9b8d4ead266d09346ab93be29d63648cf8321b48 100644
--- a/port/sturp.c
+++ b/port/sturp.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/swap.c b/port/swap.c
index 94046e659926907ce3bcfd51a779fbfb9d06e27f..f02fcbcc3de49bfcfd1d9f854504605f053b30e0 100644
--- a/port/swap.c
+++ b/port/swap.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/sysfile.c b/port/sysfile.c
index d3c45c846d588e2a5f92ecf03a9d528883044143..6552f5acadf1bb3ca468890c4c130a880498e2d1 100644
--- a/port/sysfile.c
+++ b/port/sysfile.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/sysproc.c b/port/sysproc.c
index cd52abfe8d96331d6a1f02ff385b2cb624c01391..f5e619846c26d925a8e896873fb170aba4ba9bac 100644
--- a/port/sysproc.c
+++ b/port/sysproc.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/taslock.c b/port/taslock.c
index 845206bfe99f202df6e3b318ed7fc370dd61e157..477d37bf4357615aac11cee9b3412f2e9c9e2fdf 100644
--- a/port/taslock.c
+++ b/port/taslock.c
@@ -1,5 +1,5 @@
 #include "u.h"
-#include "lib.h"
+#include "../port/lib.h"
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
diff --git a/port/tcpif.c b/port/tcpif.c
index 8e0bc8b0fbcb6e8b8933a2b0f5aa4ced8f903a10..9f63290e92ad8512ed31ec737dfb28677342d788 100644
--- a/port/tcpif.c
+++ b/port/tcpif.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/tcpinput.c b/port/tcpinput.c
index d128a48338caf4137a51ad0718780f7803641b59..77958cc130908ee6fa03f8697013125590c93a41 100644
--- a/port/tcpinput.c
+++ b/port/tcpinput.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/tcpoutput.c b/port/tcpoutput.c
index 32d7d98834d0f555bd56d0fe33bf92c3e1e9ec24..0503af9ab77fd0e243897bcb8580bc00381e3793 100644
--- a/port/tcpoutput.c
+++ b/port/tcpoutput.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/port/tcptimer.c b/port/tcptimer.c
index 830a882ae3ac8ddfea70a6f02ee3a7eb200c4ea4..b2a51611ee381a2c55c3fdbc1288e8661c833d16 100644
--- a/port/tcptimer.c
+++ b/port/tcptimer.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/power/clock.c b/power/clock.c
index 590ea70228d2acd3d0d3491939885eb0e2105698..4f5f37362fea196e796051023dfcac96665d2921 100644
--- a/power/clock.c
+++ b/power/clock.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/power/devduart.c b/power/devduart.c
index 57d76f628bdf20f3ef0b450cd5d30f4439b4222b..c471484cea8dc9b6979d4e5f6a1756c5d005055c 100644
--- a/power/devduart.c
+++ b/power/devduart.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/power/devhotrod.c b/power/devhotrod.c
index a3307768c62131520329ebb2d43d81d76cb2954a..fbfaae36990864fea0aeb8f1107f14eba8d7f312 100644
--- a/power/devhotrod.c
+++ b/power/devhotrod.c
@@ -1,6 +1,6 @@
 #define	BITBOTCH	256	/* remove with BIT3 */
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/power/devhs.c b/power/devhs.c
index 8598f9d78f00f13579610b30ccae095a69d8ca2c..75442057ec762b59add00171af9d4ff39be2b1b3 100644
--- a/power/devhs.c
+++ b/power/devhs.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/power/devrtc.c b/power/devrtc.c
index 95594452e19c9de36feb886277b1149dc819ea48..28d26c5d092939f1282cbcf01b5458662a569537 100644
--- a/power/devrtc.c
+++ b/power/devrtc.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/power/faultmips.c b/power/faultmips.c
index 04abd2c0c34cc245fbde6054c9343e3253434938..32ea727c4ba615706afd92588b078f955815bb29 100644
--- a/power/faultmips.c
+++ b/power/faultmips.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/power/lock.c b/power/lock.c
index 106245883efe61f9d7e512c9f6b2ae04176c78a4..51856109eba95096b45d383da0ca4a629159e788 100644
--- a/power/lock.c
+++ b/power/lock.c
@@ -1,5 +1,5 @@
 #include "u.h"
-#include "lib.h"
+#include "../port/lib.h"
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"
diff --git a/power/main.c b/power/main.c
index f05a3fb196dc561aeabaf38309b1992810019779..93575fcbb5a0329b6efe0895f447a5d94da65272 100644
--- a/power/main.c
+++ b/power/main.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
@@ -33,11 +33,6 @@ char *env[2];
  */
 char confbuf[4*1024];
 
-/*
- *  system name
- */
-char sysname[64];
-
 /*
  *  IO board type
  */
diff --git a/power/mmu.c b/power/mmu.c
index 40308e38b2fb3d99d801af1a83bd31e5c2846bbb..aef0f7bfaf46d2f528751bde5716e835ce743077 100644
--- a/power/mmu.c
+++ b/power/mmu.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/power/trap.c b/power/trap.c
index fb096be06fb17b1c09b1acdc4459807cb9f9c090..593be50fb709ea931e8a6a4f803c08c09db298a3 100644
--- a/power/trap.c
+++ b/power/trap.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/ss/bbmalloc.c b/ss/bbmalloc.c
index e99f9ae822c1ee42ce5cf919ea13250f9c746dea..4115cab7b76061232b0fec8fb182be6511778859 100644
--- a/ss/bbmalloc.c
+++ b/ss/bbmalloc.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/ss/clock.c b/ss/clock.c
index a8d71a7004e8ef5f5bdd9f424d7f68dc44d058f1..3fac265a8f0b3b3d5dd25d7dbdbcd4e7c03c5484 100644
--- a/ss/clock.c
+++ b/ss/clock.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/ss/faultsparc.c b/ss/faultsparc.c
index b2153523ef23d220f3e75d19f4b4920c6704052e..1a735778438a5e7ede7b8186955c17f14f0f48aa 100644
--- a/ss/faultsparc.c
+++ b/ss/faultsparc.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/ss/main.c b/ss/main.c
index 5678547a303a927bc26e38153f173b74ba5cf4b4..006535c90d0a855092a3a256fb8490168cf58d8f 100644
--- a/ss/main.c
+++ b/ss/main.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/ss/mmu.c b/ss/mmu.c
index c4561804eda67332f6207fd0e6b0a2abeb808ae3..028f3f2e1f8e8b809fa696e36a4f9471097d8073 100644
--- a/ss/mmu.c
+++ b/ss/mmu.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/ss/screen.c b/ss/screen.c
index 75dcdb214f31a042138a4353b14882884992d4c2..d941c9e8f836e3f37467d4c0c186c9f163a8fb4e 100644
--- a/ss/screen.c
+++ b/ss/screen.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"
diff --git a/ss/trap.c b/ss/trap.c
index dae5c99fa07b5fc81555549f2de05f4295364b10..83a86e56f277bc6849a7ae695bec88a43f027c77 100644
--- a/ss/trap.c
+++ b/ss/trap.c
@@ -1,5 +1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"