Plan 9 from Bell Labs 2008-12-02

dist/replica/_plan9.db

@@ -1312,7 +1312,7 @@ lib/face/48x48x2/x - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/y - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/z - 20000000775 sys sys 1020895710 0
 lib/face/48x48x4 - 20000000775 sys sys 1123100641 0
-lib/face/48x48x4/.dict - 664 sys sys 1212252650 3637
+lib/face/48x48x4/.dict - 664 sys sys 1228159989 3676
 lib/face/48x48x4/Z - 20000000775 sys sys 1020895710 0
 lib/face/48x48x4/a - 20000000775 sys sys 1056984105 0
 lib/face/48x48x4/a/adb.1 - 664 sys sys 944941890 962
@@ -5525,7 +5525,7 @@ rc/bin/delkey - 775 sys sys 1109429137 643
 rc/bin/dial - 20000000775 sys sys 1059180057 0
 rc/bin/diffy - 775 sys sys 1140694870 277
 rc/bin/dircp - 775 sys sys 1217181481 197
-rc/bin/diskparts - 775 sys sys 1213893784 1066
+rc/bin/diskparts - 775 sys sys 1228159887 1066
 rc/bin/dmaon - 775 sys sys 1205288448 220
 rc/bin/doc2ps - 775 sys sys 1205813503 338
 rc/bin/doc2txt - 775 sys sys 1025197880 563
@@ -5860,7 +5860,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1227908087 271448
+sys/games/lib/fortunes - 664 sys sys 1228152245 271629
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -6034,7 +6034,7 @@ sys/games/lib/sudoku/images/7.bit - 664 sys sys 1117226542 403
 sys/games/lib/sudoku/images/8.bit - 664 sys sys 1117226542 528
 sys/games/lib/sudoku/images/9.bit - 664 sys sys 1117226542 537
 sys/include - 20000000775 sys sys 1193775454 0
-sys/include/9p.h - 664 sys sys 1134337548 4759
+sys/include/9p.h - 664 sys sys 1228164706 4802
 sys/include/String.h - 664 sys sys 1091904425 1319
 sys/include/a.out.h - 664 sys sys 1178892101 1473
 sys/include/ape - 20000000775 sys sys 1070327361 0
@@ -12527,7 +12527,7 @@ sys/src/cmd/ip/httpd/classify.c - 664 sys sys 1078840017 9665
 sys/src/cmd/ip/httpd/content.c - 664 sys sys 1015090170 3140
 sys/src/cmd/ip/httpd/emem.c - 664 sys sys 984773807 278
 sys/src/cmd/ip/httpd/hints.c - 664 sys sys 1143759344 6282
-sys/src/cmd/ip/httpd/httpd.c - 664 sys sys 1227053843 12086
+sys/src/cmd/ip/httpd/httpd.c - 664 sys sys 1228159735 12152
 sys/src/cmd/ip/httpd/httpsrv.h - 664 sys sys 1227053815 1802
 sys/src/cmd/ip/httpd/imagemap.c - 664 sys sys 984773808 5229
 sys/src/cmd/ip/httpd/init.c - 664 sys sys 1015090171 2182
@@ -14360,7 +14360,7 @@ sys/src/cmd/vc/swt.c - 664 sys sys 1143384791 10367
 sys/src/cmd/vc/txt.c - 664 sys sys 1168702346 22737
 sys/src/cmd/vc/v.out.h - 664 sys sys 1089299165 2630
 sys/src/cmd/venti - 20000000775 sys sys 1208985020 0
-sys/src/cmd/venti/copy.c - 664 sys sys 1193773646 5198
+sys/src/cmd/venti/copy.c - 664 sys sys 1228159676 5205
 sys/src/cmd/venti/devnull.c - 664 sys sys 1177189434 1225
 sys/src/cmd/venti/mkfile - 664 sys sys 1193773294 432
 sys/src/cmd/venti/mkroot.c - 664 sys sys 1177189435 1178
@@ -15889,3 +15889,6 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1020896385 0
+386/bin/venti/copy - 775 sys sys 1228190946 138029
+386/bin/ip/httpd/httpd - 775 sys sys 1228190946 298453
+386/lib/lib9p.a - 664 sys sys 1228190946 91992

dist/replica/plan9.db

@@ -299,7 +299,7 @@
 386/bin/ip/gping - 775 sys sys 1210392772 182372
 386/bin/ip/hogports - 775 sys sys 1148500655 42914
 386/bin/ip/httpd - 20000000775 sys sys 1068385801 0
