Browse Source

Plan 9 from Bell Labs 2005-09-24

David du Colombier 16 years ago
parent
commit
faeb0b2328

+ 30 - 24
dist/replica/_plan9.db

@@ -19,7 +19,7 @@
 386/bin/8l - 775 sys sys 1125345940 115694
 386/bin/9660srv - 775 sys sys 1115950023 104037
 386/bin/aan - 775 sys sys 1115950023 130710
-386/bin/acid - 775 sys sys 1127360557 390191
+386/bin/acid - 775 sys sys 1127445048 390487
 386/bin/acme - 775 sys sys 1125345943 428545
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1127360557 132862
@@ -79,7 +79,7 @@
 386/bin/auth/warning - 775 sys sys 1125345952 99558
 386/bin/auth/wrkey - 775 sys sys 1117249745 75165
 386/bin/aux - 20000000775 sys sys 1016920817 0
-386/bin/aux/9pcon - 775 sys sys 1125345953 94916
+386/bin/aux/9pcon - 775 sys sys 1127445048 94916
 386/bin/aux/LOCK - 775 sys sys 1115950037 59908
 386/bin/aux/X509gen - 775 sys sys 1048341826 129186
 386/bin/aux/accupoint - 775 sys sys 1115950037 40059
@@ -171,7 +171,7 @@
 386/bin/cal - 775 sys sys 1125345963 67877
 386/bin/calendar - 775 sys sys 1125345963 80212
 386/bin/cat - 775 sys sys 1115950056 37447
-386/bin/cb - 775 sys sys 1125345963 77510
+386/bin/cb - 775 sys sys 1127445048 77589
 386/bin/cdfs - 775 sys sys 1126321689 161177
 386/bin/cfs - 775 sys sys 1115950056 128067
 386/bin/chgrp - 775 sys sys 1115950056 59285
@@ -275,7 +275,7 @@
 386/bin/iconv - 775 sys sys 1115950080 113265
 386/bin/idiff - 775 sys sys 1125345981 76103
 386/bin/import - 775 sys sys 1125345982 100290
-386/bin/iostats - 775 sys sys 1115950081 97978
+386/bin/iostats - 775 sys sys 1127445049 98431
 386/bin/ip - 20000000775 sys sys 1016920851 0
 386/bin/ip/dhcpclient - 775 sys sys 1116126317 94096
 386/bin/ip/dhcpd - 775 sys sys 1125345983 149123
@@ -331,10 +331,10 @@
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1125345996 149228
 386/bin/ndb/csquery - 775 sys sys 1125345996 61467
-386/bin/ndb/dns - 775 sys sys 1125345997 220081
-386/bin/ndb/dnsdebug - 775 sys sys 1125345998 194693
+386/bin/ndb/dns - 775 sys sys 1127445050 245101
+386/bin/ndb/dnsdebug - 775 sys sys 1127445050 219717
 386/bin/ndb/dnsquery - 775 sys sys 1125345998 63634
-386/bin/ndb/dnstcp - 775 sys sys 1125345999 193334
+386/bin/ndb/dnstcp - 775 sys sys 1127445050 218358
 386/bin/ndb/ipquery - 775 sys sys 1125345999 95479
 386/bin/ndb/mkdb - 775 sys sys 1125345999 63973
 386/bin/ndb/mkhash - 775 sys sys 1125346000 83908
@@ -366,7 +366,7 @@
 386/bin/proof - 775 sys sys 1125346007 178401
 386/bin/ps - 775 sys sys 1125346007 67985
 386/bin/pwd - 775 sys sys 1115950105 36897
-386/bin/ramfs - 775 sys sys 1126062687 89789
+386/bin/ramfs - 775 sys sys 1127445051 89822
 386/bin/rc - 775 sys sys 1119496655 143226
 386/bin/rdbfs - 775 sys sys 1125346008 168500
 386/bin/read - 775 sys sys 1115950106 58046
