Plan 9 from Bell Labs 2007-09-08

dist/replica/_plan9.db

@@ -236,9 +236,9 @@
 386/bin/fortune - 775 sys sys 1168402308 67356
 386/bin/fossil - 20000000775 sys sys 1042005470 0
 386/bin/fossil/conf - 775 sys sys 1085077052 1506
-386/bin/fossil/flchk - 775 sys sys 1188446912 238374
-386/bin/fossil/flfmt - 775 sys sys 1188446917 246379
-386/bin/fossil/fossil - 775 sys sys 1188446924 365038
+386/bin/fossil/flchk - 775 sys sys 1189134784 238377
+386/bin/fossil/flfmt - 775 sys sys 1189134789 246382
+386/bin/fossil/fossil - 775 sys sys 1189134796 365084
 386/bin/fossil/last - 775 sys sys 1168402310 63550
 386/bin/freq - 775 sys sys 1168402310 62040
 386/bin/fs - 20000000775 sys sys 954380769 0
@@ -358,6 +358,8 @@
 386/bin/nm - 775 sys sys 1188530182 130190
 386/bin/nntpfs - 775 sys sys 1179372100 165285
 386/bin/ns - 775 sys sys 1168402343 65492
+386/bin/oventi - 20000000775 sys sys 1189138522 0
+386/bin/oventi/copy - 775 sys sys 1189196486 107409
 386/bin/p - 775 sys sys 1168402343 65220
 386/bin/page - 775 sys sys 1179372100 234230
 386/bin/paqfs - 775 sys sys 1188447270 109707
@@ -485,32 +487,35 @@
 386/bin/usb/usbd - 775 sys sys 1184731243 130757
 386/bin/usb/usbmouse - 775 sys sys 1184731244 109661
 386/bin/usb/usbprinter - 775 sys sys 1089408719 222
-386/bin/vac - 775 sys sys 1188447333 170878
-386/bin/vacfs - 775 sys sys 1188447338 175686
+386/bin/vac - 775 sys sys 1189146367 170972
+386/bin/vacfs - 775 sys sys 1189146374 175780
 386/bin/venti - 20000000775 sys sys 947360466 0
 386/bin/venti/buildindex - 775 sys sys 1188447342 153947
 386/bin/venti/checkarenas - 775 sys sys 1188447346 158167
 386/bin/venti/checkindex - 775 sys sys 1188447350 154830
 386/bin/venti/clumpstats - 775 sys sys 1188447354 144979
 386/bin/venti/conf - 775 sys sys 1056364399 1506
-386/bin/venti/copy - 775 sys sys 1188447357 107405
+386/bin/venti/copy - 775 sys sys 1189196488 107409
 386/bin/venti/findscore - 775 sys sys 1188447360 127392
+386/bin/venti/fixarenas - 775 sys sys 1189146379 212905
 386/bin/venti/fmtarenas - 775 sys sys 1188447363 129561
+386/bin/venti/fmtbloom - 775 sys sys 1189146383 168638
 386/bin/venti/fmtindex - 775 sys sys 1188447367 145233
 386/bin/venti/fmtisect - 775 sys sys 1188447370 146361
+386/bin/venti/mirrorarenas - 775 sys sys 1189146390 252345
 386/bin/venti/printarena - 775 sys sys 1188447374 156603
 386/bin/venti/rdarena - 775 sys sys 1188447376 126860
 386/bin/venti/read - 775 sys sys 1188447379 103869
 386/bin/venti/sync - 775 sys sys 1188447382 103014
 386/bin/venti/syncindex - 775 sys sys 1188447385 169224
-386/bin/venti/venti - 775 sys sys 1188447391 245921
+386/bin/venti/venti - 775 sys sys 1189146402 458760
 386/bin/venti/verifyarena - 775 sys sys 1188447394 103740
 386/bin/venti/wrarena - 775 sys sys 1188447398 175841
 386/bin/venti/write - 775 sys sys 1188447400 103818
 386/bin/vncs - 775 sys sys 1188447411 471527
 386/bin/vncv - 775 sys sys 1188447423 518952
 386/bin/vt - 775 sys sys 1186716661 176851
