rainlance/amiga-tz
1
0
Fork 0
mirror of https://frontier.innolan.net/rainlance/amiga-tz.git synced 2025-12-08 20:14:15 +00:00
Code Releases Activity

add types to output if necessary so offsets of last types are those most recently used

Browse Source 
SCCS-file: zic.c
SCCS-SID: 8.21
This commit is contained in:
Arthur David Olson
2010-09-11 23:47:46 -04:00
committed by Paul Eggert
parent d97e8388c3
commit a2c7896ecf
1 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
zic.c
View File

@ -1588,7 +1588,11 @@ const char * const string;
char thischars[TZ_MAX_CHARS]; char thischars[TZ_MAX_CHARS];
char thischarcnt; char thischarcnt;
int indmap[TZ_MAX_CHARS]; int indmap[TZ_MAX_CHARS];
register int mrudst, mrustd;
register int savedtypecnt;
savedtypecnt = typecnt;
mrudst = mrustd = -1;
if (pass == 1) { if (pass == 1) {
thistimei = timei32; thistimei = timei32;
thistimecnt = timecnt32; thistimecnt = timecnt32;
@ -1613,8 +1617,12 @@ const char * const string;
writetype[typecnt - 1] = TRUE; writetype[typecnt - 1] = TRUE;
} else { } else {
for (i = thistimei - 1; i < thistimelim; ++i) for (i = thistimei - 1; i < thistimelim; ++i)
if (i >= 0) if (i >= 0) {
writetype[types[i]] = TRUE; writetype[types[i]] = TRUE;
if (isdsts[types[i]])
mrudst = types[i];
else mrustd = types[i];
}
/* /*
** For America/Godthab and Antarctica/Palmer ** For America/Godthab and Antarctica/Palmer
*/ */
@ -1645,6 +1653,51 @@ const char * const string;
} }
indmap[abbrinds[i]] = j; indmap[abbrinds[i]] = j;
} }
/*
** For pre-2011 systems: if the last-to-be-written standard
** (or daylight) type has a different offset from the
** most recently used offset,
** append an (unused) copy of the most recently used type
** (to help get global "altzone" and "timezone" variables
** set correctly).
*/
{
register int hidst, histd;
hidst = histd = -1;
for (i = 0; i < typecnt; ++i)
if (writetype[i])
if (isdsts[i])
hidst = i;
else histd = i;
if (histd >= 0 && mrustd >= 0 && histd != mrustd &&
gmtoffs[histd] != gmtoffs[mrustd] &&
typecnt < TZ_MAX_TYPES) {
gmtoffs[typecnt] = gmtoffs[mrustd];
isdsts[typecnt] = isdsts[mrustd];
abbrinds[typecnt] = abbrinds[mrustd];
ttisstds[typecnt] = ttisstds[mrustd];
ttisgmts[typecnt] = ttisgmts[mrustd];
writetype[typecnt] = 1;
typemap[typecnt] = thistypecnt;
++typecnt;
++thistypecnt;
}
if (hidst >= 0 && mrudst >= 0 && hidst != mrudst &&
gmtoffs[hidst] != gmtoffs[mrudst] &&
typecnt < TZ_MAX_TYPES) {
gmtoffs[typecnt] = gmtoffs[mrudst];
isdsts[typecnt] = isdsts[mrudst];
abbrinds[typecnt] = abbrinds[mrudst];
ttisstds[typecnt] = ttisstds[mrustd];
ttisgmts[typecnt] = ttisgmts[mrudst];
writetype[typecnt] = 1;
typemap[typecnt] = thistypecnt;
++typecnt;
++thistypecnt;
}
}
#define DO(field) (void) fwrite((void *) tzh.field, \ #define DO(field) (void) fwrite((void *) tzh.field, \
(size_t) sizeof tzh.field, (size_t) 1, fp) (size_t) sizeof tzh.field, (size_t) 1, fp)
tzh = tzh0; tzh = tzh0;
@ -1720,6 +1773,7 @@ const char * const string;
for (i = 0; i < typecnt; ++i) for (i = 0; i < typecnt; ++i)
if (writetype[i]) if (writetype[i])
(void) putc(ttisgmts[i], fp); (void) putc(ttisgmts[i], fp);
typecnt = savedtypecnt;
} }
(void) fprintf(fp, "\n%s\n", string); (void) fprintf(fp, "\n%s\n", string);
if (ferror(fp) || fclose(fp)) { if (ferror(fp) || fclose(fp)) {