20061220

10 files changed, 63 insertions, 12 deletions

diff --git a/lib/proto/FreeBSD b/lib/proto/FreeBSD
index 4bc67beb..8fb07d0e 100644
--- a/lib/proto/FreeBSD
+++ b/lib/proto/FreeBSD
@@ -1,7 +1,7 @@
 FreeBSD
 	386
 		bin
-			emu.new	0775	inferno	inf	/FreeBSD/386/bin/emu
+			emu.new	0775	inferno	inferno	/FreeBSD/386/bin/emu
 			asm
 			iar
 			data2c
@@ -11,6 +11,7 @@ FreeBSD
 
 			limbo
 			mk
+			mkext
 			ndate
 			inm
 			yacc
diff --git a/lib/proto/Hp b/lib/proto/Hp
index 4b328a3c..27e6560a 100644
--- a/lib/proto/Hp
+++ b/lib/proto/Hp
@@ -1,7 +1,7 @@
 Hp
 	s800
 		bin
-			emu.new	0775	inferno	inf	/Linux/386/bin/emu
+			emu.new	0775	inferno	inferno	/Linux/386/bin/emu
 			0a
 			0c
 			0l
diff --git a/lib/proto/Irix b/lib/proto/Irix
index 074c3b08..4f991c48 100644
--- a/lib/proto/Irix
+++ b/lib/proto/Irix
@@ -1,7 +1,7 @@
 Irix
 	mips
 		bin
-			emu.new	0775	inferno	inf	/Irix/mips/bin/emu
+			emu.new	0775	inferno	inferno	/Irix/mips/bin/emu
 			0a
 			0c
 			0l
diff --git a/lib/proto/Linux b/lib/proto/Linux
index a6ac4b8b..c2344974 100644
--- a/lib/proto/Linux
+++ b/lib/proto/Linux
@@ -1,7 +1,7 @@
 Linux
 	386
 		bin
-			emu.new	0775	inferno	inf	/Linux/386/bin/emu
+			emu.new	0775	inferno	inferno	/Linux/386/bin/emu
 			asm
 			iar
 			data2c
@@ -11,8 +11,14 @@ Linux
 
 			limbo
 			mk
+			mkext
 			ndate
 			yacc
 		include
 			+
 		lib
+	arm
+		bin
+		include
+			+
+		lib
diff --git a/lib/proto/MacOSX b/lib/proto/MacOSX
index 920deb23..5162298d 100644
--- a/lib/proto/MacOSX
+++ b/lib/proto/MacOSX
@@ -2,7 +2,7 @@ MacOSX
 	README
 	power
 		bin
-			emu.new	0775	inferno	inf	/MacOSX/power/bin/emu
+			emu.new	0775	inferno	inferno	/MacOSX/power/bin/emu
 			asm
 			iar
 			data2c
@@ -12,6 +12,7 @@ MacOSX
 
 			limbo
 			mk
+			mkext
 			ms2
 			ndate
 			inm
@@ -22,3 +23,25 @@ MacOSX
 			+
 		lib
 	tcshrc
+	386
+		bin
+			emu.new	0775	inferno	inferno	/MacOSX/386/bin/emu
+			asm
+			iar
+			data2c
+			data2s
+			ksize
+			kstrip
+
+			limbo
+			mk
+			mkext
+			ms2
+			ndate
+			inm
+			sqz
+			srclist
+			yacc
+		include
+			+
+		lib
diff --git a/lib/proto/Nt b/lib/proto/Nt
index 03097920..03a7b101 100644
--- a/lib/proto/Nt
+++ b/lib/proto/Nt
@@ -1,7 +1,7 @@
 Nt
 	386
 		bin
-			emu.new	0775	inferno	inf	/Nt/386/bin/emu.exe
+			emu.new	0775	inferno	inferno	/Nt/386/bin/emu.exe
 			ie.exe
 			0a.exe
 			0c.exe
diff --git a/lib/proto/Plan9 b/lib/proto/Plan9
index fb421bb9..7fd8ae74 100644
--- a/lib/proto/Plan9
+++ b/lib/proto/Plan9
@@ -1,7 +1,7 @@
 Plan9
 	386
 		bin
-			emu.new	775	inferno	inf	/Plan9/386/bin/emu
+			emu.new	775	inferno	inferno	/Plan9/386/bin/emu
 			5a
 			5c
 			5l
diff --git a/lib/proto/Solaris b/lib/proto/Solaris
index 3d7a14ed..24d0f8ba 100644
--- a/lib/proto/Solaris
+++ b/lib/proto/Solaris
@@ -1,7 +1,7 @@
 Solaris
 	sparc
 		bin
