Plan 9 from Bell Labs 2005-08-24

dist/replica/_plan9.db

@@ -118,7 +118,7 @@
 386/bin/aux/mnihongo - 775 sys sys 1115950044 139321
 386/bin/aux/mouse - 775 sys sys 1115950044 44026
 386/bin/aux/ms2 - 775 sys sys 1124335228 85677
-386/bin/aux/msexceltables - 775 sys sys 1116644791 81249
+386/bin/aux/msexceltables - 775 sys sys 1124766753 81264
 386/bin/aux/mswordstrings - 775 sys sys 1115950044 65317
 386/bin/aux/na - 775 sys sys 1115950045 154186
 386/bin/aux/nfsmount - 775 sys sys 1115950045 234092
@@ -243,7 +243,7 @@
 386/bin/fs/v10fs - 775 sys sys 1115950073 94571
 386/bin/fs/v6fs - 775 sys sys 1115950073 94489
 386/bin/fs/zipfs - 775 sys sys 1115950074 109088
-386/bin/ftpfs - 775 sys sys 1116903732 271518
+386/bin/ftpfs - 775 sys sys 1124766754 271942
 386/bin/games - 20000000775 sys sys 1096298711 0
 386/bin/games/4s - 775 sys sys 1120619353 177844
 386/bin/games/5s - 775 sys sys 1120619353 180356
@@ -266,7 +266,7 @@
 386/bin/gview - 775 sys sys 1123384234 238204
 386/bin/gzip - 775 sys sys 1115950078 84762
 386/bin/hayes - 775 sys sys 1115950078 64556
-386/bin/hget - 775 sys sys 1118891247 231963
+386/bin/hget - 775 sys sys 1124766755 232366
 386/bin/history - 775 sys sys 1116903733 75357
 386/bin/hoc - 775 sys sys 1115950079 99875
 386/bin/html2ms - 775 sys sys 1115950079 66095
@@ -285,7 +285,7 @@
 386/bin/ip/gping - 775 sys sys 1116126318 182819
 386/bin/ip/hogports - 775 sys sys 1118632064 42883
 386/bin/ip/httpd - 20000000775 sys sys 1016920846 0
-386/bin/ip/httpd/httpd - 775 sys sys 1115950083 290319
+386/bin/ip/httpd/httpd - 775 sys sys 1124766756 290737
 386/bin/ip/httpd/imagemap - 775 sys sys 1115950084 114785
 386/bin/ip/httpd/man2html - 775 sys sys 1115950084 123072
 386/bin/ip/httpd/netlib_find - 775 sys sys 1115950084 115630
@@ -335,7 +335,7 @@
 386/bin/ndb/dnsdebug - 775 sys sys 1123643767 194702
 386/bin/ndb/dnsquery - 775 sys sys 1120619354 63643
 386/bin/ndb/dnstcp - 775 sys sys 1123643767 193343
-386/bin/ndb/ipquery - 775 sys sys 1116126323 95480
+386/bin/ndb/ipquery - 775 sys sys 1124766757 95488
 386/bin/ndb/mkdb - 775 sys sys 1115950097 63982
 386/bin/ndb/mkhash - 775 sys sys 1115950097 83917
 386/bin/ndb/mkhosts - 775 sys sys 1115950097 84963
@@ -420,8 +420,8 @@
 386/bin/telnet - 775 sys sys 1115950118 80364
 386/bin/test - 775 sys sys 1115950119 69853
 386/bin/time - 775 sys sys 1115950119 61386
-386/bin/tlsclient - 775 sys sys 1115950119 197187
-386/bin/tlssrv - 775 sys sys 1115950120 197434
+386/bin/tlsclient - 775 sys sys 1124766757 197593
+386/bin/tlssrv - 775 sys sys 1124766758 197831
 386/bin/togif - 775 sys sys 1115950120 189766
 386/bin/toico - 775 sys sys 1115950121 123524
 386/bin/topng - 775 sys sys 1115950121 138328
@@ -445,7 +445,7 @@
 386/bin/upas/bayes - 775 sys sys 1064598344 70530
 386/bin/upas/deliver - 775 sys sys 1116990554 100066
 386/bin/upas/filter - 775 sys sys 1116990554 147609
