100 files changed, 131 insertions(+), 236 deletions(-)

M boot/boot.c
M boot/local.c
M gnot/bbmalloc.c
M gnot/clock.c
M gnot/devduart.c
M gnot/devincon.c
M gnot/devport.c
M gnot/disk.c
M gnot/fault68020.c
D gnot/lib.h
M gnot/main.c
M gnot/mmu.c
M gnot/screen.c
M gnot/trap.c
M pc/bbmalloc.c
M pc/cga.c
M pc/clock.c
M pc/devfloppy.c
M pc/devhard.c
M pc/devincon.c
M pc/devlpt.c
M pc/devrtc.c
M pc/devuart.c
M pc/dma.c
M pc/fault386.c
M pc/headland.c
M pc/kbd.c
M pc/main.c
M pc/mmu.c
M pc/pmu.c
M pc/trap.c
M pc/vga.c
M port/alarm.c
M port/chan.c
M port/dev.c
M port/devXXX.c
M port/devarp.c
M port/devbit.c
M port/devboot.c
M port/devcons.c
M port/devdk.c
M port/devdup.c
M port/devenv.c
M port/devip.c
M port/deviproute.c
M port/devkprof.c
M port/devlance.c
M port/devmnt.c
M port/devmux.c
M port/devpipe.c
M port/devproc.c
M port/devroot.c
M port/devscc.c
M port/devscsi.c
M port/devsrv.c
M port/devwren.c
M port/fault.c
M port/ipdat.h
M port/net.c
M port/netXXX.c
M port/page.c
M port/pgrp.c
M port/portdat.h
M port/print.c
M port/proc.c
M port/qlock.c
M port/queue.c
M port/segment.c
M port/stasync.c
M port/stfcall.c
M port/stil.c
M port/stip.c
M port/stream.c
M port/streboot.c
M port/sturp.c
M port/swap.c
M port/sysfile.c
M port/sysproc.c
M port/taslock.c
M port/tcpif.c
M port/tcpinput.c
M port/tcpoutput.c
M port/tcptimer.c
M power/clock.c
M power/devduart.c
M power/devhotrod.c
M power/devhs.c
M power/devrtc.c
M power/faultmips.c
M power/lock.c
M power/main.c
M power/mmu.c
M power/trap.c
M ss/bbmalloc.c
M ss/clock.c
M ss/faultsparc.c
M ss/main.c
M ss/mmu.c
M ss/screen.c
M ss/trap.c

@@ 77,7 77,6 @@ main(int argc, char *argv[])
 		session(fd);
 		if(cfs)
 			fd = (*cfs)(fd);
-		srvcreate(sys, fd);
 	}
 	srvcreate("boot", fd);
 

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

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

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

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

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

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

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 3,7 3,7 @@
  */
 
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

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

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.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;			 

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.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,

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 
 #define	PTR	sizeof(char*)
 #define	SHORT	sizeof(int)

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include "u.h"
-#include "lib.h"
+#include "../port/lib.h"
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 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 */

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

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include "u.h"
-#include "lib.h"
+#include "../port/lib.h"
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

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

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include "u.h"
-#include "lib.h"
+#include "../port/lib.h"
 #include "mem.h"
 #include "dat.h"
 #include "fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"


@@ 34,11 34,6 @@ char *env[2];
 char confbuf[4*1024];
 
 /*
- *  system name
- */
-char sysname[64];
-
-/*
  *  IO board type
  */
 int ioid;

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"

@@ 1,5 1,5 @@
 #include	"u.h"
-#include	"lib.h"
+#include	"../port/lib.h"
 #include	"mem.h"
 #include	"dat.h"
 #include	"fns.h"