@@ -461,7 +461,7 @@
 386/bin/upas/runq - 775 sys sys 1125346030 113769
 386/bin/upas/scanmail - 775 sys sys 1125346031 129036
 386/bin/upas/send - 775 sys sys 1125346032 191814
-386/bin/upas/smtp - 775 sys sys 1127360611 275075
+386/bin/upas/smtp - 775 sys sys 1127445051 275242
 386/bin/upas/smtpd - 775 sys sys 1127360612 330126
 386/bin/upas/spam - 775 sys sys 1064598366 36
 386/bin/upas/testscan - 775 sys sys 1125346034 83659
@@ -497,7 +497,7 @@
 386/bin/venti/write - 775 sys sys 1115950140 102499
 386/bin/vncs - 775 sys sys 1127360614 472425
 386/bin/vncv - 775 sys sys 1127360615 519249
-386/bin/vt - 775 sys sys 1125346038 173655
+386/bin/vt - 775 sys sys 1127445052 173660
 386/bin/vtdump - 775 sys sys 1125346038 159458
 386/bin/wc - 775 sys sys 1115950143 41156
 386/bin/webcookies - 775 sys sys 1125346039 161625
@@ -12027,9 +12027,9 @@ sys/src/cmd/ip/snoopy/rtcp.c - 664 sys sys 1089389638 1958
 sys/src/cmd/ip/snoopy/rtp.c - 664 sys sys 1089389638 1160
 sys/src/cmd/ip/snoopy/tcp.c - 664 sys sys 1055699196 3593
 sys/src/cmd/ip/snoopy/udp.c - 664 sys sys 1089299190 1990
-sys/src/cmd/ip/telnet.c - 664 sys sys 1121977161 8581
+sys/src/cmd/ip/telnet.c - 664 sys sys 1127523945 8573
 sys/src/cmd/ip/telnet.h - 664 sys sys 1015090250 5902
-sys/src/cmd/ip/telnetd.c - 664 sys sys 1121977161 11733
+sys/src/cmd/ip/telnetd.c - 664 sys sys 1127523098 11721
 sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
 sys/src/cmd/ip/traceroute.c - 664 sys sys 1032060124 9370
 sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
@@ -13284,7 +13284,7 @@ sys/src/cmd/unix/u9fs/utfrune.c - 664 sys sys 1015092354 387
 sys/src/cmd/unix/winplumb.c - 664 sys sys 1047233509 5015
 sys/src/cmd/unix/winplumb.exe - 664 sys sys 1047233509 32768
 sys/src/cmd/unix/winstart - 775 sys sys 1047233540 60
-sys/src/cmd/unlnfs.c - 664 sys sys 1107435471 1949
+sys/src/cmd/unlnfs.c - 664 sys sys 1127525524 1914
 sys/src/cmd/unmount.c - 664 sys sys 1014926615 442
 sys/src/cmd/upas - 20000000775 sys sys 1018549518 0
 sys/src/cmd/upas/README - 664 sys sys 944961329 1041
@@ -13541,7 +13541,7 @@ sys/src/cmd/venti/syncindex.c - 664 sys sys 1055707433 983
 sys/src/cmd/venti/syncindex0.c - 664 sys sys 1036470283 3044
 sys/src/cmd/venti/unittoull.c - 664 sys sys 1019678881 398
 sys/src/cmd/venti/unwhack.c - 664 sys sys 1019678881 3191
-sys/src/cmd/venti/utils.c - 664 sys sys 1072816049 4528
+sys/src/cmd/venti/utils.c - 664 sys sys 1127527222 4002
 sys/src/cmd/venti/venti.c - 664 sys sys 1069101830 4626
 sys/src/cmd/venti/venti.conf - 664 sys sys 1019867537 397
 sys/src/cmd/venti/ventifs.c - 664 sys sys 1063854129 6157