-386/bin/vtdump - 775 sys sys 1188447427 161245
+386/bin/vtdump - 775 sys sys 1189146407 161339
 386/bin/wc - 775 sys sys 1148500701 41191
 386/bin/webcookies - 775 sys sys 1179372114 166178
 386/bin/webfs - 775 sys sys 1188447436 360410
@@ -537,7 +542,7 @@
 386/lib - 20000000775 sys sys 1016826328 0
 386/lib/ape - 20000000775 sys sys 1070519112 0
 386/lib/ape/lib9.a - 664 sys sys 1135531447 6906
-386/lib/ape/libap.a - 664 sys sys 1184529908 820226
+386/lib/ape/libap.a - 664 sys sys 1189196502 820240
 386/lib/ape/libbsd.a - 664 sys sys 1184467169 183900
 386/lib/ape/libdraw.a - 664 sys sys 1179372118 622218
 386/lib/ape/libfmt.a - 664 sys sys 1146156980 156706
@@ -7478,7 +7483,7 @@ sys/man/1/uniq - 664 sys sys 944959674 995
 sys/man/1/units - 664 sys sys 1113743326 2046
 sys/man/1/uptime - 664 sys sys 1074733782 380
 sys/man/1/vac - 664 sys sys 1162102172 3244
-sys/man/1/venti - 664 sys sys 1188620038 2445
+sys/man/1/venti - 664 sys sys 1189183078 2647
 sys/man/1/vi - 664 sys sys 1101668051 2904
 sys/man/1/vnc - 664 sys sys 1158063994 4313
 sys/man/1/vt - 664 sys sys 1186695303 2424
@@ -7696,7 +7701,7 @@ sys/man/4/consolefs - 664 sys sys 1144424854 4245
 sys/man/4/cwfs - 664 sys sys 1189029640 6255
 sys/man/4/dossrv - 664 sys sys 1168307403 4334
 sys/man/4/execnet - 664 sys sys 1019866708 1069
-sys/man/4/exportfs - 664 sys sys 1145881912 4655
+sys/man/4/exportfs - 664 sys sys 1189182220 4657
 sys/man/4/ext2srv - 664 sys sys 1055692986 2409
 sys/man/4/factotum - 664 sys sys 1187721636 14843
 sys/man/4/fossil - 664 sys sys 1186820346 9592
@@ -8184,7 +8189,7 @@ sys/src/9/port/chan.c - 664 sys sys 1146151714 34773
 sys/src/9/port/cis.c - 664 sys sys 1099761153 9248
 sys/src/9/port/debugalloc.c - 664 sys sys 1014931171 10402
 sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
-sys/src/9/port/devaoe.c - 664 sys sys 1187760674 42003
+sys/src/9/port/devaoe.c - 664 sys sys 1189187154 41993
 sys/src/9/port/devaudio.c - 664 sys sys 1170456648 21199
 sys/src/9/port/devbridge.c - 664 sys sys 1187735844 24076
 sys/src/9/port/devcap.c - 664 sys sys 1178886040 4141
@@ -8627,8 +8632,8 @@ sys/src/ape/lib/ap/gen/itoa.c - 664 sys sys 1014921987 85
 sys/src/ape/lib/ap/gen/itol.c - 664 sys sys 1014921987 86
 sys/src/ape/lib/ap/gen/ldiv.c - 664 sys sys 1014921987 149
 sys/src/ape/lib/ap/gen/mbwc.c - 664 sys sys 1014921987 2257
