Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | 2010-12-30 Steve Huntley <[email protected]> * library/zipvfs.tcl: Applied patch 3005441 to fix issue with UTF-8 detection for filename encoding. Applied patch 3132957 to enable streaming of large files. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
9ba3fde997f153bebf60060edcf1c3b9 |
User & Date: | blacksqr 2010-12-30 07:20:12.000 |
Context
2010-12-30
| ||
07:59 | 2010-12-30 Steve Huntley <[email protected]> * pkgIndex.tcl.in, vfs.tcl: Switched "package require Tcl 8.4" statement to vfs.tcl to conform with accepted practice. check-in: 58acd21b8e user: blacksqr tags: trunk | |
07:20 | 2010-12-30 Steve Huntley <[email protected]> * library/zipvfs.tcl: Applied patch 3005441 to fix issue with UTF-8 detection for filename encoding. Applied patch 3132957 to enable streaming of large files. check-in: 9ba3fde997 user: blacksqr tags: trunk | |
2010-12-29
| ||
09:57 | 2010-12-29 Steve Huntley <[email protected]> * generic/vfs.c: include sys/stat.h so build under MinGW64 will succeed. See bug #3107382. * library/zipvfs.tcl: Fixed issues with clock handling, dealing with trying to [open] a directory, reading a zip file that has been appended to another file. See bugs 3103687, 3107380 check-in: 3ae33b2b92 user: blacksqr tags: trunk | |
Changes
Changes to ChangeLog.
1 2 3 4 5 6 7 | 2010-12-29 Steve Huntley <[email protected]> * generic/vfs.c: include sys/stat.h so build under MinGW64 will succeed. See bug #3107382. * library/zipvfs.tcl: Fixed issues with clock handling, dealing with trying to [open] a directory, reading a zip file that has been appended to another file. See bugs 3103687, 3107380 | > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 | 2010-12-30 Steve Huntley <[email protected]> * library/zipvfs.tcl: Applied patch 3005441 to fix issue with UTF-8 detection for filename encoding. Applied patch 3132957 to enable streaming of large files. 2010-12-29 Steve Huntley <[email protected]> * generic/vfs.c: include sys/stat.h so build under MinGW64 will succeed. See bug #3107382. * library/zipvfs.tcl: Fixed issues with clock handling, dealing with trying to [open] a directory, reading a zip file that has been appended to another file. See bugs 3103687, 3107380 |
︙ | ︙ |
Changes to library/zipvfs.tcl.
︙ | ︙ | |||
107 108 109 110 111 112 113 | ::zip::stat $zipfd $name sb if {$sb(ino) == -1} { vfs::filesystem posixerror $::vfs::posix(EISDIR) } | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | > | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | ::zip::stat $zipfd $name sb if {$sb(ino) == -1} { vfs::filesystem posixerror $::vfs::posix(EISDIR) } # set nfd [vfs::memchan] # fconfigure $nfd -translation binary seek $zipfd $sb(ino) start # set data [zip::Data $zipfd sb 0] # puts -nonewline $nfd $data # fconfigure $nfd -translation auto # seek $nfd 0 # return [list $nfd] # use streaming for files larger than 1MB if {$::zip::useStreaming && $sb(size) >= 1048576} { set buf [read $zipfd 30] set n [binary scan $buf A4sssssiiiss \ hdr sb(ver) sb(flags) sb(method) \ time date \ sb(crc) sb(csize) sb(size) flen elen] if { ![string equal "PK\03\04" $hdr] } { binary scan $hdr H* x error "bad header: $x" } set sb(name) [read $zipfd [::zip::u_short $flen]] set sb(extra) [read $zipfd [::zip::u_short $elen]] if { $sb(flags) & 0x4 } { # Data Descriptor used set buf [read $zipfd 12] binary scan $buf iii sb(crc) sb(csize) sb(size) } if { $sb(method) != 0} { set nfd [::zip::zstream $zipfd $sb(csize) $sb(size)] } else { set nfd [::zip::rawstream $zipfd $sb(size)] } return [list $nfd] } else { set nfd [vfs::memchan] fconfigure $nfd -translation binary zip::Data $zipfd sb data puts -nonewline $nfd $data fconfigure $nfd -translation auto seek $nfd 0 return [list $nfd] } } default { vfs::filesystem posixerror $::vfs::posix(EROFS) } } } |
︙ | ︙ | |||
189 190 191 192 193 194 195 196 197 198 199 200 201 202 | # # 2) for table of contents without reading entire # archive by first fetching EndOfArchive, then # just loading the TOC # namespace eval zip { array set methods { 0 {stored - The file is stored (no compression)} 1 {shrunk - The file is Shrunk} 2 {reduce1 - The file is Reduced with compression factor 1} 3 {reduce2 - The file is Reduced with compression factor 2} 4 {reduce3 - The file is Reduced with compression factor 3} 5 {reduce4 - The file is Reduced with compression factor 4} | > > | 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 | # # 2) for table of contents without reading entire # archive by first fetching EndOfArchive, then # just loading the TOC # namespace eval zip { set zseq 0 array set methods { 0 {stored - The file is stored (no compression)} 1 {shrunk - The file is Shrunk} 2 {reduce1 - The file is Reduced with compression factor 1} 3 {reduce2 - The file is Reduced with compression factor 2} 4 {reduce3 - The file is Reduced with compression factor 3} 5 {reduce4 - The file is Reduced with compression factor 4} |
︙ | ︙ | |||
307 308 309 310 311 312 313 | set sb(crc) [expr {$crc & 0xffffffff}] set sb(csize) [expr {$csize & 0xffffffff}] set sb(size) [expr {$size & 0xffffffff}] } set sb(name) [read $fd [expr {$namelen & 0xffff}]] set sb(extra) [read $fd [expr {$xtralen & 0xffff}]] | | | 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 | set sb(crc) [expr {$crc & 0xffffffff}] set sb(csize) [expr {$csize & 0xffffffff}] set sb(size) [expr {$size & 0xffffffff}] } set sb(name) [read $fd [expr {$namelen & 0xffff}]] set sb(extra) [read $fd [expr {$xtralen & 0xffff}]] if {$sb(flags) & (1 << 11)} { set sb(name) [encoding convertfrom utf-8 $sb(name)] } set sb(name) [string trimleft $sb(name) "./"] # APPNOTE B: File data # if bit 3 of flags is set the csize comes from the central directory set data [read $fd $sb(csize)] |
︙ | ︙ | |||
410 411 412 413 414 415 416 | } else { break } } set hdr [string range $hdr [expr $pos + 4] [expr $pos + 21]] | | | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 | } else { break } } set hdr [string range $hdr [expr $pos + 4] [expr $pos + 21]] set seekstart [expr {wide([tell $fd]) + $pos - 512}] if {$seekstart < 0} { set seekstart 0 } set pos [expr {$seekstart + $pos}] binary scan $hdr ssssiis \ cb(ndisk) cb(cdisk) \ |
︙ | ︙ | |||
434 435 436 437 438 439 440 441 442 443 444 445 446 447 | # Compute base for situations where ZIP file # has been appended to another media (e.g. EXE) set base [expr { $pos - $cb(csize) - $cb(coff) }] if {$base < 0} { set base 0 } set cb(base) $base } proc zip::TOC {fd arr} { upvar #0 zip::$fd cb upvar 1 $arr sb set buf [read $fd 46] | > > > > > | 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 | # Compute base for situations where ZIP file # has been appended to another media (e.g. EXE) set base [expr { $pos - $cb(csize) - $cb(coff) }] if {$base < 0} { set base 0 } set cb(base) $base if {$cb(coff) < 0} { set cb(base) [expr {wide($cb(base)) - 4294967296}] set cb(coff) [expr {wide($cb(coff)) + 4294967296}] } } proc zip::TOC {fd arr} { upvar #0 zip::$fd cb upvar 1 $arr sb set buf [read $fd 46] |
︙ | ︙ | |||
471 472 473 474 475 476 477 | set sb(type) directory } else { set sb(type) file } set sb(name) [read $fd [u_short $flen]] set sb(extra) [read $fd [u_short $elen]] set sb(comment) [read $fd [u_short $clen]] | > > > | | 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 | set sb(type) directory } else { set sb(type) file } set sb(name) [read $fd [u_short $flen]] set sb(extra) [read $fd [u_short $elen]] set sb(comment) [read $fd [u_short $clen]] while {$sb(ino) < 0} { set sb(ino) [expr {wide($sb(ino)) + 4294967296}] } if {$sb(flags) & (1 << 11)} { set sb(name) [encoding convertfrom utf-8 $sb(name)] set sb(comment) [encoding convertfrom utf-8 $sb(comment)] } set sb(name) [string trimleft $sb(name) "./"] } proc zip::open {path} { |
︙ | ︙ | |||
617 618 619 620 621 622 623 | proc zip::_close {fd} { variable $fd variable $fd.toc unset $fd unset $fd.toc ::close $fd } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 | proc zip::_close {fd} { variable $fd variable $fd.toc unset $fd unset $fd.toc ::close $fd } # Implementation of stream based decompression for zip if {([info commands ::rechan] != "") || ([info commands ::chan] != "")} { if {![catch {package require Tcl 8.6}]} { # implementation using [zlib stream inflate] and [rechan]/[chan create] proc ::zip::zstream_create {fd} { upvar #0 ::zip::_zstream_zcmd($fd) zcmd if {$zcmd == ""} { set zcmd [zlib stream inflate] } } proc ::zip::zstream_delete {fd} { upvar #0 ::zip::_zstream_zcmd($fd) zcmd if {$zcmd != ""} { rename $zcmd "" set zcmd "" } } proc ::zip::zstream_put {fd data} { upvar #0 ::zip::_zstream_zcmd($fd) zcmd zstream_create $fd $zcmd put $data } proc ::zip::zstream_get {fd} { upvar #0 ::zip::_zstream_zcmd($fd) zcmd zstream_create $fd return [$zcmd get] } set ::zip::useStreaming 1 } elseif {![catch {zlib sinflate ::zip::__dummycommand ; rename ::zip::__dummycommand ""}]} { proc ::zip::zstream_create {fd} { upvar #0 ::zip::_zstream_zcmd($fd) zcmd if {$zcmd == ""} { set zcmd ::zip::_zstream_cmd_$fd zlib sinflate $zcmd } } proc ::zip::zstream_delete {fd} { upvar #0 ::zip::_zstream_zcmd($fd) zcmd if {$zcmd != ""} { rename $zcmd "" set zcmd "" } } proc ::zip::zstream_put {fd data} { upvar #0 ::zip::_zstream_zcmd($fd) zcmd zstream_create $fd $zcmd fill $data } proc ::zip::zstream_get {fd} { upvar #0 ::zip::_zstream_zcmd($fd) zcmd zstream_create $fd set rc "" while {[$zcmd fill] != 0} { if {[catch { append rc [$zcmd drain 4096] }]} { break } } return $rc } set ::zip::useStreaming 1 } else { set ::zip::useStreaming 0 } } else { set ::zip::useStreaming 0 } proc ::zip::eventClean {fd} { variable eventEnable eventSet $fd 0 } proc ::zip::eventWatch {fd a} { if {[lindex $a 0] == "read"} { eventSet $fd 1 } else { eventSet $fd 0 } } proc zip::eventSet {fd e} { variable eventEnable set cmd [list ::zip:::eventPost $fd] after cancel $cmd if {$e} { set eventEnable($fd) 1 after 0 $cmd } else { catch {unset eventEnable($fd)} } } proc zip::eventPost {fd} { variable eventEnable if {[info exists eventEnable($fd)] && $eventEnable($fd)} { chan postevent $fd read eventSet $fd 1 } } proc ::zip::zstream {ifd clen ilen} { set start [tell $ifd] set cmd [list ::zip::zstream_handler $start $ifd $clen $ilen] if {[catch { set fd [chan create read $cmd] }]} { set fd [rechan $cmd 2] } set ::zip::_zstream_buf($fd) "" set ::zip::_zstream_pos($fd) 0 set ::zip::_zstream_tell($fd) $start set ::zip::_zstream_zcmd($fd) "" return $fd } proc ::zip::zstream_handler {istart ifd clen ilen cmd fd {a1 ""} {a2 ""}} { upvar #0 ::zip::_zstream_pos($fd) pos upvar #0 ::zip::_zstream_buf($fd) buf upvar #0 ::zip::_zstream_tell($fd) tell upvar #0 ::zip::_zstream_zcmd($fd) zcmd switch -- $cmd { initialize { return [list initialize finalize watch read seek] } watch { eventWatch $fd $a1 } seek { switch $a2 { 1 - current { incr a1 $pos } 2 - end { incr a1 $ilen } } # to seek back, rewind, i.e. start from scratch if {$a1 < $pos} { zstream_delete $fd seek $ifd $istart set pos 0 set buf "" set tell $istart } while {$pos < $a1} { set n [expr {$a1 - $pos}] if {$n > 4096} { set n 4096 } zstream_handler $istart $ifd $clen $ilen read $fd $n } return $pos } read { set r "" set n $a1 if {$n + $pos > $ilen} { set n [expr {$ilen - $pos}] } while {$n > 0} { set chunk [string range $buf 0 [expr {$n - 1}]] set buf [string range $buf $n end] incr n -[string length $chunk] incr pos [string length $chunk] append r $chunk if {$n > 0} { set c [expr {$istart + $clen - [tell $ifd]}] if {$c > 4096} { set c 4096 } if {$c <= 0} { break } seek $ifd $tell start set data [read $ifd $c] set tell [tell $ifd] zstream_put $fd $data append buf [zstream_get $fd] } } return $r } close - finalize { eventClean $fd if {$zcmd != ""} { rename $zcmd "" } unset pos } } } proc ::zip::rawstream_handler {ifd ioffset ilen cmd fd {a1 ""} {a2 ""} args} { upvar ::zip::_rawstream_pos($fd) pos switch -- $cmd { initialize { return [list initialize finalize watch read seek] } watch { eventWatch $fd $a1 } seek { switch $a2 { 1 - current { incr a1 $pos } 2 - end { incr a1 $ilen } } if {$a1 < 0} {set a1 0} if {$a1 > $ilen} {set a1 $ilen} set pos $a1 return $pos } read { seek $ifd $ioffset seek $ifd $pos current set n $a1 if {$n + $pos > $ilen} { set n [expr {$ilen - $pos}] } set fc [read $ifd $n] incr pos [string length $fc] return $fc } close - finalize { eventClean $fd unset pos } } } proc ::zip::rawstream {ifd ilen} { set cname _rawstream_[incr ::zip::zseq] set start [tell $ifd] set cmd [list ::zip::rawstream_handler $ifd $start $ilen] if {[catch { set fd [chan create read $cmd] }]} { set fd [rechan $cmd 2] } set ::zip::_rawstream_pos($fd) 0 return $fd } |