-386/bin/ip/httpd/httpd - 775 sys sys 1227384558 298281
+386/bin/ip/httpd/httpd - 775 sys sys 1228190946 298453
 386/bin/ip/httpd/imagemap - 775 sys sys 1209614361 116331
 386/bin/ip/httpd/man2html - 775 sys sys 1209614364 124885
 386/bin/ip/httpd/netlib_find - 775 sys sys 1209614367 117179
@@ -507,7 +507,7 @@
 386/bin/venti/checkindex - 775 sys sys 1224558579 256635
 386/bin/venti/clumpstats - 775 sys sys 1224558579 245571
 386/bin/venti/conf - 775 sys sys 1189362423 1505
-386/bin/venti/copy - 775 sys sys 1214510208 138019
+386/bin/venti/copy - 775 sys sys 1228190946 138029
 386/bin/venti/findscore - 775 sys sys 1224558579 247599
 386/bin/venti/fixarenas - 775 sys sys 1224558580 212878
 386/bin/venti/fmtarenas - 775 sys sys 1224558580 247840
@@ -565,7 +565,7 @@
 386/lib/ape/libregexp.a - 664 sys sys 1212377638 47500
 386/lib/ape/libutf.a - 664 sys sys 1212377640 88500
 386/lib/ape/libv.a - 664 sys sys 1219693465 19334
-386/lib/lib9p.a - 664 sys sys 1209184390 91992
+386/lib/lib9p.a - 664 sys sys 1228190946 91992
 386/lib/libString.a - 664 sys sys 1209184391 22466
 386/lib/libauth.a - 664 sys sys 1214418439 59742
 386/lib/libauthsrv.a - 664 sys sys 1209439929 36740
@@ -1312,7 +1312,7 @@ lib/face/48x48x2/x - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/y - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/z - 20000000775 sys sys 1020895710 0
 lib/face/48x48x4 - 20000000775 sys sys 1123100641 0
-lib/face/48x48x4/.dict - 664 sys sys 1212252650 3637
+lib/face/48x48x4/.dict - 664 sys sys 1228159989 3676
 lib/face/48x48x4/Z - 20000000775 sys sys 1020895710 0
 lib/face/48x48x4/a - 20000000775 sys sys 1056984105 0
 lib/face/48x48x4/a/adb.1 - 664 sys sys 944941890 962
@@ -5525,7 +5525,7 @@ rc/bin/delkey - 775 sys sys 1109429137 643
 rc/bin/dial - 20000000775 sys sys 1059180057 0
 rc/bin/diffy - 775 sys sys 1140694870 277
 rc/bin/dircp - 775 sys sys 1217181481 197
-rc/bin/diskparts - 775 sys sys 1213893784 1066
+rc/bin/diskparts - 775 sys sys 1228159887 1066
 rc/bin/dmaon - 775 sys sys 1205288448 220
 rc/bin/doc2ps - 775 sys sys 1205813503 338
 rc/bin/doc2txt - 775 sys sys 1025197880 563
@@ -5860,7 +5860,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1227908087 271448
+sys/games/lib/fortunes - 664 sys sys 1228152245 271629
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -6034,7 +6034,7 @@ sys/games/lib/sudoku/images/7.bit - 664 sys sys 1117226542 403
 sys/games/lib/sudoku/images/8.bit - 664 sys sys 1117226542 528
 sys/games/lib/sudoku/images/9.bit - 664 sys sys 1117226542 537
 sys/include - 20000000775 sys sys 1193775454 0
-sys/include/9p.h - 664 sys sys 1134337548 4759
+sys/include/9p.h - 664 sys sys 1228164706 4802
 sys/include/String.h - 664 sys sys 1091904425 1319
 sys/include/a.out.h - 664 sys sys 1178892101 1473
 sys/include/ape - 20000000775 sys sys 1070327361 0
@@ -12527,7 +12527,7 @@ sys/src/cmd/ip/httpd/classify.c - 664 sys sys 1078840017 9665
 sys/src/cmd/ip/httpd/content.c - 664 sys sys 1015090170 3140
 sys/src/cmd/ip/httpd/emem.c - 664 sys sys 984773807 278
 sys/src/cmd/ip/httpd/hints.c - 664 sys sys 1143759344 6282