-sys/src/ape/lib/ap/gen/memccpy.c - 664 sys sys 1014921988 191
-sys/src/ape/lib/ap/gen/memchr.c - 664 sys sys 1014921988 163
+sys/src/ape/lib/ap/gen/memccpy.c - 664 sys sys 1189183558 212
+sys/src/ape/lib/ap/gen/memchr.c - 664 sys sys 1189183558 184
 sys/src/ape/lib/ap/gen/memcmp.c - 664 sys sys 1014921988 262
 sys/src/ape/lib/ap/gen/memmove.c - 664 sys sys 1014921987 433
 sys/src/ape/lib/ap/gen/memset.c - 664 sys sys 1014921988 135
@@ -12804,7 +12809,7 @@ sys/src/cmd/oventi/copy.c - 664 sys sys 1158618728 3713
 sys/src/cmd/oventi/dat.h - 664 sys sys 1128337707 15346
 sys/src/cmd/oventi/dumpvacroots - 775 sys sys 1163468045 571
 sys/src/cmd/oventi/fns.h - 664 sys sys 1055707422 6793
-sys/src/cmd/oventi/mkfile - 664 sys sys 1189018610 256
+sys/src/cmd/oventi/mkfile - 664 sys sys 1189182581 255
 sys/src/cmd/oventi/notes - 664 sys sys 1068500911 4032
 sys/src/cmd/oventi/stdinc.h - 664 sys sys 1188621931 140
 sys/src/cmd/oventi/venti.conf - 664 sys sys 1019867537 397
@@ -15736,6 +15741,3 @@ 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/fossil/flchk - 775 sys sys 1189134784 238377
-386/bin/fossil/flfmt - 775 sys sys 1189134789 246382
-386/bin/fossil/fossil - 775 sys sys 1189134796 365084

dist/replica/plan9.db

@@ -358,6 +358,8 @@
 386/bin/nm - 775 sys sys 1188530182 130190
 386/bin/nntpfs - 775 sys sys 1179372100 165285
 386/bin/ns - 775 sys sys 1168402343 65492
+386/bin/oventi - 20000000775 sys sys 1189138522 0
+386/bin/oventi/copy - 775 sys sys 1189196486 107409
 386/bin/p - 775 sys sys 1168402343 65220
 386/bin/page - 775 sys sys 1179372100 234230
 386/bin/paqfs - 775 sys sys 1188447270 109707
@@ -485,32 +487,35 @@
 386/bin/usb/usbd - 775 sys sys 1184731243 130757
 386/bin/usb/usbmouse - 775 sys sys 1184731244 109661
 386/bin/usb/usbprinter - 775 sys sys 1089408719 222
-386/bin/vac - 775 sys sys 1188447333 170878
-386/bin/vacfs - 775 sys sys 1188447338 175686
+386/bin/vac - 775 sys sys 1189146367 170972
+386/bin/vacfs - 775 sys sys 1189146374 175780
 386/bin/venti - 20000000775 sys sys 947360466 0
 386/bin/venti/buildindex - 775 sys sys 1188447342 153947
 386/bin/venti/checkarenas - 775 sys sys 1188447346 158167
 386/bin/venti/checkindex - 775 sys sys 1188447350 154830
 386/bin/venti/clumpstats - 775 sys sys 1188447354 144979
 386/bin/venti/conf - 775 sys sys 1056364399 1506
-386/bin/venti/copy - 775 sys sys 1188447357 107405
+386/bin/venti/copy - 775 sys sys 1189196488 107409
 386/bin/venti/findscore - 775 sys sys 1188447360 127392
+386/bin/venti/fixarenas - 775 sys sys 1189146379 212905
 386/bin/venti/fmtarenas - 775 sys sys 1188447363 129561
+386/bin/venti/fmtbloom - 775 sys sys 1189146383 168638
 386/bin/venti/fmtindex - 775 sys sys 1188447367 145233
 386/bin/venti/fmtisect - 775 sys sys 1188447370 146361
