Browse Source

Plan 9 from Bell Labs 2005-10-21

David du Colombier 18 years ago
parent
commit
e3396801e3
4 changed files with 11 additions and 7 deletions
  1. 3 3
      dist/replica/_plan9.db
  2. 2 2
      dist/replica/plan9.db
  3. 2 0
      dist/replica/plan9.log
  4. 4 2
      sys/src/cmd/tapefs/tarfs.c

+ 3 - 3
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
@@ -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 1129723024 2683
+sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1129855841 2703
 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,4 +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
+386/bin/fs/tarfs - 775 sys sys 1129864622 94363

+ 2 - 2
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 1129777706 94353
+386/bin/fs/tarfs - 775 sys sys 1129864622 94363
 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
@@ -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 1129723024 2683
+sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1129855841 2703
 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

+ 2 - 0
dist/replica/plan9.log

@@ -21617,3 +21617,5 @@
 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
+1129856431 0 c sys/src/cmd/tapefs/tarfs.c - 664 sys sys 1129855841 2703
+1129865435 0 c 386/bin/fs/tarfs - 775 sys sys 1129864622 94363

+ 4 - 2
sys/src/cmd/tapefs/tarfs.c

@@ -58,10 +58,12 @@ populate(char *name)
 		/* the mode test is ugly but sometimes necessary */
 		if (dblock.dbuf.linkflag == '5'
 		|| (f.mode&0170000) == 040000
-		||  strrchr(dblock.dbuf.name, '\0')[-1] == '/')
+		||  strrchr(dblock.dbuf.name, '\0')[-1] == '/'){
 			f.mode |= DMDIR;
+			f.size = 0;
+		}
 		f.mode &= DMDIR|0777;
-		linkflg = dblock.dbuf.linkflag=='5' || dblock.dbuf.linkflag=='1';
+		linkflg = dblock.dbuf.linkflag=='s' || dblock.dbuf.linkflag=='1';
 		isabs = dblock.dbuf.name[0]=='/';
 		if (chksum != checksum()){
 			fprint(1, "bad checksum on %.28s\n", dblock.dbuf.name);