-			emu.new	0775	inferno	inf	/Solaris/sparc/bin/emu
+			emu.new	0775	inferno	inferno	/Solaris/sparc/bin/emu
 			0a
 			0c
 			0l
diff --git a/lib/proto/inferno b/lib/proto/inferno
index e11dfd0b..2dff9d00 100644
--- a/lib/proto/inferno
+++ b/lib/proto/inferno
@@ -339,6 +339,7 @@ appl
 		9export.b
 		9srvfs.b
 		B.b
+		ar.b
 		archfs.b
 		auplay.b
 		auth
@@ -390,6 +391,7 @@ appl
 		cal.b
 		cat.b
 		cd.b
+		cddb.b
 		chgrp.b
 		chmod.b
 		cleanname.b
@@ -593,10 +595,10 @@ appl
 		lockfs.b
 		logfile.b
 		look.b
-		lookman.b
 		ls.b
 		lstar.b
 		man.b
+		man2html.b
 		man2txt.b
 		manufacture.b
 		mash
@@ -708,7 +710,6 @@ appl
 			test.b
 			tk.b
 		sha1sum.b
-		shutdown.b
 		sleep.b
 		sort.b
 		spki
@@ -894,6 +895,7 @@ appl
 			ssl3.b
 			sslsession.b
 			x509.b
+		csv.b
 		daytime.b
 		db.b
 		dbm.b
@@ -993,6 +995,7 @@ appl
 		regex.b
 		regexutils.b
 		registries.b
+		rfc822.b
 		riff.b
 		secstore.b
 		scoretable.b
@@ -1062,6 +1065,7 @@ appl
 		w3c
 			css.b
 			mkfile
+			uris.b
 			xpointers.b
 		wait.b
 		watchvars.b
@@ -1387,6 +1391,7 @@ dis
 	9export.dis
 	9srvfs.dis
 	9win.dis
+	ar.dis
 	archfs.dis
 	B.dis
 	acme
@@ -1408,6 +1413,7 @@ dis
 	cal.dis
 	cat.dis
 	cd.dis
+	cddb.dis
 	charon
 		+
 	charon.dis
@@ -1497,6 +1503,7 @@ dis
 		crc.dis
 		crypt
 			+
+		csv.dis
 		daytime.dis
 		db.dis
 		dbm.dis
@@ -1578,6 +1585,7 @@ dis
 		regex.dis
 		regexutils.dis
 		registries.dis
+		rfc822.dis
 		riff.dis
 		secstore.dis
 		scoretable.dis
@@ -1647,10 +1655,11 @@ dis
 	lockfs.dis
 	logfile.dis
 	look.dis
-	lookman.dis
+	lookman
 	ls.dis
 	lstar.dis
 	man.dis
+	man2html.dis
 	man2txt.dis
 	mash.dis
 	math
@@ -1708,7 +1717,7 @@ dis
 		+
 	sh.dis
 	sha1sum.dis
-	shutdown.dis
+	shutdown
 	sleep.dis
 	sort.dis
 	spki
@@ -1881,6 +1890,9 @@ lib
 	lego
 		*
 	mashinit
+	mimetype
+	mk
+		*
 	ndb
 		common
 		dns	664	inferno inferno /lib/ndb/dns.dist
@@ -2050,6 +2062,7 @@ module
 	convcs.m
 	crc.m
 	css.m
+	csv.m
 	cvsimages.m
 	daytime.m
 	db.m
@@ -2094,6 +2107,7 @@ module
 		srvbrowse.m
 	hash.m
 	html.m
+	ida.m
 	imagefile.m
 	inflate.m
 	ip.m
@@ -2135,6 +2149,7 @@ module
 	regex.m
 	regexutils.m
 	registries.m
+	rfc822.m
 	riff.m
 	runt.m
 	scoretable.m
@@ -2173,6 +2188,7 @@ module
 	translate.m
 	ubfa.m
 	unbundle.m
+	uris.m
 	url.m
 	usb.m
 	venti.m
diff --git a/lib/proto/utils b/lib/proto/utils
index 380464a0..9decb6b6 100644
--- a/lib/proto/utils
+++ b/lib/proto/utils
@@ -39,7 +39,9 @@ lib9
 	getcallerpc-Hp-s800.s
 	getcallerpc-Irix-mips.s
 	getcallerpc-Linux-386.S
+	getcallerpc-Linux-arm.S
 	getcallerpc-MacOSX-power.s
+	getcallerpc-MacOSX-386.s
 	getcallerpc-Solaris-386.s
 	getcallerpc-Solaris-sparc.s
 	getcallerpc-Unixware-386.s
@@ -399,6 +401,9 @@ utils
 	cp
 		cp.c
 		mkfile
+	cvbit
+		cvbit.c
+		mkfile
 	data2c
 		data2c.c
 		mkfile