Overview
| Comment: | Corrected typo in ZipVFS |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | 6e6c5fd01a4011c20b1deff9b1895833ee4f1e40 |
| User & Date: | rkeene on 2010-09-26 04:45:20 |
| Other Links: | manifest | tags |
Context
|
2010-09-26
| ||
| 04:45 | Updated to set encoding from system (untested) check-in: 095125b887 user: rkeene tags: trunk | |
| 04:45 | Corrected typo in ZipVFS check-in: 6e6c5fd01a user: rkeene tags: trunk | |
| 04:45 | Updated to not build zlib package under Tcl 8.6+ as it is natively provided check-in: e639016509 user: rkeene tags: trunk | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/zipvfs.tcl from [734aa55ae1] to [952d380c4b].
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 |
proc u_short {n} { return [expr { ($n+0x10000)%0x10000 }] }
}
proc zip::DosTime {date time} {
# The pre-VFS environment will not have access to "clock", so don't even
# bother
return 0
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
if {$sec > 59} {set sec 59}
if {$min > 59} {set sec 59}
if {$hour > 23} {set hour 23}
if {$mday < 1} {set mday 1}
if {$mday > 35} {set mday 35}
if {$mon < 1} {set mon 1}
if {$mon > 12} {set mon 12}
set res 0
while {$mday > 1 && [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 != "" } {
|
< < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
235 236 237 238 239 240 241 242 243 244 245 246 247 248 |
proc u_short {n} { return [expr { ($n+0x10000)%0x10000 }] }
}
proc zip::DosTime {date time} {
# The pre-VFS environment will not have access to "clock", so don't even
# bother
return 0
}
proc zip::Data {fd arr {varPtr ""} {verify 0}} {
upvar 1 $arr sb
if { $varPtr != "" } {
|
Modified tclvfs/patches/all/tclvfs-20080503-zipvfs-clock_and_append_to_exe.diff from [b74bd5027c] to [776417ea28].
9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 |
- 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}
+ if {$sec > 59} {set sec 59}
+ if {$min > 59} {set sec 59}
+ if {$hour > 23} {set hour 23}
+ if {$mday < 1} {set mday 1}
+ if {$mday > 31} {set mday 31}
+ if {$mon < 1} {set mon 1}
+ if {$mon > 12} {set mon 12}
- while {[catch {
|
| |
9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 |
- 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}
+ if {$sec > 59} {set sec 59}
+ if {$min > 59} {set min 59}
+ if {$hour > 23} {set hour 23}
+ if {$mday < 1} {set mday 1}
+ if {$mday > 31} {set mday 31}
+ if {$mon < 1} {set mon 1}
+ if {$mon > 12} {set mon 12}
- while {[catch {
|