+386/bin/venti/mirrorarenas - 775 sys sys 1189146390 252345
 386/bin/venti/printarena - 775 sys sys 1188447374 156603
 386/bin/venti/rdarena - 775 sys sys 1188447376 126860
 386/bin/venti/read - 775 sys sys 1188447379 103869
 386/bin/venti/sync - 775 sys sys 1188447382 103014
 386/bin/venti/syncindex - 775 sys sys 1188447385 169224
-386/bin/venti/venti - 775 sys sys 1188447391 245921
+386/bin/venti/venti - 775 sys sys 1189146402 458760
 386/bin/venti/verifyarena - 775 sys sys 1188447394 103740
 386/bin/venti/wrarena - 775 sys sys 1188447398 175841
 386/bin/venti/write - 775 sys sys 1188447400 103818
 386/bin/vncs - 775 sys sys 1188447411 471527
 386/bin/vncv - 775 sys sys 1188447423 518952
 386/bin/vt - 775 sys sys 1186716661 176851
-386/bin/vtdump - 775 sys sys 1188447427 161245
+386/bin/vtdump - 775 sys sys 1189146407 161339
 386/bin/wc - 775 sys sys 1148500701 41191
 386/bin/webcookies - 775 sys sys 1179372114 166178
 386/bin/webfs - 775 sys sys 1188447436 360410
@@ -537,7 +542,7 @@
 386/lib - 20000000775 sys sys 1016826328 0
 386/lib/ape - 20000000775 sys sys 1070519112 0
 386/lib/ape/lib9.a - 664 sys sys 1135531447 6906
-386/lib/ape/libap.a - 664 sys sys 1184529908 820226
+386/lib/ape/libap.a - 664 sys sys 1189196502 820240
 386/lib/ape/libbsd.a - 664 sys sys 1184467169 183900
 386/lib/ape/libdraw.a - 664 sys sys 1179372118 622218
 386/lib/ape/libfmt.a - 664 sys sys 1146156980 156706
@@ -7478,7 +7483,7 @@ sys/man/1/uniq - 664 sys sys 944959674 995
 sys/man/1/units - 664 sys sys 1113743326 2046
 sys/man/1/uptime - 664 sys sys 1074733782 380
 sys/man/1/vac - 664 sys sys 1162102172 3244
-sys/man/1/venti - 664 sys sys 1188620038 2445
+sys/man/1/venti - 664 sys sys 1189183078 2647
 sys/man/1/vi - 664 sys sys 1101668051 2904
 sys/man/1/vnc - 664 sys sys 1158063994 4313
 sys/man/1/vt - 664 sys sys 1186695303 2424
@@ -7696,7 +7701,7 @@ sys/man/4/consolefs - 664 sys sys 1144424854 4245
 sys/man/4/cwfs - 664 sys sys 1189029640 6255
 sys/man/4/dossrv - 664 sys sys 1168307403 4334
 sys/man/4/execnet - 664 sys sys 1019866708 1069
-sys/man/4/exportfs - 664 sys sys 1145881912 4655
+sys/man/4/exportfs - 664 sys sys 1189182220 4657
 sys/man/4/ext2srv - 664 sys sys 1055692986 2409
 sys/man/4/factotum - 664 sys sys 1187721636 14843
 sys/man/4/fossil - 664 sys sys 1186820346 9592
@@ -8184,7 +8189,7 @@ sys/src/9/port/chan.c - 664 sys sys 1146151714 34773
 sys/src/9/port/cis.c - 664 sys sys 1099761153 9248
 sys/src/9/port/debugalloc.c - 664 sys sys 1014931171 10402
 sys/src/9/port/dev.c - 664 sys sys 1146151714 8177
-sys/src/9/port/devaoe.c - 664 sys sys 1187760674 42003
+sys/src/9/port/devaoe.c - 664 sys sys 1189187154 41993
 sys/src/9/port/devaudio.c - 664 sys sys 1170456648 21199
 sys/src/9/port/devbridge.c - 664 sys sys 1187735844 24076
 sys/src/9/port/devcap.c - 664 sys sys 1178886040 4141
