Plan 9 from Bell Labs 2005-10-20

dist/replica/_plan9.db

@@ -9849,7 +9849,7 @@ sys/src/cmd/diff/diff.h - 664 sys sys 1106723609 794
 sys/src/cmd/diff/diffdir.c - 664 sys sys 1014925333 1791
 sys/src/cmd/diff/diffio.c - 664 sys sys 1114696977 6599
 sys/src/cmd/diff/diffreg.c - 664 sys sys 1114037841 8825
-sys/src/cmd/diff/main.c - 664 sys sys 1106938096 4338
+sys/src/cmd/diff/main.c - 664 sys sys 1129722806 4340
 sys/src/cmd/diff/mkfile - 664 sys sys 944960882 141
 sys/src/cmd/disk - 20000000775 sys sys 1018468546 0
 sys/src/cmd/disk/9660 - 20000000775 sys sys 1017681443 0
@@ -12929,7 +12929,7 @@ sys/src/cmd/tapefs/fs.c - 664 sys sys 1109607563 9754
 sys/src/cmd/tapefs/mkfile - 664 sys sys 1097914131 254
 sys/src/cmd/tapefs/tapefs.h - 664 sys sys 1014926384 1609
 sys/src/cmd/tapefs/tapfs.c - 664 sys sys 1063854819 1938
-sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1071458376 2672
+sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1129723024 2683
 sys/src/cmd/tapefs/tpfs.c - 664 sys sys 1071322722 2012
 sys/src/cmd/tapefs/util.c - 664 sys sys 1014926385 2653
 sys/src/cmd/tapefs/v10fs.c - 664 sys sys 1014926385 3754
@@ -14967,3 +14967,4 @@ 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/fs/tarfs - 775 sys sys 1129777706 94353

dist/replica/plan9.db

@@ -238,7 +238,7 @@
 386/bin/fs/32vfs - 775 sys sys 1125345974 94498
 386/bin/fs/cpiofs - 775 sys sys 1125345974 93418
 386/bin/fs/tapfs - 775 sys sys 1125345974 95971
-386/bin/fs/tarfs - 775 sys sys 1125345974 94319
+386/bin/fs/tarfs - 775 sys sys 1129777706 94353
 386/bin/fs/tpfs - 775 sys sys 1125345975 93174
 386/bin/fs/v10fs - 775 sys sys 1125345975 94562
 386/bin/fs/v6fs - 775 sys sys 1125345975 94480
@@ -9849,7 +9849,7 @@ sys/src/cmd/diff/diff.h - 664 sys sys 1106723609 794
 sys/src/cmd/diff/diffdir.c - 664 sys sys 1014925333 1791
 sys/src/cmd/diff/diffio.c - 664 sys sys 1114696977 6599
 sys/src/cmd/diff/diffreg.c - 664 sys sys 1114037841 8825
-sys/src/cmd/diff/main.c - 664 sys sys 1106938096 4338
+sys/src/cmd/diff/main.c - 664 sys sys 1129722806 4340
 sys/src/cmd/diff/mkfile - 664 sys sys 944960882 141
 sys/src/cmd/disk - 20000000775 sys sys 1018468546 0
 sys/src/cmd/disk/9660 - 20000000775 sys sys 1017681443 0
@@ -12929,7 +12929,7 @@ sys/src/cmd/tapefs/fs.c - 664 sys sys 1109607563 9754
 sys/src/cmd/tapefs/mkfile - 664 sys sys 1097914131 254
 sys/src/cmd/tapefs/tapefs.h - 664 sys sys 1014926384 1609
 sys/src/cmd/tapefs/tapfs.c - 664 sys sys 1063854819 1938
-sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1071458376 2672
+sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1129723024 2683
 sys/src/cmd/tapefs/tpfs.c - 664 sys sys 1071322722 2012
 sys/src/cmd/tapefs/util.c - 664 sys sys 1014926385 2653
 sys/src/cmd/tapefs/v10fs.c - 664 sys sys 1014926385 3754

dist/replica/plan9.log

@@ -21614,3 +21614,6 @@
 1129374083 0 c sys/src/9/port/chan.c - 664 sys sys 1129373741 33642
 1129476707 0 c sys/src/cmd/bc.y - 664 sys sys 1129475330 13379
 1129519864 0 c 386/bin/bc - 775 sys sys 1129518547 81774
+1129723319 0 c sys/src/cmd/diff/main.c - 664 sys sys 1129722806 4340
+1129723319 1 c sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1129723024 2683
+1129779014 0 c 386/bin/fs/tarfs - 775 sys sys 1129777706 94353

sys/src/cmd/diff/main.c

@@ -11,7 +11,7 @@ Biobuf	stdout;
 static char *tmp[] = {"/tmp/diff1XXXXXXXXXXX", "/tmp/diff2XXXXXXXXXXX"};
 static int whichtmp;
 static char *progname;
-static char usage[] = "diff [ -efmnbwr ] file1 ... file2\n";
+static char usage[] = "diff [ -acefmnbwr ] file1 ... file2\n";
 
 static void
 rmtmpfiles(void)

sys/src/cmd/tapefs/tarfs.c

@@ -61,11 +61,11 @@ populate(char *name)
 		||  strrchr(dblock.dbuf.name, '\0')[-1] == '/')
 			f.mode |= DMDIR;
 		f.mode &= DMDIR|0777;
-		linkflg = dblock.dbuf.linkflag=='s' || dblock.dbuf.linkflag=='1';
+		linkflg = dblock.dbuf.linkflag=='5' || dblock.dbuf.linkflag=='1';
 		isabs = dblock.dbuf.name[0]=='/';
 		if (chksum != checksum()){
 			fprint(1, "bad checksum on %.28s\n", dblock.dbuf.name);
-			abort();
+			exits("checksum");
 		}
 		if (linkflg) {
 			/*fprint(2, "link %s->%s skipped\n", dblock.dbuf.name,
@@ -99,7 +99,7 @@ char *
 doread(Ram *r, long off, long cnt)
 {
 
-	seek(tapefile, (TBLOCK * (long)r->data)+off, 0);
+	seek(tapefile, (TBLOCK * (vlong)r->data)+off, 0);
 	if (cnt>sizeof(dblock.tbuf))
 		error("read too big");
 	read(tapefile, dblock.tbuf, cnt);