Plan 9 from Bell Labs 2006-12-24

dist/replica/_plan9.db

@@ -20,7 +20,7 @@
 386/bin/9660srv - 775 sys sys 1148500567 104375
 386/bin/aan - 775 sys sys 1148500568 131392
 386/bin/acid - 775 sys sys 1148500568 401250
-386/bin/acme - 775 sys sys 1155491742 432358
+386/bin/acme - 775 sys sys 1166906378 432350
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1136656314 132873
 386/bin/ape/cc - 775 sys sys 1148500570 70736
@@ -168,7 +168,7 @@
 386/bin/bitsy/params - 775 sys sys 1148500608 59109
 386/bin/bitsy/pencal - 775 sys sys 1150062733 117713
 386/bin/bitsy/prompter - 775 sys sys 1155491748 287199
-386/bin/bmp - 775 sys sys 1150062734 158105
+386/bin/bmp - 775 sys sys 1166847254 158105
 386/bin/bunzip2 - 775 sys sys 1148500610 97828
 386/bin/bzip2 - 775 sys sys 1148500611 114356
 386/bin/cal - 775 sys sys 1148500611 68221
@@ -188,11 +188,11 @@
 386/bin/compress - 775 sys sys 1159212097 166928
 386/bin/con - 775 sys sys 1148500616 78580
 386/bin/cp - 775 sys sys 1148500616 63548
-386/bin/cpp - 775 sys sys 1148500616 150553
+386/bin/cpp - 775 sys sys 1166847254 150553
 386/bin/cpu - 775 sys sys 1164140641 139578
 386/bin/crop - 775 sys sys 1150062735 116468
 386/bin/date - 775 sys sys 1148500618 43311
-386/bin/db - 775 sys sys 1148500619 346069
+386/bin/db - 775 sys sys 1166847255 346073
 386/bin/dc - 775 sys sys 1148500619 99354
 386/bin/dd - 775 sys sys 1159039156 45991
 386/bin/deroff - 775 sys sys 1148500620 74568
@@ -213,7 +213,7 @@
 386/bin/disk/ksync - 775 sys sys 1020319074 302
 386/bin/disk/mbr - 775 sys sys 1148500626 74012
 386/bin/disk/mk9660 - 775 sys sys 1020319074 144
-386/bin/disk/mkext - 775 sys sys 1148500626 82976
+386/bin/disk/mkext - 775 sys sys 1166847255 82980
 386/bin/disk/mkfs - 775 sys sys 1148500627 88063
 386/bin/disk/mksacfs - 775 sys sys 1020319074 71451
 386/bin/disk/prep - 775 sys sys 1148500628 96261
@@ -234,9 +234,9 @@
 386/bin/fortune - 775 sys sys 1148500633 67450
 386/bin/fossil - 20000000775 sys sys 1042005470 0
 386/bin/fossil/conf - 775 sys sys 1085077052 1506
-386/bin/fossil/flchk - 775 sys sys 1158434410 239113
-386/bin/fossil/flfmt - 775 sys sys 1158434411 247260
-386/bin/fossil/fossil - 775 sys sys 1158434412 364401
+386/bin/fossil/flchk - 775 sys sys 1166847256 239098
+386/bin/fossil/flfmt - 775 sys sys 1166847256 247245
+386/bin/fossil/fossil - 775 sys sys 1166847257 364386
 386/bin/fossil/last - 775 sys sys 1148500638 63644
 386/bin/freq - 775 sys sys 1148500638 62134
 386/bin/fs - 20000000775 sys sys 954380769 0
@@ -281,14 +281,14 @@
 386/bin/iconv - 775 sys sys 1150062738 113723
 386/bin/idiff - 775 sys sys 1148500648 76436
 386/bin/import - 775 sys sys 1148500649 101755
-386/bin/iostats - 775 sys sys 1148500650 100476
+386/bin/iostats - 775 sys sys 1166847258 100472
 386/bin/ip - 20000000775 sys sys 1016920851 0
 386/bin/ip/dhcpclient - 775 sys sys 1148500650 94471
 386/bin/ip/dhcpd - 775 sys sys 1162241039 151149
 386/bin/ip/dhcpleases - 775 sys sys 1148500652 86543
 386/bin/ip/ftpd - 775 sys sys 1148500653 170760
 386/bin/ip/gizzard - 775 sys sys 1081480408 101521
-386/bin/ip/gping - 775 sys sys 1155491753 183599
+386/bin/ip/gping - 775 sys sys 1166847258 183541
 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 1162241040 295089
