2011-03-30 Steve Huntley <stephen.huntley@alum.mit.edu>

	* vfslib.tcl, zipvfs.tcl: Added contributed patches to fix bugs 3160686
	& 3224057.

diff --git a/ChangeLog b/ChangeLog
index 504f68716f445408469805df2d56e4257fca8ccd..0b7231007663b0f298658593296c352f32fc0aae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-30  Steve Huntley  <stephen.huntley@alum.mit.edu>
+
+       * vfslib.tcl, zipvfs.tcl: Added contributed patches to fix bugs 3160686
+       & 3224057.
+
 2011-03-30  Steve Huntley  <stephen.huntley@alum.mit.edu>
 
        * globfind.tcl: Updated to latest file version (1.5.3).

diff --git a/library/vfslib.tcl b/library/vfslib.tcl
index c03d05c989bc14a3b3e5652c83bc171cd5471b30..4d8e0304a3f346c62afbccb9591ce592fe07e9f8 100644 (file)
--- a/library/vfslib.tcl
+++ b/library/vfslib.tcl
@@ -192,7 +192,9 @@ if {[info command ::chan] ne {}} {
         set ::vfs::_memchan_nam($fd) $filename
        return $fd
     }
+}
 
+if {[info command rechan] ne "" || ![catch {load "" rechan}]} {
     proc vfs::zstream_handler {zcmd ifd clen ilen imode cmd fd {a1 ""} {a2 ""}} {
        #puts stderr "z $zcmd $ifd $ilen $cmd $fd $a1 $a2"
        upvar ::vfs::_zstream_pos($fd) pos

diff --git a/library/zipvfs.tcl b/library/zipvfs.tcl
index 65b6a39598fd352dcd6b375ac0133e4d2b124374..191c2a2d5946ed637e1a34d59ef9b68a761e04b0 100644 (file)
--- a/library/zipvfs.tcl
+++ b/library/zipvfs.tcl
@@ -500,8 +500,6 @@ proc zip::TOC {fd arr} {
       flen elen clen sb(disk) sb(attr) \
       sb(atx) sb(ino)
 
-    set sb(ino) [expr {$cb(base) + $sb(ino)}]
-
     if { ![string equal "PK\01\02" $hdr] } {
        binary scan $hdr H* x
        return -code error "bad central header: $x"