Tcl Source Code: Check-in [dc71499520]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Fix loading of timezones where one abbreviation is a proper suffix of another [Bug 3470928]
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	dc714995205867d8a82545b8dcca741641da6928
User & Date:	kbk 2012-01-08 20:49:22

Context

2012-01-09
13:50		Revert mistaken commit. check-in: 38a63eef25 user: dgp tags: trunk
2012-01-08
20:49		Fix loading of timezones where one abbreviation is a proper suffix of another [Bug 3470928] check-in: dc71499520 user: kbk tags: trunk
20:43		Fix loading of timezones where one abbreviation is a proper suffix of another [Bug 3470928] check-in: c7e8dc4c9b user: kbk tags: core-8-5-branch
2011-12-30
08:26		Update to Olson's tzdata2011n check-in: fdf178b941 user: venkat tags: trunk

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.

Changes to library/clock.tcl.

Changes to tests/all.tcl.

Changes to tests/clock.test.

Changes to unix/tclLoadDl.c.

︙			︙
3407 3408 3409 3410 3411 3412 3413 ~~3414~~ 3415 3416 3417 3418 3419 3420 3421	# TZData(:fileName) contains the time zone data # #---------------------------------------------------------------------- proc ::tcl::clock::ReadZoneinfoFile {fileName fname} { variable MINWIDE variable TZData ~~if { ![~~info~~ exists fname] } {~~ return -code error "$fileName not found" } if { [file size $fname] > 262144 } { return -code error "$fileName too big" }	\|	3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421	# TZData(:fileName) contains the time zone data # #---------------------------------------------------------------------- proc ::tcl::clock::ReadZoneinfoFile {fileName fname} { variable MINWIDE variable TZData if { ![file exists $fname] } { return -code error "$fileName not found" } if { [file size $fname] > 262144 } { return -code error "$fileName too big" }
︙			︙
3498 3499 3500 3501 3502 3503 3504 ~~3505 3506~~ 3507 3508 3509 3510 3511 3512 3513	binary scan $d @${seek}a${nChar} abbrs incr seek ${nChar} set abbrList [split $abbrs \0] set i 0 set abbrevs {} foreach a $abbrList { ~~dict set abbrevs $i $a incr i ~~[expr { [string length $a] + 1 }]~~~~ } # Package up a list of tuples, each of which contains transition time, # seconds east of Greenwich, DST flag and time zone abbreviation. set r {} set lastTime $MINWIDE	> \| \| >	3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515	binary scan $d @${seek}a${nChar} abbrs incr seek ${nChar} set abbrList [split $abbrs \0] set i 0 set abbrevs {} foreach a $abbrList { for {set j 0} {$j <= [string length $a]} {incr j} { dict set abbrevs $i [string range $a $j end] incr i } } # Package up a list of tuples, each of which contains transition time, # seconds east of Greenwich, DST flag and time zone abbreviation. set r {} set lastTime $MINWIDE
︙			︙