Overview
Comment: | Added unmodified zipvfs from tclvfs 20080503 |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
91c236fce7db0f464b7c9a384a894a81 |
User & Date: | rkeene on 2010-09-26 04:43:36 |
Other Links: | manifest | tags |
Context
2010-09-26
| ||
04:43 | Added patch required to build with MingW64 check-in: 26410a9c32 user: rkeene tags: trunk | |
04:43 | Added unmodified zipvfs from tclvfs 20080503 check-in: 91c236fce7 user: rkeene tags: trunk | |
04:43 |
Added support for using an icon and file information resource under Windows
Allow the user to place a kit.ico and kit.rc in root dir to replace one built into tclkit Copied tclsh RC and icon as default check-in: 587e28b4b3 user: rkeene tags: trunk | |
Changes
Added kitsh/buildsrc/kitsh-0.0/zipvfs.tcl version [4a9165155e].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 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 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 | # Removed provision of the backward compatible name. Moved to separate # file/package. package provide vfs::zip 1.0.1 package require vfs # Using the vfs, memchan and Trf extensions, we ought to be able # to write a Tcl-only zip virtual filesystem. What we have below # is basically that. namespace eval vfs::zip {} # Used to execute a zip archive. This is rather like a jar file # but simpler. We simply mount it and then source a toplevel # file called 'main.tcl'. proc vfs::zip::Execute {zipfile} { Mount $zipfile $zipfile source [file join $zipfile main.tcl] } proc vfs::zip::Mount {zipfile local} { set fd [::zip::open [::file normalize $zipfile]] vfs::filesystem mount $local [list ::vfs::zip::handler $fd] # Register command to unmount vfs::RegisterMount $local [list ::vfs::zip::Unmount $fd] return $fd } proc vfs::zip::Unmount {fd local} { vfs::filesystem unmount $local ::zip::_close $fd } proc vfs::zip::handler {zipfd cmd root relative actualpath args} { #::vfs::log [list $zipfd $cmd $root $relative $actualpath $args] if {$cmd == "matchindirectory"} { eval [list $cmd $zipfd $relative $actualpath] $args } else { eval [list $cmd $zipfd $relative] $args } } proc vfs::zip::attributes {zipfd} { return [list "state"] } proc vfs::zip::state {zipfd args} { vfs::attributeCantConfigure "state" "readonly" $args } # If we implement the commands below, we will have a perfect # virtual file system for zip files. proc vfs::zip::matchindirectory {zipfd path actualpath pattern type} { #::vfs::log [list matchindirectory $path $actualpath $pattern $type] # This call to zip::getdir handles empty patterns properly as asking # for the existence of a single file $path only set res [::zip::getdir $zipfd $path $pattern] #::vfs::log "got $res" if {![string length $pattern]} { if {![::zip::exists $zipfd $path]} { return {} } set res [list $actualpath] set actualpath "" } set newres [list] foreach p [::vfs::matchCorrectTypes $type $res $actualpath] { lappend newres [file join $actualpath $p] } #::vfs::log "got $newres" return $newres } proc vfs::zip::stat {zipfd name} { #::vfs::log "stat $name" ::zip::stat $zipfd $name sb #::vfs::log [array get sb] array get sb } proc vfs::zip::access {zipfd name mode} { #::vfs::log "zip-access $name $mode" if {$mode & 2} { vfs::filesystem posixerror $::vfs::posix(EROFS) } # Readable, Exists and Executable are treated as 'exists' # Could we get more information from the archive? if {[::zip::exists $zipfd $name]} { return 1 } else { error "No such file" } } proc vfs::zip::open {zipfd name mode permissions} { #::vfs::log "open $name $mode $permissions" # return a list of two elements: # 1. first element is the Tcl channel name which has been opened # 2. second element (optional) is a command to evaluate when # the channel is closed. switch -- $mode { "" - "r" { if {![::zip::exists $zipfd $name]} { vfs::filesystem posixerror $::vfs::posix(ENOENT) } ::zip::stat $zipfd $name sb set nfd [vfs::memchan] fconfigure $nfd -translation binary seek $zipfd $sb(ino) start 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) } } } proc vfs::zip::createdirectory {zipfd name} { #::vfs::log "createdirectory $name" vfs::filesystem posixerror $::vfs::posix(EROFS) } proc vfs::zip::removedirectory {zipfd name recursive} { #::vfs::log "removedirectory $name" vfs::filesystem posixerror $::vfs::posix(EROFS) } proc vfs::zip::deletefile {zipfd name} { #::vfs::log "deletefile $name" vfs::filesystem posixerror $::vfs::posix(EROFS) } proc vfs::zip::fileattributes {zipfd name args} { #::vfs::log "fileattributes $args" switch -- [llength $args] { 0 { # list strings return [list] } 1 { # get value set index [lindex $args 0] return "" } 2 { # set value set index [lindex $args 0] set val [lindex $args 1] vfs::filesystem posixerror $::vfs::posix(EROFS) } } } proc vfs::zip::utime {fd path actime mtime} { vfs::filesystem posixerror $::vfs::posix(EROFS) } # Below copied from TclKit distribution # # ZIP decoder: # # Format of zip file: # [ Data ]* [ TOC ]* EndOfArchive # # Note: TOC is refered to in ZIP doc as "Central Archive" # # This means there are two ways of accessing: # # 1) from the begining as a stream - until the header # is not "PK\03\04" - ideal for unzipping. # # 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} 6 {implode - The file is Imploded} 7 {reserved - Reserved for Tokenizing compression algorithm} 8 {deflate - The file is Deflated} 9 {reserved - Reserved for enhanced Deflating} 10 {pkimplode - PKWARE Date Compression Library Imploding} } # Version types (high-order byte) array set systems { 0 {dos} 1 {amiga} 2 {vms} 3 {unix} 4 {vm cms} 5 {atari} 6 {os/2} 7 {macos} 8 {z system 8} 9 {cp/m} 10 {tops20} 11 {windows} 12 {qdos} 13 {riscos} 14 {vfat} 15 {mvs} 16 {beos} 17 {tandem} 18 {theos} } # DOS File Attrs array set dosattrs { 1 {readonly} 2 {hidden} 4 {system} 8 {unknown8} 16 {directory} 32 {archive} 64 {unknown64} 128 {normal} } proc u_short {n} { return [expr { ($n+0x10000)%0x10000 }] } } proc zip::DosTime {date time} { set time [u_short $time] set date [u_short $date] # time = fedcba9876543210 # HHHHHmmmmmmSSSSS (sec/2 actually) # data = fedcba9876543210 # yyyyyyyMMMMddddd set sec [expr { ($time & 0x1F) * 2 }] set min [expr { ($time >> 5) & 0x3F }] set hour [expr { ($time >> 11) & 0x1F }] set mday [expr { $date & 0x1F }] set mon [expr { (($date >> 5) & 0xF) }] set year [expr { (($date >> 9) & 0xFF) + 1980 }] # Fix up bad date/time data, no need to fail while {$sec > 59} {incr sec -60} while {$min > 59} {incr sec -60} while {$hour > 23} {incr hour -24} if {$mday < 1} {incr mday} if {$mon < 1} {incr mon} while {$mon > 12} {incr hour -12} while {[catch { set dt [format {%4.4d-%2.2d-%2.2d %2.2d:%2.2d:%2.2d} \ $year $mon $mday $hour $min $sec] set res [clock scan $dt -gmt 1] }]} { # Only mday can be wrong, at end of month incr mday -1 } return $res } proc zip::Data {fd arr {varPtr ""} {verify 0}} { upvar 1 $arr sb if { $varPtr != "" } { upvar 1 $varPtr data } set buf [read $fd 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(ver) [u_short $sb(ver)] set sb(flags) [u_short $sb(flags)] set sb(method) [u_short $sb(method)] set sb(mtime) [DosTime $date $time] set sb(name) [read $fd [u_short $flen]] set sb(extra) [read $fd [u_short $elen]] if { $varPtr == "" } { seek $fd $sb(csize) current } else { # Added by Chuck Ferril 10-26-03 to fix reading of OpenOffice # .sxw files. Any files in the zip that had a method of 8 # (deflate) failed here because size and csize were zero. # I'm not sure why the above computes the size and csize # wrong, but stat appears works properly. I originally # checked for csize of zero, but adding this change didn't # appear to break the none deflated file access and seemed # more natural. zip::stat $fd $sb(name) sb set data [read $fd $sb(csize)] } if { $sb(flags) & 0x4 } { # Data Descriptor used set buf [read $fd 12] binary scan $buf iii sb(crc) sb(csize) sb(size) } if { $varPtr == "" } { return "" } if { $sb(method) != 0 } { if { [catch { set data [vfs::zip -mode decompress -nowrap 1 $data] } err] } { ::vfs::log "$sb(name): inflate error: $err" binary scan $data H* x ::vfs::log $x } } return if { $verify } { set ncrc [vfs::crc $data] if { $ncrc != $sb(crc) } { tclLog [format {%s: crc mismatch: expected 0x%x, got 0x%x} \ $sb(name) $sb(crc) $ncrc] } } } proc zip::EndOfArchive {fd arr} { upvar 1 $arr cb # [SF Tclvfs Bug 1003574]. Do not seek over beginning of file. seek $fd 0 end # Just looking in the last 512 bytes may be enough to handle zip # archives without comments, however for archives which have # comments the chunk may start at an arbitrary distance from the # end of the file. So if we do not find the header immediately # we have to extend the range of our search, possibly until we # have a large part of the archive in memory. We can fail only # after the whole file has been searched. set sz [tell $fd] set len 512 set at 512 while {1} { if {$sz < $at} {set n -$sz} else {set n -$at} seek $fd $n end set hdr [read $fd $len] set pos [string first "PK\05\06" $hdr] if {$pos == -1} { if {$at >= $sz} { return -code error "no header found" } set len 540 ; # after 1st iteration we force overlap with last buffer incr at 512 ; # to ensure that the pattern we look for is not split at # ; # a buffer boundary, nor the header itself } else { break } } set hdr [string range $hdr [expr $pos + 4] [expr $pos + 21]] set pos [expr [tell $fd] + $pos - 512] binary scan $hdr ssssiis \ cb(ndisk) cb(cdisk) \ cb(nitems) cb(ntotal) \ cb(csize) cb(coff) \ cb(comment) set cb(ndisk) [u_short $cb(ndisk)] set cb(nitems) [u_short $cb(nitems)] set cb(ntotal) [u_short $cb(ntotal)] set cb(comment) [u_short $cb(comment)] # Compute base for situations where ZIP file # has been appended to another media (e.g. EXE) set cb(base) [expr { $pos - $cb(csize) - $cb(coff) }] } proc zip::TOC {fd arr} { upvar 1 $arr sb set buf [read $fd 46] binary scan $buf A4ssssssiiisssssii hdr \ sb(vem) sb(ver) sb(flags) sb(method) time date \ sb(crc) sb(csize) sb(size) \ flen elen clen sb(disk) sb(attr) \ sb(atx) sb(ino) if { ![string equal "PK\01\02" $hdr] } { binary scan $hdr H* x error "bad central header: $x" } foreach v {vem ver flags method disk attr} { set cb($v) [u_short [set sb($v)]] } set sb(mtime) [DosTime $date $time] set sb(mode) [expr { ($sb(atx) >> 16) & 0xffff }] if { ( $sb(atx) & 0xff ) & 16 } { 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]] } proc zip::open {path} { set fd [::open $path] if {[catch { upvar #0 zip::$fd cb upvar #0 zip::$fd.toc toc fconfigure $fd -translation binary ;#-buffering none zip::EndOfArchive $fd cb seek $fd $cb(coff) start set toc(_) 0; unset toc(_); #MakeArray for { set i 0 } { $i < $cb(nitems) } { incr i } { zip::TOC $fd sb set sb(depth) [llength [file split $sb(name)]] set name [string tolower $sb(name)] set toc($name) [array get sb] FAKEDIR toc [file dirname $name] } } err]} { close $fd return -code error $err } return $fd } proc zip::FAKEDIR {arr path} { upvar 1 $arr toc if { $path == "."} { return } if { ![info exists toc($path)] } { # Implicit directory lappend toc($path) \ name $path \ type directory mtime 0 size 0 mode 0777 \ ino -1 depth [llength [file split $path]] } FAKEDIR toc [file dirname $path] } proc zip::exists {fd path} { #::vfs::log "$fd $path" if {$path == ""} { return 1 } else { upvar #0 zip::$fd.toc toc info exists toc([string tolower $path]) } } proc zip::stat {fd path arr} { upvar #0 zip::$fd.toc toc upvar 1 $arr sb set name [string tolower $path] if { $name == "" || $name == "." } { array set sb { type directory mtime 0 size 0 mode 0777 ino -1 depth 0 name "" } } elseif {![info exists toc($name)] } { return -code error "could not read \"$path\": no such file or directory" } else { array set sb $toc($name) } set sb(dev) -1 set sb(uid) -1 set sb(gid) -1 set sb(nlink) 1 set sb(atime) $sb(mtime) set sb(ctime) $sb(mtime) return "" } # Treats empty pattern as asking for a particular file only proc zip::getdir {fd path {pat *}} { #::vfs::log [list getdir $fd $path $pat] upvar #0 zip::$fd.toc toc if { $path == "." || $path == "" } { set path [string tolower $pat] } else { set path [string tolower $path] if {$pat != ""} { append path /[string tolower $pat] } } set depth [llength [file split $path]] #puts stderr "getdir $fd $path $depth $pat [array names toc $path]" if {$depth} { set ret {} foreach key [array names toc $path] { if {[string index $key end] == "/"} { # Directories are listed twice: both with and without # the trailing '/', so we ignore the one with continue } array set sb $toc($key) if { $sb(depth) == $depth } { if {[info exists toc(${key}/)]} { array set sb $toc(${key}/) } lappend ret [file tail $sb(name)] } else { #::vfs::log "$sb(depth) vs $depth for $sb(name)" } unset sb } return $ret } else { # just the 'root' of the zip archive. This obviously exists and # is a directory. return [list {}] } } proc zip::_close {fd} { variable $fd variable $fd.toc unset $fd unset $fd.toc ::close $fd } |