@@ -8627,8 +8632,8 @@ sys/src/ape/lib/ap/gen/itoa.c - 664 sys sys 1014921987 85
 sys/src/ape/lib/ap/gen/itol.c - 664 sys sys 1014921987 86
 sys/src/ape/lib/ap/gen/ldiv.c - 664 sys sys 1014921987 149
 sys/src/ape/lib/ap/gen/mbwc.c - 664 sys sys 1014921987 2257
-sys/src/ape/lib/ap/gen/memccpy.c - 664 sys sys 1014921988 191
-sys/src/ape/lib/ap/gen/memchr.c - 664 sys sys 1014921988 163
+sys/src/ape/lib/ap/gen/memccpy.c - 664 sys sys 1189183558 212
+sys/src/ape/lib/ap/gen/memchr.c - 664 sys sys 1189183558 184
 sys/src/ape/lib/ap/gen/memcmp.c - 664 sys sys 1014921988 262
 sys/src/ape/lib/ap/gen/memmove.c - 664 sys sys 1014921987 433
 sys/src/ape/lib/ap/gen/memset.c - 664 sys sys 1014921988 135
@@ -12804,7 +12809,7 @@ sys/src/cmd/oventi/copy.c - 664 sys sys 1158618728 3713
 sys/src/cmd/oventi/dat.h - 664 sys sys 1128337707 15346
 sys/src/cmd/oventi/dumpvacroots - 775 sys sys 1163468045 571
 sys/src/cmd/oventi/fns.h - 664 sys sys 1055707422 6793
-sys/src/cmd/oventi/mkfile - 664 sys sys 1189018610 256
+sys/src/cmd/oventi/mkfile - 664 sys sys 1189182581 255
 sys/src/cmd/oventi/notes - 664 sys sys 1068500911 4032
 sys/src/cmd/oventi/stdinc.h - 664 sys sys 1188621931 140
 sys/src/cmd/oventi/venti.conf - 664 sys sys 1019867537 397

dist/replica/plan9.log

@@ -52661,3 +52661,20 @@
 1189135804 0 c 386/bin/fossil/flchk - 775 sys sys 1189134784 238377
 1189135804 1 c 386/bin/fossil/flfmt - 775 sys sys 1189134789 246382
 1189135804 2 c 386/bin/fossil/fossil - 775 sys sys 1189134796 365084
+1189139403 0 a 386/bin/oventi - 20000000775 sys sys 1189138522 0
+1189146603 0 a 386/bin/venti/fixarenas - 775 sys sys 1189146379 212905
+1189146603 1 a 386/bin/venti/fmtbloom - 775 sys sys 1189146383 168638
+1189146603 2 a 386/bin/venti/mirrorarenas - 775 sys sys 1189146390 252345
+1189146603 3 c 386/bin/venti/venti - 775 sys sys 1189146402 458760
+1189146603 4 c 386/bin/vtdump - 775 sys sys 1189146407 161339
+1189146603 5 c 386/bin/vac - 775 sys sys 1189146367 170972
+1189146603 6 c 386/bin/vacfs - 775 sys sys 1189146374 175780
+1189182604 0 c sys/man/4/exportfs - 664 sys sys 1189182220 4657
+1189182604 1 c sys/src/cmd/oventi/mkfile - 664 sys sys 1189182581 255
+1189184403 0 c sys/man/1/venti - 664 sys sys 1189183078 2647
+1189184403 1 c sys/src/ape/lib/ap/gen/memccpy.c - 664 sys sys 1189183558 212
+1189184403 2 c sys/src/ape/lib/ap/gen/memchr.c - 664 sys sys 1189183558 184
+1189188005 0 c sys/src/9/port/devaoe.c - 664 sys sys 1189187154 41993
+1189197003 0 c 386/bin/venti/copy - 775 sys sys 1189196488 107409
+1189197003 1 a 386/bin/oventi/copy - 775 sys sys 1189196486 107409
+1189197003 2 c 386/lib/ape/libap.a - 664 sys sys 1189196502 820240