@@ -14967,13 +14967,19 @@ 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 1018802620 0
-386/bin/acid - 775 sys sys 1127445048 390487
-386/bin/iostats - 775 sys sys 1127445049 98431
-386/bin/ramfs - 775 sys sys 1127445051 89822
-386/bin/aux/9pcon - 775 sys sys 1127445048 94916
-386/bin/cb - 775 sys sys 1127445048 77589
-386/bin/ndb/dns - 775 sys sys 1127445050 245101
-386/bin/ndb/dnsdebug - 775 sys sys 1127445050 219717
-386/bin/ndb/dnstcp - 775 sys sys 1127445050 218358
-386/bin/upas/smtp - 775 sys sys 1127445051 275242
-386/bin/vt - 775 sys sys 1127445052 173660
+386/bin/venti/buildindex - 775 sys sys 1127531311 154143
+386/bin/venti/checkarenas - 775 sys sys 1127531311 158386
+386/bin/venti/checkindex - 775 sys sys 1127531312 154989
+386/bin/venti/clumpstats - 775 sys sys 1127531312 145175
+386/bin/venti/findscore - 775 sys sys 1127531312 127626
+386/bin/venti/fmtarenas - 775 sys sys 1127531312 128628
+386/bin/venti/fmtindex - 775 sys sys 1127531313 145437
+386/bin/venti/fmtisect - 775 sys sys 1127531313 145179
+386/bin/venti/rdarena - 775 sys sys 1127531313 127094
+386/bin/venti/syncindex - 775 sys sys 1127531314 169425
+386/bin/venti/venti - 775 sys sys 1127531314 245157
+386/bin/venti/verifyarena - 775 sys sys 1127531315 103977
+386/bin/venti/wrarena - 775 sys sys 1127531315 175882
+386/bin/ip/telnetd - 775 sys sys 1127531310 121988
+386/bin/telnet - 775 sys sys 1127531310 80355
+386/bin/unlnfs - 775 sys sys 1127531310 71353

+ 20 - 20
dist/replica/plan9.db

@@ -304,7 +304,7 @@
 386/bin/ip/rexexec - 775 sys sys 1125345991 88894
 386/bin/ip/rip - 775 sys sys 1125345991 91223
 386/bin/ip/rlogind - 775 sys sys 1115950088 67402
-386/bin/ip/telnetd - 775 sys sys 1125345991 121983
+386/bin/ip/telnetd - 775 sys sys 1127531310 121988
 386/bin/ip/tftpd - 775 sys sys 1125345992 129480
 386/bin/ip/traceroute - 775 sys sys 1115950089 73497
 386/bin/ip/udpecho - 775 sys sys 1115950089 43159
@@ -417,7 +417,7 @@
 386/bin/tcs - 775 sys sys 1125544176 256580
 386/bin/tee - 775 sys sys 1115950118 38428
 386/bin/telco - 775 sys sys 1115950118 103315
-386/bin/telnet - 775 sys sys 1125346017 80355
+386/bin/telnet - 775 sys sys 1127531310 80355
 386/bin/test - 775 sys sys 1115950119 69853
 386/bin/time - 775 sys sys 1115950119 61386
 386/bin/tlsclient - 775 sys sys 1127360607 198402
@@ -436,7 +436,7 @@
 386/bin/unicode - 775 sys sys 1125346023 62514
 386/bin/uniq - 775 sys sys 1125346023 61891
 386/bin/units - 775 sys sys 1125346023 75241
-386/bin/unlnfs - 775 sys sys 1125346023 71353
+386/bin/unlnfs - 775 sys sys 1127531310 71353
 386/bin/unmount - 775 sys sys 1115950124 36611
 386/bin/unzip - 775 sys sys 1125346024 89962
 386/bin/upas - 20000000775 sys sys 1016857390 0
