* 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 2d8878278238d684f18ab6c7abeadba0b3d1ada9..c654415d247397093bba5b4788942aeac2056bd7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,17 @@
+2004-08-05  Andreas Kupries  <andreask@activestate.com>
+
+       * 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  <andreask@activestate.com>
 
-       * 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  <andreask@activestate.com>
 

diff --git a/library/zipvfs.tcl b/library/zipvfs.tcl
index 87f656d68c6c78224ce7b057f497d00e9d1adcca..382090fd64cd10e04333aa010880176dd02ca370 100644 (file)
--- 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