sys/man/1/venti

@@ -28,15 +28,19 @@ read, write, copy \- simple Venti clients
 .br
 .B venti/copy
 [
-.B -fir
-]
-[
-.B -t
-.I type
+.\" .B -fir
+.B -fq
 ]
+.\" [
+.\" .B -t
+.\" .I type
+.\" ]
 .I srchost
 .I dsthost
 .I score
+[
+.I type
+]
 .SH DESCRIPTION
 Venti is a SHA1-addressed block storage server.
 See 
@@ -107,6 +111,11 @@ to run in `fast' mode,
 assuming that if a block already exists on the
 destination Venti server, all its children also
 exist and need not be checked.
+The
+.B -q
+option suppresses complaints about blocks already on the destination server.
+.
+.ig
 .PP
 The
 .B -i
@@ -135,8 +144,11 @@ option is given,
 replaces pointers to unreadable blocks with
 pointers to the zero block.
 It writes the new root score to standard output.
+..
 .SH SOURCE
 .B /sys/src/cmd/venti
+.br
+.B /sys/src/cmd/oventi
 .SH SEE ALSO
 .IR vac (1),
 .IR venti (2),
@@ -147,12 +159,14 @@ It writes the new root score to standard output.
 .IR venti-fmt (8)
 .SH BUGS
 Currently
-.I venti/copy
+.I nventi 's
+.I copy
 doesn't seem to copy the block corresponding to
 .IR score
-and possibly others, so use
-.I venti/copy
-for now.
+and possibly others, so the
+.I copy
+described here is from the original
+.IR venti .
 .PP
 There should be programs to read and write
 venti files and directories.

sys/man/4/exportfs

@@ -191,8 +191,8 @@ which is created with mode
 The name space is the directory tree rooted at 
 .IR path .
 The
-.B -d ,
-.B -P ,
+.BR -d ,
+.BR -P ,
 and
 .B -R
 options, if present, are relayed to

sys/src/9/port/devaoe.c

@@ -497,7 +497,7 @@ hset(Aoedev *d, Frame *f, Aoehdr *h, int cmd)
 		frameerror(d, f, Etimedout);
 		return -1;
 	}
-	memmove(h->dst, l->eatab + Eaddrlen*i, Eaddrlen);
+	memmove(h->dst, l->eatab[i], Eaddrlen);
 	memmove(h->src, l->nl->ea, sizeof h->src);
 	hnputs(h->type, Aoetype);
 	h->verflag = Aoever << 4;

sys/src/ape/lib/ap/gen/memccpy.c

@@ -3,10 +3,11 @@
 void*
 memccpy(void *a1, void *a2, int c, size_t n)
 {
-	char *s1, *s2;
+	unsigned char *s1, *s2;
 
 	s1 = a1;
 	s2 = a2;
+	c &= 0xFF;
 	while(n > 0) {
 		if((*s1++ = *s2++) == c)
 			return s1;

sys/src/ape/lib/ap/gen/memchr.c

@@ -3,9 +3,10 @@
 void*
 memchr(const void *ap, int c, size_t n)
 {
-	char *sp;
+	unsigned char *sp;
 
 	sp = ap;
+	c &= 0xFF;
 	while(n > 0) {
 		if(*sp++ == c)
 			return sp-1;

sys/src/cmd/oventi/mkfile

@@ -12,7 +12,7 @@ UPDATE=mkfile\
 	$HFILES\
 	$CFILES\
 
-BIN=/$objtype/bin/oventi
+BIN=/$objtype/bin/venti
 
 </sys/src/cmd/mkone