@@ -477,23 +477,23 @@
 386/bin/vac - 775 sys sys 1119496664 169408
 386/bin/vacfs - 775 sys sys 1119496664 174882
 386/bin/venti - 20000000775 sys sys 947360466 0
-386/bin/venti/buildindex - 775 sys sys 1119496665 154436
-386/bin/venti/checkarenas - 775 sys sys 1115950135 158679
-386/bin/venti/checkindex - 775 sys sys 1119496665 155282
-386/bin/venti/clumpstats - 775 sys sys 1115950135 145468
+386/bin/venti/buildindex - 775 sys sys 1127531311 154143
+386/bin/venti/checkarenas - 775 sys sys 1127531311 158386
+386/bin/venti/checkindex - 775 sys sys 1127531312 154989
+386/bin/venti/clumpstats - 775 sys sys 1127531312 145175
 386/bin/venti/conf - 775 sys sys 1056364399 1506
 386/bin/venti/copy - 775 sys sys 1115950136 106082
-386/bin/venti/findscore - 775 sys sys 1122088325 127919
-386/bin/venti/fmtarenas - 775 sys sys 1115950136 128921
-386/bin/venti/fmtindex - 775 sys sys 1115950137 145730
-386/bin/venti/fmtisect - 775 sys sys 1115950137 145472
-386/bin/venti/rdarena - 775 sys sys 1115950137 127387
+386/bin/venti/findscore - 775 sys sys 1127531312 127626
+386/bin/venti/fmtarenas - 775 sys sys 1127531312 128628
+386/bin/venti/fmtindex - 775 sys sys 1127531313 145437
+386/bin/venti/fmtisect - 775 sys sys 1127531313 145179
+386/bin/venti/rdarena - 775 sys sys 1127531313 127094
 386/bin/venti/read - 775 sys sys 1115950138 102547
 386/bin/venti/sync - 775 sys sys 1115950138 101697
-386/bin/venti/syncindex - 775 sys sys 1115950138 169718
-386/bin/venti/venti - 775 sys sys 1115950139 245450
-386/bin/venti/verifyarena - 775 sys sys 1115950139 104270
-386/bin/venti/wrarena - 775 sys sys 1115950140 176179
+386/bin/venti/syncindex - 775 sys sys 1127531314 169425
+386/bin/venti/venti - 775 sys sys 1127531314 245157
+386/bin/venti/verifyarena - 775 sys sys 1127531315 103977
+386/bin/venti/wrarena - 775 sys sys 1127531315 175882
 386/bin/venti/write - 775 sys sys 1115950140 102499
 386/bin/vncs - 775 sys sys 1127360614 472425
 386/bin/vncv - 775 sys sys 1127360615 519249
@@ -12027,9 +12027,9 @@ sys/src/cmd/ip/snoopy/rtcp.c - 664 sys sys 1089389638 1958
 sys/src/cmd/ip/snoopy/rtp.c - 664 sys sys 1089389638 1160
 sys/src/cmd/ip/snoopy/tcp.c - 664 sys sys 1055699196 3593
 sys/src/cmd/ip/snoopy/udp.c - 664 sys sys 1089299190 1990
-sys/src/cmd/ip/telnet.c - 664 sys sys 1121977161 8581
+sys/src/cmd/ip/telnet.c - 664 sys sys 1127523945 8573
 sys/src/cmd/ip/telnet.h - 664 sys sys 1015090250 5902
-sys/src/cmd/ip/telnetd.c - 664 sys sys 1121977161 11733
+sys/src/cmd/ip/telnetd.c - 664 sys sys 1127523098 11721
 sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
 sys/src/cmd/ip/traceroute.c - 664 sys sys 1032060124 9370
 sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
@@ -13284,7 +13284,7 @@ sys/src/cmd/unix/u9fs/utfrune.c - 664 sys sys 1015092354 387
 sys/src/cmd/unix/winplumb.c - 664 sys sys 1047233509 5015
 sys/src/cmd/unix/winplumb.exe - 664 sys sys 1047233509 32768
 sys/src/cmd/unix/winstart - 775 sys sys 1047233540 60