-sys/src/cmd/ip/httpd/httpd.c - 664 sys sys 1227053843 12086
+sys/src/cmd/ip/httpd/httpd.c - 664 sys sys 1228159735 12152
 sys/src/cmd/ip/httpd/httpsrv.h - 664 sys sys 1227053815 1802
 sys/src/cmd/ip/httpd/imagemap.c - 664 sys sys 984773808 5229
 sys/src/cmd/ip/httpd/init.c - 664 sys sys 1015090171 2182
@@ -14360,7 +14360,7 @@ sys/src/cmd/vc/swt.c - 664 sys sys 1143384791 10367
 sys/src/cmd/vc/txt.c - 664 sys sys 1168702346 22737
 sys/src/cmd/vc/v.out.h - 664 sys sys 1089299165 2630
 sys/src/cmd/venti - 20000000775 sys sys 1208985020 0
-sys/src/cmd/venti/copy.c - 664 sys sys 1193773646 5198
+sys/src/cmd/venti/copy.c - 664 sys sys 1228159676 5205
 sys/src/cmd/venti/devnull.c - 664 sys sys 1177189434 1225
 sys/src/cmd/venti/mkfile - 664 sys sys 1193773294 432
 sys/src/cmd/venti/mkroot.c - 664 sys sys 1177189435 1178

dist/replica/plan9.log

@@ -36300,3 +36300,12 @@
 1227817804 0 c 386/bin/exportfs - 775 sys sys 1227816569 162235
 1227909604 0 c sys/games/lib/fortunes - 664 sys sys 1227908087 271448
 1228075204 0 c sys/man/2/graphics - 664 sys sys 1228074051 12764
+1228152603 0 c sys/games/lib/fortunes - 664 sys sys 1228152245 271629
+1228159803 0 c sys/src/cmd/ip/httpd/httpd.c - 664 sys sys 1228159735 12152
+1228159803 1 c sys/src/cmd/venti/copy.c - 664 sys sys 1228159676 5205
+1228161605 0 c lib/face/48x48x4/.dict - 664 sys sys 1228159989 3676
+1228161605 1 c rc/bin/diskparts - 775 sys sys 1228159887 1066
+1228165204 0 c sys/include/9p.h - 664 sys sys 1228164706 4802
+1228192204 0 c 386/bin/venti/copy - 775 sys sys 1228190946 138029
+1228192204 1 c 386/bin/ip/httpd/httpd - 775 sys sys 1228190946 298453
+1228192204 2 c 386/lib/lib9p.a - 664 sys sys 1228190946 91992

lib/face/48x48x4/.dict

@@ -7,6 +7,7 @@ alcatel-lucent.com/ehg e/ehg.1
 alcatel-lucent.com/jmk j/jmk.1
 alcatel-lucent.com/ram r/ram.1
 alcatel-lucent.com/sjf s/sjf.1
+alcatel-lucent.com/smullender s/sape.1
 alcatel-lucent.com/trickey h/howard.1
 amazon.com.uk/unkown u/book.1
 amazon.com/unkown u/book.1

rc/bin/diskparts

@@ -2,7 +2,7 @@
 # set up any disk partitions
 rfork e
 if (! test -e /dev/sdctl)
-	bind -a '#S' /dev
+	bind -b '#S' /dev
 
 # set up any /dev/sd partitions.
 # note that really big disks (e.g., aoe devices) may have no mbr
@@ -27,7 +27,7 @@ sysname=`{cat /dev/sysname}
 
 # set up any fs(3) partitions
 if (! test -e /dev/fs/ctl && test -e '#k/fs')
-	bind -a '#k' /dev
+	bind -b '#k' /dev
 if (~ $#sysname 1 && ! ~ $sysname '' &&
     test -r /cfg/$sysname/fsconfig && test -w /dev/fs/ctl)
 	read -m /cfg/$sysname/fsconfig >/dev/fs/ctl

sys/games/lib/fortunes

@@ -4246,3 +4246,4 @@ Sorry but there is no description for this item ... (more)
 The problem is there's no data to fake yet. - Noah Evans
 `You could pound nails with [the Motorola StarTAC] and it still worked.  This phone is like that: you could set it on fire, and you'd still get your e-mail.'
 Cookies! Thanks NFS Anonymous Access User!
+Closing this window will terminate the running processes: login, bash, acme, acme, devdraw, 9pserve, win, win, win, win, win, win, win, win, win, win, win, win, win, win, win, win.

