From: Andreas Kupries Date: Thu, 5 Aug 2004 17:18:06 +0000 (+0000) Subject: * library/zipvfs.tcl (Data): Fixed [SF Tclvfs Bug 1003591]. This X-Git-Tag: vfs-1-4~83 X-Git-Url: http://privyetmir.co.uk/gitweb.cgi?a=commitdiff_plain;h=58dcc5651f5450e45bd1b67c3a87e0b8f2c067a0;p=tclvfs * library/zipvfs.tcl (Data): Fixed [SF Tclvfs Bug 1003591]. This reverts an incomplete and unrecorded fix for handling dashes at the beginning of data, giving precedence to '2004-07-04 @ library/vfsUtils.tcl' instead, see below. The unrecorded fix was entered two days before and clashes with the other one. As it was incomplete the other fix was chosen, despite coming later. --- diff --git a/ChangeLog b/ChangeLog index 2d88782..c654415 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,17 @@ +2004-08-05 Andreas Kupries + + * library/zipvfs.tcl (Data): Fixed [SF Tclvfs Bug 1003591]. This + reverts an incomplete and unrecorded fix for handling dashes at + the beginning of data, giving precedence to '2004-07-04 @ + library/vfsUtils.tcl' instead, see below. The unrecorded fix was + entered two days before and clashes with the other one. As it + was incomplete the other fix was chosen, despite coming later. + 2004-08-04 Andreas Kupries - * library/zipvfs.tcl: Fixed [SF Tclvfs Bug 1003574]. Added code - preventing us from seeking before the beginning of the zip file. + * library/zipvfs.tcl (EndOfArchive): Fixed [SF Tclvfs Bug + 1003574]. Added code preventing us from seeking before the + beginning of the zip file. 2004-07-15 Andreas Kupries diff --git a/library/zipvfs.tcl b/library/zipvfs.tcl index 87f656d..382090f 100644 --- a/library/zipvfs.tcl +++ b/library/zipvfs.tcl @@ -308,7 +308,7 @@ proc zip::Data {fd arr {varPtr ""} {verify 0}} { if { $sb(method) != 0 } { if { [catch { - set data [vfs::zip -mode decompress -nowrap 1 -- $data] + set data [vfs::zip -mode decompress -nowrap 1 $data] } err] } { ::vfs::log "$sb(name): inflate error: $err" binary scan $data H* x