-sys/src/cmd/unlnfs.c - 664 sys sys 1107435471 1949
+sys/src/cmd/unlnfs.c - 664 sys sys 1127525524 1914
 sys/src/cmd/unmount.c - 664 sys sys 1014926615 442
 sys/src/cmd/upas - 20000000775 sys sys 1018549518 0
 sys/src/cmd/upas/README - 664 sys sys 944961329 1041
@@ -13541,7 +13541,7 @@ sys/src/cmd/venti/syncindex.c - 664 sys sys 1055707433 983
 sys/src/cmd/venti/syncindex0.c - 664 sys sys 1036470283 3044
 sys/src/cmd/venti/unittoull.c - 664 sys sys 1019678881 398
 sys/src/cmd/venti/unwhack.c - 664 sys sys 1019678881 3191
-sys/src/cmd/venti/utils.c - 664 sys sys 1072816049 4528
+sys/src/cmd/venti/utils.c - 664 sys sys 1127527222 4002
 sys/src/cmd/venti/venti.c - 664 sys sys 1069101830 4626
 sys/src/cmd/venti/venti.conf - 664 sys sys 1019867537 397
 sys/src/cmd/venti/ventifs.c - 664 sys sys 1063854129 6157

+ 20 - 0
dist/replica/plan9.log

@@ -21446,3 +21446,23 @@
 1127446276 7 c 386/bin/ndb/dnstcp - 775 sys sys 1127445050 218358
 1127446276 8 c 386/bin/upas/smtp - 775 sys sys 1127445051 275242
 1127446276 9 c 386/bin/vt - 775 sys sys 1127445052 173660
+1127523694 0 c sys/src/cmd/ip/telnetd.c - 664 sys sys 1127523098 11721
+1127525494 0 c sys/src/cmd/ip/telnet.c - 664 sys sys 1127523945 8573
+1127525494 1 c sys/src/cmd/unlnfs.c - 664 sys sys 1127525524 1914
+1127527294 0 c sys/src/cmd/venti/utils.c - 664 sys sys 1127527222 4002
+1127532696 0 c 386/bin/venti/buildindex - 775 sys sys 1127531311 154143
+1127532696 1 c 386/bin/venti/checkarenas - 775 sys sys 1127531311 158386
+1127532696 2 c 386/bin/venti/checkindex - 775 sys sys 1127531312 154989
+1127532696 3 c 386/bin/venti/clumpstats - 775 sys sys 1127531312 145175
+1127532696 4 c 386/bin/venti/findscore - 775 sys sys 1127531312 127626
+1127532696 5 c 386/bin/venti/fmtarenas - 775 sys sys 1127531312 128628
+1127532696 6 c 386/bin/venti/fmtindex - 775 sys sys 1127531313 145437
+1127532696 7 c 386/bin/venti/fmtisect - 775 sys sys 1127531313 145179
+1127532696 8 c 386/bin/venti/rdarena - 775 sys sys 1127531313 127094
+1127532696 9 c 386/bin/venti/syncindex - 775 sys sys 1127531314 169425
+1127532696 10 c 386/bin/venti/venti - 775 sys sys 1127531314 245157
+1127532696 11 c 386/bin/venti/verifyarena - 775 sys sys 1127531315 103977
+1127532696 12 c 386/bin/venti/wrarena - 775 sys sys 1127531315 175882
+1127532696 13 c 386/bin/ip/telnetd - 775 sys sys 1127531310 121988
+1127532696 14 c 386/bin/telnet - 775 sys sys 1127531310 80355
+1127532696 15 c 386/bin/unlnfs - 775 sys sys 1127531310 71353

+ 8 - 5
sys/src/cmd/ip/telnet.c