-386/bin/upas/fs - 775 sys sys 1121915493 332331
+386/bin/upas/fs - 775 sys sys 1124766759 332762
 386/bin/upas/isspam - 775 sys sys 1064598349 38
 386/bin/upas/list - 775 sys sys 1115950126 82776
 386/bin/upas/marshal - 775 sys sys 1124075449 132904
@@ -455,14 +455,14 @@
 386/bin/upas/msgcat - 775 sys sys 1064598353 38
 386/bin/upas/msgtok - 775 sys sys 1064598354 75149
 386/bin/upas/nedmail - 775 sys sys 1116990556 156591
-386/bin/upas/pop3 - 775 sys sys 1119496663 259900
+386/bin/upas/pop3 - 775 sys sys 1124766760 260297
 386/bin/upas/qer - 775 sys sys 1116990557 100127
 386/bin/upas/ratfs - 775 sys sys 1119496663 111358
 386/bin/upas/runq - 775 sys sys 1116990557 113778
 386/bin/upas/scanmail - 775 sys sys 1116990557 129045
 386/bin/upas/send - 775 sys sys 1116990558 191823
-386/bin/upas/smtp - 775 sys sys 1119496663 273869
-386/bin/upas/smtpd - 775 sys sys 1120792315 328918
+386/bin/upas/smtp - 775 sys sys 1124766761 274266
+386/bin/upas/smtpd - 775 sys sys 1124766762 329315
 386/bin/upas/spam - 775 sys sys 1064598366 36
 386/bin/upas/testscan - 775 sys sys 1115950131 83668
 386/bin/upas/token - 775 sys sys 1115950132 77554
@@ -495,13 +495,13 @@
 386/bin/venti/verifyarena - 775 sys sys 1115950139 104270
 386/bin/venti/wrarena - 775 sys sys 1115950140 176179
 386/bin/venti/write - 775 sys sys 1115950140 102499
-386/bin/vncs - 775 sys sys 1120792316 471216
-386/bin/vncv - 775 sys sys 1115950142 518017
+386/bin/vncs - 775 sys sys 1124766763 471616
+386/bin/vncv - 775 sys sys 1124766766 518438
 386/bin/vt - 775 sys sys 1115950143 173664
 386/bin/vtdump - 775 sys sys 1119496667 159467
 386/bin/wc - 775 sys sys 1115950143 41156
 386/bin/webcookies - 775 sys sys 1119496667 161521
-386/bin/webfs - 775 sys sys 1119496668 349179
+386/bin/webfs - 775 sys sys 1124766766 349594
 386/bin/webfsget - 775 sys sys 1115950144 39143
 386/bin/wikifs - 775 sys sys 1122347400 201648
 386/bin/winwatch - 775 sys sys 1115950145 154555
@@ -539,7 +539,7 @@
 386/lib/libauthsrv.a - 664 sys sys 1117249746 34098
 386/lib/libbin.a - 664 sys sys 1115950150 2534
 386/lib/libbio.a - 664 sys sys 1115950150 26078
-386/lib/libc.a - 664 sys sys 1121398861 502522
+386/lib/libc.a - 664 sys sys 1124766768 502522
 386/lib/libcomplete.a - 664 sys sys 1115950151 6370
 386/lib/libcontrol.a - 664 sys sys 1115950152 274922
 386/lib/libdisk.a - 664 sys sys 1115950152 42234
@@ -548,22 +548,22 @@
 386/lib/libframe.a - 664 sys sys 1115950153 66060
 386/lib/libgeometry.a - 664 sys sys 1115950153 50470
 386/lib/libhtml.a - 664 sys sys 1115950154 219972
-386/lib/libhttpd.a - 664 sys sys 1115950154 99488
+386/lib/libhttpd.a - 664 sys sys 1124766768 99488
 386/lib/libip.a - 664 sys sys 1116126324 35602
 386/lib/libl.a - 664 sys sys 1115950154 5384
 386/lib/libmach.a - 664 sys sys 1120619355 755696
 386/lib/libmemdraw.a - 664 sys sys 1120792317 284130
 386/lib/libmemlayer.a - 664 sys sys 1115950157 47360
-386/lib/libmp.a - 664 sys sys 1115950157 79532
+386/lib/libmp.a - 664 sys sys 1124766769 79532
 386/lib/libndb.a - 664 sys sys 1115950157 60666
 386/lib/libplumb.a - 664 sys sys 1115950157 18876
 386/lib/libregexp.a - 664 sys sys 1115950157 37464
 386/lib/libscribble.a - 664 sys sys 1116815422 107282
