RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix POSIX-format TZ dst transition times for southern hemisphere 

the time of day at which daylight time switches over is specified in
local time in the dst state prior to the transition. the code for
handling this wrongly assumed it needed to switch whether dst or
standard offset is applied to the transition time when the dst end
date is before the dst start date (souther hemisphere summer), but in
fact the end transition time should always be adjusted for dst, and
the start transition time should always be adjusted for standard time.
This commit is contained in:
Rich Felker 2017-03-15 20:27:38 -04:00
parent 74bca42e16
commit dbff2bb889
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/time/__tz.c
View File

@ -373,18 +373,14 @@ void __secs_to_zone(long long t, int local, int *isdst, long *offset, long *oppo
long long t0 = rule_to_secs(r0, y); long long t0 = rule_to_secs(r0, y);
long long t1 = rule_to_secs(r1, y); long long t1 = rule_to_secs(r1, y);
if (t0 < t1) {
if (!local) { if (!local) {
t0 += __timezone; t0 += __timezone;
t1 += dst_off; t1 += dst_off;
} }
if (t0 < t1) {
if (t >= t0 && t < t1) goto dst; if (t >= t0 && t < t1) goto dst;
goto std; goto std;
} else { } else {
if (!local) {
t1 += __timezone;
t0 += dst_off;
}
if (t >= t1 && t < t0) goto std; if (t >= t1 && t < t0) goto std;
goto dst; goto dst;
} }