sambuc/retrobsd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug in zoneinfo compiler.

Browse Source
This commit is contained in:
Serge Vakulenko
2015-10-25 15:59:54 -07:00
parent c1ff69edd2
commit c08045dafe
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/zoneinfo/Makefile
View File

@@ -41,7 +41,7 @@ MANDIR= ${DESTDIR}/man/cat8
all: tzfile.h zdump zic ${ZICMAN} ${ZDUMAN} all: tzfile.h zdump zic ${ZICMAN} ${ZDUMAN}
install: zic $(DATA) $(MAN) install: zic $(DATA) $(MAN)
(umask 22; ./zic -d ${SHARDIR} $(DATA)) (umask 22; ./zic -v -d ${SHARDIR} $(DATA))
install -c ${SHARDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime install -c ${SHARDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime
# install -c $(ZICMAN) ${MANDIR}/${ZICMAN} # install -c $(ZICMAN) ${MANDIR}/${ZICMAN}
# install -c $(ZDUMAN) ${MANDIR}/${ZDUMAN} # install -c $(ZDUMAN) ${MANDIR}/${ZDUMAN}

14
src/share/zoneinfo/zic.c
View File

@@ -459,9 +459,19 @@ setboundaries()
max_time = ~(time_t) 0; max_time = ~(time_t) 0;
} else { } else {
tt_signed = TRUE; tt_signed = TRUE;
min_time = mktime(&zerotm); for (;;) {
min_time = mktime(&zerotm);
if (min_time != -1)
break;
zerotm.tm_year++;
}
zerotm.tm_year = TZ_MAX_TIMES/2 - 2; zerotm.tm_year = TZ_MAX_TIMES/2 - 2;
max_time = mktime(&zerotm); for (;;) {
max_time = mktime(&zerotm);
if (max_time != -1)
break;
zerotm.tm_year--;
}
} }
min_year = TM_YEAR_BASE + gmtime(&min_time)->tm_year; min_year = TM_YEAR_BASE + gmtime(&min_time)->tm_year;
max_year = TM_YEAR_BASE + gmtime(&max_time)->tm_year; max_year = TM_YEAR_BASE + gmtime(&max_time)->tm_year;