-386/lib/libsec.a - 664 sys sys 1115950159 643998
+386/lib/libsec.a - 664 sys sys 1124766771 645078
 386/lib/libstdio.a - 664 sys sys 1115950159 126206
 386/lib/libsunrpc.a - 664 sys sys 1115950160 355994
 386/lib/libthread.a - 664 sys sys 1115950160 71162
-386/lib/libventi.a - 664 sys sys 1115950160 97708
+386/lib/libventi.a - 664 sys sys 1124766772 97708
 386/mbr - 775 sys sys 1022125974 407
 386/mkfile - 664 sys sys 948141303 46
 386/pbs - 775 sys sys 1022125973 494
@@ -7286,7 +7286,7 @@ sys/man/1/graph - 664 sys sys 944959673 2858
 sys/man/1/grep - 664 sys sys 969512677 2224
 sys/man/1/gs - 664 sys sys 1032054727 6906
 sys/man/1/gview - 664 sys sys 1123348216 4370
-sys/man/1/gzip - 664 sys sys 969499884 3073
+sys/man/1/gzip - 664 sys sys 1124839836 3226
 sys/man/1/hget - 664 sys sys 1067722859 1483
 sys/man/1/history - 664 sys sys 1109685635 1709
 sys/man/1/hoc - 664 sys sys 944959676 2357
@@ -11867,7 +11867,7 @@ sys/src/cmd/gzip/gunzip.c - 664 sys sys 1014924864 6039
 sys/src/cmd/gzip/gzip.c - 664 sys sys 1014924864 3646
 sys/src/cmd/gzip/gzip.h - 664 sys sys 954778718 1058
 sys/src/cmd/gzip/mkfile - 664 sys sys 984758036 125
-sys/src/cmd/gzip/unzip.c - 664 sys sys 1050689595 13603
+sys/src/cmd/gzip/unzip.c - 664 sys sys 1124839686 13816
 sys/src/cmd/gzip/zip.c - 664 sys sys 1033183074 7054
 sys/src/cmd/gzip/zip.h - 664 sys sys 954778719 1428
 sys/src/cmd/hget.c - 664 sys sys 1118885209 25774
@@ -14958,22 +14958,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/hget - 775 sys sys 1124766755 232366
-386/bin/vncs - 775 sys sys 1124766763 471616
-386/bin/vncv - 775 sys sys 1124766766 518438
-386/bin/ftpfs - 775 sys sys 1124766754 271942
-386/bin/webfs - 775 sys sys 1124766766 349594
-386/bin/aux/msexceltables - 775 sys sys 1124766753 81264
-386/bin/ip/httpd/httpd - 775 sys sys 1124766756 290737
-386/bin/ndb/ipquery - 775 sys sys 1124766757 95488
-386/bin/tlsclient - 775 sys sys 1124766757 197593
-386/bin/tlssrv - 775 sys sys 1124766758 197831
-386/bin/upas/fs - 775 sys sys 1124766759 332762
-386/bin/upas/pop3 - 775 sys sys 1124766760 260297
-386/bin/upas/smtp - 775 sys sys 1124766761 274266
-386/bin/upas/smtpd - 775 sys sys 1124766762 329315
-386/lib/libc.a - 664 sys sys 1124766768 502522
-386/lib/libhttpd.a - 664 sys sys 1124766768 99488
-386/lib/libmp.a - 664 sys sys 1124766769 79532
-386/lib/libsec.a - 664 sys sys 1124766771 645078
-386/lib/libventi.a - 664 sys sys 1124766772 97708
+386/bin/unzip - 775 sys sys 1124853144 89971

dist/replica/plan9.db

@@ -438,7 +438,7 @@
 386/bin/units - 775 sys sys 1115950124 75250
 386/bin/unlnfs - 775 sys sys 1115950124 71362
 386/bin/unmount - 775 sys sys 1115950124 36611
-386/bin/unzip - 775 sys sys 1115950125 89733
+386/bin/unzip - 775 sys sys 1124853144 89971
 386/bin/upas - 20000000775 sys sys 1016857390 0
 386/bin/upas/addhash - 775 sys sys 1064598343 67859
 386/bin/upas/aliasmail - 775 sys sys 1116990554 105039