@@ -215,7 +215,9 @@ fromnet(int net)
 	Binit(&ib, net, OREAD);
 	Binit(&ob, 1, OWRITE);
 	eofs = 0;
-	for(;; Bbuffered(&ib) == 0 ? Bflush(&ob) : 0){
+	for(;;){
+		if(Bbuffered(&ib) == 0)
+			Bflush(&ob);
 		if(interrupted){
 			interrupted = 0;
 			send2(net, Iac, Interrupt);
@@ -520,12 +522,13 @@ islikeatty(int fd)
 void*
 share(int len)
 {
-	ulong vastart;
+	uchar *vastart;
 
-	vastart = ((ulong)sbrk(0)) + 2*1024*1024;
+	vastart = sbrk(0);
+	vastart += 2*1024*1024;
 
-	if(segattach(0, "shared", (void *)vastart, len) < 0)
+	if(segattach(0, "shared", vastart, len) < 0)
 		return 0;
 
-	return (void*)vastart;
+	return vastart;
 }

+ 5 - 4
sys/src/cmd/ip/telnetd.c

@@ -547,14 +547,15 @@ xlocsub(Biobuf *bp, uchar *sub, int n)
 void*
 share(int len)
 {
-	ulong vastart;
+	uchar *vastart;
 
-	vastart = ((ulong)sbrk(0)) + 2*1024*1024;
+	vastart = sbrk(0);
+	vastart += 2*1024*1024;
 
-	if(segattach(0, "shared", (void *)vastart, len) < 0)
+	if(segattach(0, "shared", vastart, len) < 0)
 		return 0;
 
-	return (void*)vastart;
+	return vastart;
 }
 
 /*

+ 0 - 2
sys/src/cmd/unlnfs.c

@@ -40,7 +40,6 @@ renamedir(char *d)
 	Dir *dir;
 	char *sub;
 	int fd, i;
-	uchar digest[MD5dlen];
 	Name *na;
 
 	fd = open(d, OREAD);
@@ -95,7 +94,6 @@ readnames(char *lnfile)
 {
 	Biobuf *bio;
 	char *f;
-	int slot;
 	Name *n;
 
 	bio = Bopen(lnfile, OREAD);

+ 6 - 39
sys/src/cmd/venti/utils.c

@@ -97,55 +97,22 @@ fmtZBInit(Fmt *f, ZBlock *b)
 	f->args = nil;
 }
 
-static int
-sFlush(Fmt *f)
-{
-	char *s;
-	int n;
-
-	n = (int)f->farg;
-	n += 256;
-	f->farg = (void*)n;
-	s = f->start;
-	f->start = realloc(s, n);
-	if(f->start == nil){
-		f->start = s;
-		return 0;
-	}
-	f->to = (char*)f->start + ((char*)f->to - s);
-	f->stop = (char*)f->start + n - 1;
-	return 1;
-}
-
 static char*
 logit(int severity, char *fmt, va_list args)
 {
-	Fmt f;
-	int n;
+	char *s;
 
-	f.runes = 0;
-	n = 32;
-	f.start = malloc(n);
-	if(f.start == nil)
-		return nil;
-	f.to = f.start;
-	f.stop = (char*)f.start + n - 1;
-	f.flush = sFlush;
-	f.farg = (void*)n;
-	f.nfmt = 0;
-	f.args = args;
-	n = dofmt(&f, fmt);
-	if(n < 0)
+	s = vsmprint(fmt, args);
+	if(s == nil)
 		return nil;
-	*(char*)f.to = '\0';
 
 	if(severity != EOk){
 		if(argv0 == nil)
-			fprint(2, "%s: err %d: %s\n", argv0, severity, f.start);
+			fprint(2, "%s: err %d: %s\n", argv0, severity, s);
 		else
-			fprint(2, "err %d: %s\n", severity, f.start);
+			fprint(2, "err %d: %s\n", severity, s);
 	}
-	return f.start;
+	return s;
 }
 
 void