sys/include/9p.h

@@ -223,6 +223,7 @@ int		chatty9p;
 void		respond(Req*, char*);
 void		responderror(Req*);
 void		threadpostmountsrv(Srv*, char*, char*, int);
+void		threadlistensrv(Srv *s, char *addr);
 
 /*
  * Helper.  Assumes user is same as group.

sys/src/cmd/ip/httpd/httpd.c

@@ -38,7 +38,8 @@ PEMChain *certchain;
 void
 usage(void)
 {
-	fprint(2, "usage: httpd [-c certificate] [-C CAchain] [-a srvaddress] [-d domain] [-n namespace] [-w webroot]\n");
+	fprint(2, "usage: httpd [-c certificate] [-C CAchain] [-a srvaddress] "
+		"[-d domain] [-n namespace] [-w webroot]\n");
 	exits("usage");
 }
 
@@ -56,26 +57,26 @@ main(int argc, char **argv)
 	fmtinstall('U', hurlfmt);
 	ARGBEGIN{
 	case 'c':
-		certificate = readcert(ARGF(), &certlen);
+		certificate = readcert(EARGF(usage()), &certlen);
 		if(certificate == nil)
 			sysfatal("reading certificate: %r");
 		break;
 	case 'C':
-		certchain = readcertchain(ARGF());
+		certchain = readcertchain(EARGF(usage()));
 		if (certchain == nil)
 			sysfatal("reading certificate chain: %r");
 		break;
 	case 'n':
-		namespace = ARGF();
+		namespace = EARGF(usage());
 		break;
 	case 'a':
-		address = ARGF();
+		address = EARGF(usage());
 		break;
 	case 'd':
-		hmydomain = ARGF();
+		hmydomain = EARGF(usage());
 		break;
 	case 'w':
-		webroot = ARGF();
+		webroot = EARGF(usage());
 		break;
 	default:
 		usage();
@@ -292,6 +293,7 @@ doreq(HConnect *c)
 	 */
 	uri = c->req.uri;
 	nredirect = 0;
+	werrstr("");
 top:
 	if(++nredirect > 10){
 		if(hparseheaders(c, 15*60*1000) < 0)
@@ -324,21 +326,22 @@ top:
 		newuri = redirect(c, origuri, &flags);
 
 	if(newuri != nil){
-		if(flags & Redirperm) {
-			logit(c, "%s: permanently moved to %s", origuri, newuri);
-			return hmoved(c, newuri);
-		} else if(flags & Redirsilent) {
+		if(flags & Redirsilent) {
 			c->req.uri = uri = newuri;
 			logit(c, "%s: silent replacement %s", origuri, uri);
 			goto top;
+		}
+		if(hparseheaders(c, 15*60*1000) < 0)
+			exits("failed");
+		if(flags & Redirperm) {
+			logit(c, "%s: permanently moved to %s", origuri, newuri);
+			return hmoved(c, newuri);
 		} else if (flags & (Redironly | Redirsubord))
 			logit(c, "%s: top-level or many-to-one replacement %s",
 				origuri, uri);
 
-		if(hparseheaders(c, 15*60*1000) < 0)
-			exits("failed");
 		/*
-		 * try temporary redirect instead of permanent,
+		 * try temporary redirect instead of permanent
 		 */
 		if (http11(c))
 			return hredirected(c, "307 Temporary Redirect", newuri);
@@ -361,7 +364,8 @@ magic:
 			return -1;
 		}
 		hp = c->private;
-		execl(c->xferbuf, magic, "-d", hmydomain, "-w", webroot, "-r", hp->remotesys, "-N", netdir, "-b", hb,
+		execl(c->xferbuf, magic, "-d", hmydomain, "-w", webroot,
+			"-r", hp->remotesys, "-N", netdir, "-b", hb,
 			"-L", logfd0, logfd1, "-R", c->header,
 			c->req.meth, vers, uri, c->req.search, nil);
 		logit(c, "no magic %s uri %s", magic, uri);

sys/src/cmd/venti/copy.c

@@ -71,7 +71,7 @@ markvisited(uchar score[VtScoreSize], int type)
 void
 usage(void)
 {
-	fprint(2, "usage: copy [-fir] [-t type] srchost dsthost score\n");
+	fprint(2, "usage: %s [-fimrv] [-t type] srchost dsthost score\n", argv0);
 	exits("usage");
 }