@@ -332,7 +332,7 @@
 386/bin/mkpaqfs - 775 sys sys 1148500671 94826
 386/bin/mntgen - 775 sys sys 1160622242 145552
 386/bin/mount - 775 sys sys 1148500672 73436
-386/bin/ms2html - 775 sys sys 1148500672 104279
+386/bin/ms2html - 775 sys sys 1166847259 104267
 386/bin/mtime - 775 sys sys 1148500673 59470
 386/bin/mug - 775 sys sys 1157570246 176473
 386/bin/mv - 775 sys sys 1163044781 66723
@@ -440,7 +440,7 @@
 386/bin/trace - 775 sys sys 1155491757 181932
 386/bin/troff - 775 sys sys 1134151360 357941
 386/bin/troff2html - 775 sys sys 1132506877 85770
-386/bin/tweak - 775 sys sys 1155491758 193347
+386/bin/tweak - 775 sys sys 1166847259 193350
 386/bin/unicode - 775 sys sys 1148500699 62841
 386/bin/uniq - 775 sys sys 1148500699 62222
 386/bin/units - 775 sys sys 1148500700 75572
@@ -572,7 +572,7 @@
 386/lib/libstdio.a - 664 sys sys 1143777869 125926
 386/lib/libsunrpc.a - 664 sys sys 1143777870 353266
 386/lib/libthread.a - 664 sys sys 1143777870 71932
-386/lib/libventi.a - 664 sys sys 1143777870 97912
+386/lib/libventi.a - 664 sys sys 1166847260 97858
 386/mbr - 775 sys sys 1131317338 407
 386/mkfile - 664 sys sys 948141303 46
 386/pbs - 775 sys sys 1143465402 495
@@ -9342,7 +9342,7 @@ sys/src/cmd/acme/fsys.c - 664 sys sys 1111171699 13097
 sys/src/cmd/acme/look.c - 664 sys sys 1166822365 14203
 sys/src/cmd/acme/mkfile - 664 sys sys 1058463682 543
 sys/src/cmd/acme/regx.c - 664 sys sys 1014926094 16057
-sys/src/cmd/acme/rows.c - 664 sys sys 1103565437 14702
+sys/src/cmd/acme/rows.c - 664 sys sys 1166887151 14708
 sys/src/cmd/acme/scrl.c - 664 sys sys 1111119426 2875
 sys/src/cmd/acme/text.c - 664 sys sys 1136064450 27870
 sys/src/cmd/acme/time.c - 664 sys sys 1014926095 1783
@@ -13344,7 +13344,7 @@ sys/src/cmd/tapefs/tapfs.c - 664 sys sys 1140814624 1924
 sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1141003342 2759
 sys/src/cmd/tapefs/tpfs.c - 664 sys sys 1140814810 1999
 sys/src/cmd/tapefs/util.c - 664 sys sys 1140966088 2964
-sys/src/cmd/tapefs/v10fs.c - 664 sys sys 1140814624 3776
+sys/src/cmd/tapefs/v10fs.c - 664 sys sys 1166887348 4096
 sys/src/cmd/tapefs/v6fs.c - 664 sys sys 1140814625 3993
 sys/src/cmd/tapefs/zip.h - 664 sys sys 1097914153 1428
 sys/src/cmd/tapefs/zipfs.c - 664 sys sys 1140814625 6588
@@ -15674,16 +15674,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/acme - 775 sys sys 1166847253 432351
-386/bin/cpp - 775 sys sys 1166847254 150553
-386/bin/db - 775 sys sys 1166847255 346073
-386/bin/iostats - 775 sys sys 1166847258 100472
-386/bin/ms2html - 775 sys sys 1166847259 104267
-386/bin/bmp - 775 sys sys 1166847254 158105
-386/bin/disk/mkext - 775 sys sys 1166847255 82980
-386/bin/fossil/flchk - 775 sys sys 1166847256 239098
-386/bin/fossil/flfmt - 775 sys sys 1166847256 247245
-386/bin/fossil/fossil - 775 sys sys 1166847257 364386
-386/bin/ip/gping - 775 sys sys 1166847258 183541
-386/bin/tweak - 775 sys sys 1166847259 193350
-386/lib/libventi.a - 664 sys sys 1166847260 97858

dist/replica/plan9.db

@@ -20,7 +20,7 @@
 386/bin/9660srv - 775 sys sys 1148500567 104375
 386/bin/aan - 775 sys sys 1148500568 131392
 386/bin/acid - 775 sys sys 1148500568 401250