@@ -7286,7 +7286,7 @@ sys/man/1/graph - 664 sys sys 944959673 2858
 sys/man/1/grep - 664 sys sys 969512677 2224
 sys/man/1/gs - 664 sys sys 1032054727 6906
 sys/man/1/gview - 664 sys sys 1123348216 4370
-sys/man/1/gzip - 664 sys sys 969499884 3073
+sys/man/1/gzip - 664 sys sys 1124839836 3226
 sys/man/1/hget - 664 sys sys 1067722859 1483
 sys/man/1/history - 664 sys sys 1109685635 1709
 sys/man/1/hoc - 664 sys sys 944959676 2357
@@ -11867,7 +11867,7 @@ sys/src/cmd/gzip/gunzip.c - 664 sys sys 1014924864 6039
 sys/src/cmd/gzip/gzip.c - 664 sys sys 1014924864 3646
 sys/src/cmd/gzip/gzip.h - 664 sys sys 954778718 1058
 sys/src/cmd/gzip/mkfile - 664 sys sys 984758036 125
-sys/src/cmd/gzip/unzip.c - 664 sys sys 1050689595 13603
+sys/src/cmd/gzip/unzip.c - 664 sys sys 1124839686 13816
 sys/src/cmd/gzip/zip.c - 664 sys sys 1033183074 7054
 sys/src/cmd/gzip/zip.h - 664 sys sys 954778719 1428
 sys/src/cmd/hget.c - 664 sys sys 1118885209 25774

dist/replica/plan9.log

@@ -20848,3 +20848,6 @@
 1124767938 16 c 386/lib/libmp.a - 664 sys sys 1124766769 79532
 1124767938 17 c 386/lib/libsec.a - 664 sys sys 1124766771 645078
 1124767938 18 c 386/lib/libventi.a - 664 sys sys 1124766772 97708
+1124839955 0 c sys/man/1/gzip - 664 sys sys 1124839836 3226
+1124839955 1 c sys/src/cmd/gzip/unzip.c - 664 sys sys 1124839686 13816
+1124854358 0 c 386/bin/unzip - 775 sys sys 1124853144 89971

sys/man/1/gzip

@@ -158,3 +158,10 @@ can only extract files which are uncompressed or compressed
 with the
 .B deflate
 compression scheme.  Recent zip files fall into this category.
+Very recent zip files may have tables of contents that 
+.I unzip
+cannot read.  Such files are still readable by invoking
+.I unzip
+with the
+.B -s
+option.

sys/src/cmd/gzip/unzip.c

@@ -46,6 +46,7 @@ static	char	**want;
 static	int	wbad;
 static	ulong	wlen;
 static	jmp_buf	zjmp;
+static	jmp_buf	seekjmp;
 
 static void
 usage(void)
@@ -113,6 +114,12 @@ main(int argc, char *argv[])
 		Binit(&bin, fd, OREAD);
 	}
 
+	if(setjmp(seekjmp)){
+		fprint(2, "trying to re-run assuming -s\n");
+		stream = 1;
+		Bseek(&bin, 0, 0);
+	}
+
 	if(table){
 		if(stream)
 			ok = sunztable(&bin);
@@ -471,19 +478,21 @@ static int
 findCDir(Biobuf *bin, char *file)
 {
 	vlong ecoff;
-	long off, size;
+	long off, size, m;
 	int entries, zclen, dn, ds, de;
 
 	ecoff = Bseek(bin, -ZECHeadSize, 2);
 	if(ecoff < 0){
-		fprint(2, "unzip: can't seek to contents of %s; try adding -s\n", file);
+		fprint(2, "unzip: can't seek to contents of %s\n", file);
+		longjmp(seekjmp, 1);
 		return -1;
 	}
 	if(setjmp(zjmp))
 		return -1;
 
-	if(get4(bin) != ZECHeader){
-		fprint(2, "unzip: bad magic number for contents of %s\n", file);
+	if((m=get4(bin)) != ZECHeader){
+		fprint(2, "unzip: bad magic number for table of contents of %s: %#.8lx\n", file, m);
+		longjmp(seekjmp, 1);
 		return -1;
 	}
 	dn = get2(bin);
@@ -506,6 +515,7 @@ findCDir(Biobuf *bin, char *file)
 
 	if(Bseek(bin, off, 0) != off){
 		fprint(2, "unzip: can't seek to start of contents of %s\n", file);
+		longjmp(seekjmp, 1);
 		return -1;
 	}