-386/bin/acme - 775 sys sys 1166847253 432351
+386/bin/acme - 775 sys sys 1166906378 432350
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1136656314 132873
 386/bin/ape/cc - 775 sys sys 1148500570 70736
@@ -9342,7 +9342,7 @@ sys/src/cmd/acme/fsys.c - 664 sys sys 1111171699 13097
 sys/src/cmd/acme/look.c - 664 sys sys 1166822365 14203
 sys/src/cmd/acme/mkfile - 664 sys sys 1058463682 543
 sys/src/cmd/acme/regx.c - 664 sys sys 1014926094 16057
-sys/src/cmd/acme/rows.c - 664 sys sys 1103565437 14702
+sys/src/cmd/acme/rows.c - 664 sys sys 1166887151 14708
 sys/src/cmd/acme/scrl.c - 664 sys sys 1111119426 2875
 sys/src/cmd/acme/text.c - 664 sys sys 1136064450 27870
 sys/src/cmd/acme/time.c - 664 sys sys 1014926095 1783
@@ -13344,7 +13344,7 @@ sys/src/cmd/tapefs/tapfs.c - 664 sys sys 1140814624 1924
 sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1141003342 2759
 sys/src/cmd/tapefs/tpfs.c - 664 sys sys 1140814810 1999
 sys/src/cmd/tapefs/util.c - 664 sys sys 1140966088 2964
-sys/src/cmd/tapefs/v10fs.c - 664 sys sys 1140814624 3776
+sys/src/cmd/tapefs/v10fs.c - 664 sys sys 1166887348 4096
 sys/src/cmd/tapefs/v6fs.c - 664 sys sys 1140814625 3993
 sys/src/cmd/tapefs/zip.h - 664 sys sys 1097914153 1428
 sys/src/cmd/tapefs/zipfs.c - 664 sys sys 1140814625 6588

dist/replica/plan9.log

@@ -62317,3 +62317,6 @@
 1166848205 10 c 386/bin/ip/gping - 775 sys sys 1166847258 183541
 1166848205 11 c 386/bin/tweak - 775 sys sys 1166847259 193350
 1166848205 12 c 386/lib/libventi.a - 664 sys sys 1166847260 97858
+1166887806 0 c sys/src/cmd/acme/rows.c - 664 sys sys 1166887151 14708
+1166887806 1 c sys/src/cmd/tapefs/v10fs.c - 664 sys sys 1166887348 4096
+1166907606 0 c 386/bin/acme - 775 sys sys 1166906378 432350

sys/src/cmd/acme/rows.c

@@ -669,7 +669,7 @@ rowload(Row *row, char *file, int initing)
 				rune = Bgetrune(b);
 				if(rune == '\n')
 					line++;
-				if(rune == Beof){
+				if(rune == (Rune)Beof){
 					free(r);
 					Bterm(bout);
 					free(bout);

sys/src/cmd/tapefs/v10fs.c

@@ -42,6 +42,7 @@ struct	v10dir {
 };
 
 int	tapefile;
+vlong	tapelen;
 Fileinf	iget(int ino);
 long	bmap(Ram *r, long bno);
 void	getblk(Ram *r, long bno, char *buf);
@@ -50,11 +51,16 @@ void
 populate(char *name)
 {
 	Fileinf f;
+	Dir *d;
 
 	replete = 0;
 	tapefile = open(name, OREAD);
 	if (tapefile<0)
 		error("Can't open argument file");
+	if ((d=dirfstat(tapefile)) == nil)
+		error("dirfstat");
+	tapelen = d->length;
+	free(d);
 	f = iget(VROOT);
 	ram->perm = f.mode;
 	ram->mtime = f.mdate;
@@ -181,9 +187,16 @@ getblk(Ram *r, long bno, char *buf)
 		memset(buf, 0, BLSIZE);
 		return;
 	}
+	if ((vlong)(dbno+1)*BLSIZE > tapelen) {
+		fprint(2, "read past end of tape: %lld\n", (vlong)dbno*BLSIZE);
+		memset(buf, 0, BLSIZE);
+		return;
+	}
 	seek(tapefile, dbno*BLSIZE, 0);
-	if (read(tapefile, buf, BLSIZE) != BLSIZE)
+	if (readn(tapefile, buf, BLSIZE) != BLSIZE){
+		fprint(2, "readn at %lld: %r\n", (vlong)dbno*BLSIZE);
 		error("bad read");
+	}
 }
 
 /*