- tz - lists.iana.org

leapseconds
by Olson, Arthur David (NIH/NCI) Jan. 3, 2005

Jan. 3, 2005

Here's a (commentary-only) update to the leapseconds file to reflect the IERS bulletin issued last year. --ado ------- leapseconds ------- *** /tmp/geta28966 Mon Jan 3 11:58:36 2005 --- /tmp/getb28966 Mon Jan 3 11:58:36 2005 *************** *** 1,4 **** ! # @(#)leapseconds 7.17 # Allowance for leapseconds added to each timezone file. --- 1,4 ---- ! # @(#)leapseconds 7.18 # Allowance for leapseconds added to each timezone file. *************** *** 45,51 **** Leap 1998 Dec 31 23:59:60 + S # INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS) - # # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE # # SERVICE DE LA ROTATION TERRESTRE --- 45,50 ---- *************** *** 55,64 **** # FAX : 33 (0) 1 40 51 22 91 # Internet : services.iers(a)obspm.fr # ! # Paris, 15 January 2004 # - # Bulletin C 27 # # To authorities responsible # for the measurement and # distribution of time --- 54,64 ---- # FAX : 33 (0) 1 40 51 22 91 # Internet : services.iers(a)obspm.fr # ! # Paris, 21 July 2004 # # + # Bulletin C 28 + # # To authorities responsible # for the measurement and # distribution of time *************** *** 65,71 **** # # INFORMATION ON UTC - TAI # ! # NO positive leap second will be introduced at the end of June 2004. # The difference between UTC and the International Atomic Time TAI is: # # from 1999 January 1, 0h UTC, until further notice : UTC-TAI = -32 s --- 65,71 ---- # # INFORMATION ON UTC - TAI # ! # NO positive leap second will be introduced at the end of December 2004. # The difference between UTC and the International Atomic Time TAI is: # # from 1999 January 1, 0h UTC, until further notice : UTC-TAI = -32 s *************** *** 78,81 **** # Daniel GAMBIS # Director # Earth Orientation Center of IERS - # Observatoire de Paris, France --- 78,80 ----

1 0

Second part of localtime.c changes
by Olson, Arthur David (NIH/NCI) Jan. 1, 2005

Jan. 1, 2005

Having dispensed with the easy stuff last week, below find the hard stuff. The goal is to better behavior of localtime and gmtime on systems where time_t is an exotic type--for example, a 64-bit integer or a double. A problem is that the tm_year field of a "struct tm" field is, by standard, an int--so there are some (very positive or very negative) time_t values that can't be broken down into a "struct tm". I've adopted existing practice here--localtime and gmtime return NULL in such cases. The system I'm using is a Sunblade 100 running gcc version 3.2.3. If I do a "make typecheck" using version 7.85 of localtime.c and then do a "make typecheck" using version 7.86, I get these differences: 29,30c29,30 < US/Eastern Sat Oct 16 08:29:52 -1583348 UTC = Sat Oct 16 03:29:52 -1583348 EST isdst=0 < US/Eastern Sun Oct 17 08:29:52 -1583348 UTC = Sun Oct 17 03:29:52 -1583348 EST isdst=0 --- > US/Eastern -9223372036854775808 = NULL > US/Eastern -9223372036854689408 = NULL 501,502c501,502 < US/Eastern Sun Mar 16 15:30:07 1587287 UTC = Sun Mar 16 10:30:07 1587287 EST isdst=0 < US/Eastern Mon Mar 17 15:30:07 1587287 UTC = Mon Mar 17 10:30:07 1587287 EST isdst=0 --- > US/Eastern 9223372036854689407 = NULL > US/Eastern 9223372036854775807 = NULL 524,525c524,525 < US/Eastern Sun Jun 23 20:45:52 5881512 UTC = Sat Jul 10 22:14:08 -5877573 EST isdst=0 < US/Eastern Sun Jun 23 20:45:52 5881512 UTC = Sat Jul 10 22:14:08 -5877573 EST isdst=0 --- > US/Eastern -1.79769e+308 = NULL > US/Eastern -1.79769e+308 = NULL 996,997c996,997 < US/Eastern Sat Jul 10 03:14:07 -5877573 UTC = Fri Jul 9 22:14:07 -5877573 EST isdst=0 < US/Eastern Sat Jul 10 03:14:07 -5877573 UTC = Fri Jul 9 22:14:07 -5877573 EST isdst=0 --- > US/Eastern 1.79769e+308 = NULL > US/Eastern 1.79769e+308 = NULL So...for this regression test at least, the only differences are the ones I'd expect. I'm eager for feedback. --ado ------- localtime.c ------- *** /tmp/geta22155 Sat Jan 1 13:17:31 2005 --- /tmp/getb22155 Sat Jan 1 13:17:31 2005 *************** *** 1,8 **** /* ! ** XXX--do the right thing if time_t is double and ! ** the value fed to gmtime or localtime is very very negative or ! ** very very positive (which causes problems with the days-and-rem logic). ! ** Also: do the right thing in mktime if time_t is double. */ /* --- 1,6 ---- /* ! ** XXX--have mktime et al. do the right thing when time_t is exotic ! ** (for example, double). */ /* *************** *** 12,18 **** #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)localtime.c 7.85"; #endif /* !defined NOID */ #endif /* !defined lint */ --- 10,16 ---- #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)localtime.c 7.86"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 141,146 **** --- 139,145 ---- static struct tm * localsub P((const time_t * timep, long offset, struct tm * tmp)); static int increment_overflow P((int * number, int delta)); + static int leaps_thru_end_of P((int y)); static int long_increment_overflow P((long * number, int delta)); static int long_normalize_overflow P((long * tensptr, int * unitsptr, int base)); *************** *** 1174,1179 **** --- 1173,1191 ---- #endif /* defined STD_INSPIRED */ + /* + ** Return the number of leap years through the end of the given year + ** where, to make the math easy, the answer for year zero is defined as zero. + */ + + static int + leaps_thru_end_of(y) + register const int y; + { + return (y >= 0) ? (y / 4 - y / 100 + y / 400) : + -(leaps_thru_end_of(-(y + 1)) + 1); + } + static struct tm * timesub(timep, offset, sp, tmp) const time_t * const timep; *************** *** 1182,1191 **** register struct tm * const tmp; { register const struct lsinfo * lp; ! register long days; register long rem; ! register long y; ! register int yleap; register const int * ip; register long corr; register int hit; --- 1194,1203 ---- register struct tm * const tmp; { register const struct lsinfo * lp; ! register time_t tdays; ! register int idays; /* unsigned would be so 2003 */ register long rem; ! int y; register const int * ip; register long corr; register int hit; *************** *** 1219,1246 **** break; } } ! days = *timep / SECSPERDAY; ! rem = *timep - ((time_t) days) * SECSPERDAY; ! #ifdef mc68k ! if (*timep == 0x80000000) { ! /* ! ** A 3B1 muffs the division on the most negative number. ! */ ! days = -24855; ! rem = -11648; } ! #endif /* defined mc68k */ ! rem += (offset - corr); while (rem < 0) { rem += SECSPERDAY; ! --days; } while (rem >= SECSPERDAY) { rem -= SECSPERDAY; ! ++days; } tmp->tm_hour = (int) (rem / SECSPERHOUR); ! rem = rem % SECSPERHOUR; tmp->tm_min = (int) (rem / SECSPERMIN); /* ** A positive leap second requires a special --- 1231,1308 ---- break; } } ! y = EPOCH_YEAR; ! tdays = *timep / SECSPERDAY; ! rem = *timep - tdays * SECSPERDAY; ! while (tdays < 0 || tdays >= year_lengths[isleap(y)]) { ! int newy; ! register time_t tdelta; ! register int idelta; ! register int leapdays; ! ! tdelta = tdays / DAYSPERLYEAR; ! idelta = tdelta; ! if (tdelta - idelta >= 1 || idelta - tdelta >= 1) ! return NULL; ! if (idelta == 0) ! idelta = (tdays < 0) ? -1 : 1; ! newy = y; ! if (increment_overflow(&newy, idelta)) ! return NULL; ! leapdays = leaps_thru_end_of(newy - 1) - ! leaps_thru_end_of(y - 1); ! tdays -= ((time_t) newy - y) * DAYSPERNYEAR; ! tdays -= leapdays; ! y = newy; } ! { ! register long seconds; ! ! seconds = tdays * SECSPERDAY + 0.5; ! tdays = seconds / SECSPERDAY; ! rem += seconds - tdays * SECSPERDAY; ! } ! /* ! ** Given the range, we can now fearlessly cast... ! */ ! idays = tdays; ! rem += offset - corr; while (rem < 0) { rem += SECSPERDAY; ! --idays; } while (rem >= SECSPERDAY) { rem -= SECSPERDAY; ! ++idays; } + while (idays < 0) { + if (increment_overflow(&y, -1)) + return NULL; + idays += year_lengths[isleap(y)]; + } + while (idays >= year_lengths[isleap(y)]) { + idays -= year_lengths[isleap(y)]; + if (increment_overflow(&y, 1)) + return NULL; + } + tmp->tm_year = y; + if (increment_overflow(&tmp->tm_year, -TM_YEAR_BASE)) + return NULL; + tmp->tm_yday = idays; + /* + ** The "extra" mods below avoid overflow problems. + */ + tmp->tm_wday = EPOCH_WDAY + + ((y - EPOCH_YEAR) % DAYSPERWEEK) * + (DAYSPERNYEAR % DAYSPERWEEK) + + leaps_thru_end_of(y - 1) - + leaps_thru_end_of(EPOCH_YEAR - 1) + + idays; + tmp->tm_wday %= DAYSPERWEEK; + if (tmp->tm_wday < 0) + tmp->tm_wday += DAYSPERWEEK; tmp->tm_hour = (int) (rem / SECSPERHOUR); ! rem %= SECSPERHOUR; tmp->tm_min = (int) (rem / SECSPERMIN); /* ** A positive leap second requires a special *************** *** 1247,1275 **** ** representation. This uses "... ??:59:60" et seq. */ tmp->tm_sec = (int) (rem % SECSPERMIN) + hit; ! tmp->tm_wday = (int) ((EPOCH_WDAY + days) % DAYSPERWEEK); ! if (tmp->tm_wday < 0) ! tmp->tm_wday += DAYSPERWEEK; ! y = EPOCH_YEAR; ! #define IPQ(i, p) ((i) / (p) - (((i) % (p)) < 0)) ! #define LEAPS_THRU_END_OF(y) (IPQ((y), 4) - IPQ((y), 100) + IPQ((y), 400)) ! while (days < 0 || days >= (long) year_lengths[yleap = isleap(y)]) { ! register long newy; ! ! newy = y + days / DAYSPERNYEAR; ! if (days < 0) ! --newy; ! days -= (newy - y) * DAYSPERNYEAR + ! LEAPS_THRU_END_OF(newy - 1) - ! LEAPS_THRU_END_OF(y - 1); ! y = newy; ! } ! tmp->tm_year = y - TM_YEAR_BASE; ! tmp->tm_yday = (int) days; ! ip = mon_lengths[yleap]; ! for (tmp->tm_mon = 0; days >= (long) ip[tmp->tm_mon]; ++(tmp->tm_mon)) ! days = days - (long) ip[tmp->tm_mon]; ! tmp->tm_mday = (int) (days + 1); tmp->tm_isdst = 0; #ifdef TM_GMTOFF tmp->TM_GMTOFF = offset; --- 1309,1318 ---- ** representation. This uses "... ??:59:60" et seq. */ tmp->tm_sec = (int) (rem % SECSPERMIN) + hit; ! ip = mon_lengths[isleap(y)]; ! for (tmp->tm_mon = 0; idays >= ip[tmp->tm_mon]; ++(tmp->tm_mon)) ! idays -= ip[tmp->tm_mon]; ! tmp->tm_mday = (int) (idays + 1); tmp->tm_isdst = 0; #ifdef TM_GMTOFF tmp->TM_GMTOFF = offset; *************** *** 1486,1492 **** */ t = TYPE_SIGNED(time_t) ? 0 : (((unsigned long) 1) << bits); for ( ; ; ) { ! /* XXX */ (void) (*funcp)(&t, offset, &mytm); dir = tmcomp(&mytm, &yourtm); if (dir != 0) { if (bits-- < 0) --- 1529,1536 ---- */ t = TYPE_SIGNED(time_t) ? 0 : (((unsigned long) 1) << bits); for ( ; ; ) { ! if ((*funcp)(&t, offset, &mytm) == NULL) ! return WRONG; /* XXX probably wrong */ dir = tmcomp(&mytm, &yourtm); if (dir != 0) { if (bits-- < 0) *************** *** 1524,1530 **** continue; newt = t + sp->ttis[j].tt_gmtoff - sp->ttis[i].tt_gmtoff; ! /* XXX */ (void) (*funcp)(&newt, offset, &mytm); if (tmcomp(&mytm, &yourtm) != 0) continue; if (mytm.tm_isdst != yourtm.tm_isdst) --- 1568,1575 ---- continue; newt = t + sp->ttis[j].tt_gmtoff - sp->ttis[i].tt_gmtoff; ! if ((*funcp)(&newt, offset, &mytm) == NULL) ! return WRONG; /* XXX probably wrong */ if (tmcomp(&mytm, &yourtm) != 0) continue; if (mytm.tm_isdst != yourtm.tm_isdst)

1 0

Tzcode2005a.tar.gz and tzdata2005a.tar.gz
by Olson, Arthur David (NIH/NCI) Jan. 1, 2005

Jan. 1, 2005

The files ftp://elsie.nci.nih.gov/pub/tzcode2005a.tar.gz and ftp://elsie.nci.nih.gov/pub/tzdata2005a.tar.gz are now available. These incorporate the changes circulated in the last week of 2004 on the time zone mailing list. --ado

1 0

RE: Proposed changes to asctime.c, zdump.c, and localtime.c
by Olson, Arthur David (NIH/NCI) Dec. 30, 2004

Dec. 30, 2004

Thanks to Paul and Ken for the feedback on zdump.c. Here's the next iteration; these changes are relative to the code now available via ftp. --ado ------- zdump.c ------- *** /tmp/geta16007 Thu Dec 30 08:46:20 2004 --- /tmp/getb16007 Thu Dec 30 08:46:20 2004 *************** *** 1,4 **** ! static char elsieid[] = "@(#)zdump.c 7.57"; /* ** This code has been made independent of the rest of the time --- 1,4 ---- ! static char elsieid[] = "@(#)zdump.c 7.59"; /* ** This code has been made independent of the rest of the time *************** *** 151,156 **** --- 151,157 ---- static time_t hunt P((char * name, time_t lot, time_t hit)); static void setabsolutes(); static void show P((char * zone, time_t t, int v)); + static const char * tformat P((void)); static time_t yeartot P((long y)); int *************** *** 469,475 **** if (v) { tmp = gmtime(&t); if (tmp == NULL) { ! (void) printf("%g", (double) t); } else { dumptime(tmp); (void) printf(" UTC"); --- 470,476 ---- if (v) { tmp = gmtime(&t); if (tmp == NULL) { ! (void) printf(tformat(), t); } else { dumptime(tmp); (void) printf(" UTC"); *************** *** 504,509 **** --- 505,537 ---- return (result == NULL) ? &nada : result; } + /* + ** The code below can fail on certain theoretical systems; + ** it works on all known real-world systems as of 2004-12-30. + */ + + static const char * + tformat() + { + if (0.5 == (time_t) 0.5) { /* floating */ + if (sizeof (time_t) > sizeof (double)) + return "%Lg"; + return "%g"; + } + if (0 > (time_t) -1) { /* signed */ + if (sizeof (time_t) > sizeof (long)) + return "%lld"; + if (sizeof (time_t) > sizeof (int)) + return "%ld"; + return "%d"; + } + if (sizeof (time_t) > sizeof (unsigned long)) + return "%llu"; + if (sizeof (time_t) > sizeof (unsigned int)) + return "%lu"; + return "%u"; + } + static void dumptime(timeptr) register const struct tm * timeptr;

1 0

Proposed changes to asctime.c, zdump.c, and localtime.c
by Olson, Arthur David (NIH/NCI) Dec. 29, 2004

Dec. 29, 2004

Below find proposed changes, all (I hope) noncontroversial: 1. The addition of a comment to asctime.c warning against relying completely on strftime. 2. Changes to zdump.c to improve the output when gmtime() returns NULL and time_t is a strange type. 3. A fix to the declaration of wildabbr in localtime.c 4. Changes to some localtime.c internal functions from returning voids to returning struct tm *s. The last above is in preparation for doing a better job of handling the situation where a time_t value is fed to localtime or gmtime but the year associated with the time_t value won't fit in an int (as can happen if, for example, time_t is double). --ado ------- asctime.c ------- *** /tmp/geta3717 Mon Dec 27 09:18:15 2004 --- /tmp/getb3717 Mon Dec 27 09:18:15 2004 *************** *** 3,11 **** ** 1996-06-05 by Arthur David Olson (arthur_david_olson(a)nih.gov) */ #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)asctime.c 7.29"; #endif /* !defined NOID */ #endif /* !defined lint */ --- 3,17 ---- ** 1996-06-05 by Arthur David Olson (arthur_david_olson(a)nih.gov) */ + /* + ** Avoid the temptation to punt entirely to strftime; + ** the output of strftime is supposed to be locale specific + ** whereas the output of asctime is supposed to be constant. + */ + #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)asctime.c 7.30"; #endif /* !defined NOID */ #endif /* !defined lint */ ------- zdump.c ------- *** /tmp/geta3736 Mon Dec 27 09:18:15 2004 --- /tmp/getb3736 Mon Dec 27 09:18:15 2004 *************** *** 1,4 **** ! static char elsieid[] = "@(#)zdump.c 7.57"; /* ** This code has been made independent of the rest of the time --- 1,4 ---- ! static char elsieid[] = "@(#)zdump.c 7.58"; /* ** This code has been made independent of the rest of the time *************** *** 151,156 **** --- 151,157 ---- static time_t hunt P((char * name, time_t lot, time_t hit)); static void setabsolutes(); static void show P((char * zone, time_t t, int v)); + static char * tformat P((void)); static time_t yeartot P((long y)); int *************** *** 469,475 **** if (v) { tmp = gmtime(&t); if (tmp == NULL) { ! (void) printf("%g", (double) t); } else { dumptime(tmp); (void) printf(" UTC"); --- 470,476 ---- if (v) { tmp = gmtime(&t); if (tmp == NULL) { ! (void) printf(tformat(), t); } else { dumptime(tmp); (void) printf(" UTC"); *************** *** 504,509 **** --- 505,529 ---- return (result == NULL) ? &nada : result; } + static char * + tformat() + { + if (0.5 == (time_t) 0.5) /* floating */ + return "%g"; + if (0 > (time_t) -1) { /* signed */ + if (sizeof (time_t) > sizeof (long)) + return "%lld"; + if (sizeof (time_t) == sizeof (long)) + return "%ld"; + return "%d"; + } + if (sizeof (time_t) > sizeof (unsigned long)) + return "%llu"; + if (sizeof (time_t) == sizeof (unsigned long)) + return "%lu"; + return "%u"; + } + static void dumptime(timeptr) register const struct tm * timeptr; ------- localtime.c ------- *** /tmp/geta3754 Mon Dec 27 09:18:15 2004 --- /tmp/getb3754 Mon Dec 27 09:18:15 2004 *************** *** 2,7 **** --- 2,8 ---- ** XXX--do the right thing if time_t is double and ** the value fed to gmtime or localtime is very very negative or ** very very positive (which causes problems with the days-and-rem logic). + ** Also: do the right thing in mktime if time_t is double. */ /* *************** *** 11,17 **** #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)localtime.c 7.83"; #endif /* !defined NOID */ #endif /* !defined lint */ --- 12,18 ---- #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)localtime.c 7.85"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 61,67 **** #define WILDABBR " " #endif /* !defined WILDABBR */ ! static char wildabbr[] = "WILDABBR"; static const char gmt[] = "GMT"; --- 62,68 ---- #define WILDABBR " " #endif /* !defined WILDABBR */ ! static char wildabbr[] = WILDABBR; static const char gmt[] = "GMT"; *************** *** 135,143 **** static const char * getoffset P((const char * strp, long * offsetp)); static const char * getrule P((const char * strp, struct rule * rulep)); static void gmtload P((struct state * sp)); ! static void gmtsub P((const time_t * timep, long offset, struct tm * tmp)); ! static void localsub P((const time_t * timep, long offset, struct tm * tmp)); static int increment_overflow P((int * number, int delta)); static int long_increment_overflow P((long * number, int delta)); --- 136,144 ---- static const char * getoffset P((const char * strp, long * offsetp)); static const char * getrule P((const char * strp, struct rule * rulep)); static void gmtload P((struct state * sp)); ! static struct tm * gmtsub P((const time_t * timep, long offset, struct tm * tmp)); ! static struct tm * localsub P((const time_t * timep, long offset, struct tm * tmp)); static int increment_overflow P((int * number, int delta)); static int long_increment_overflow P((long * number, int delta)); *************** *** 147,164 **** int base)); static void settzname P((void)); static time_t time1 P((struct tm * tmp, ! void(*funcp) P((const time_t *, long, struct tm *)), long offset)); static time_t time2 P((struct tm *tmp, ! void(*funcp) P((const time_t *, long, struct tm*)), long offset, int * okayp)); static time_t time2sub P((struct tm *tmp, ! void(*funcp) P((const time_t *, long, struct tm*)), long offset, int * okayp, int do_norm_secs)); ! static void timesub P((const time_t * timep, long offset, const struct state * sp, struct tm * tmp)); static int tmcomp P((const struct tm * atmp, const struct tm * btmp)); --- 148,165 ---- int base)); static void settzname P((void)); static time_t time1 P((struct tm * tmp, ! struct tm * (*funcp) P((const time_t *, long, struct tm *)), long offset)); static time_t time2 P((struct tm *tmp, ! struct tm * (*funcp) P((const time_t *, long, struct tm*)), long offset, int * okayp)); static time_t time2sub P((struct tm *tmp, ! struct tm * (*funcp) P((const time_t *, long, struct tm*)), long offset, int * okayp, int do_norm_secs)); ! static struct tm * timesub P((const time_t * timep, long offset, const struct state * sp, struct tm * tmp)); static int tmcomp P((const struct tm * atmp, const struct tm * btmp)); *************** *** 1033,1039 **** */ /*ARGSUSED*/ ! static void localsub(timep, offset, tmp) const time_t * const timep; const long offset; --- 1034,1040 ---- */ /*ARGSUSED*/ ! static struct tm * localsub(timep, offset, tmp) const time_t * const timep; const long offset; *************** *** 1042,1055 **** register struct state * sp; register const struct ttinfo * ttisp; register int i; const time_t t = *timep; sp = lclptr; #ifdef ALL_STATE ! if (sp == NULL) { ! gmtsub(timep, offset, tmp); ! return; ! } #endif /* defined ALL_STATE */ if (sp->timecnt == 0 || t < sp->ats[0]) { i = 0; --- 1043,1055 ---- register struct state * sp; register const struct ttinfo * ttisp; register int i; + register struct tm * result; const time_t t = *timep; sp = lclptr; #ifdef ALL_STATE ! if (sp == NULL) ! return gmtsub(timep, offset, tmp); #endif /* defined ALL_STATE */ if (sp->timecnt == 0 || t < sp->ats[0]) { i = 0; *************** *** 1071,1082 **** ** t += ttisp->tt_gmtoff; ** timesub(&t, 0L, sp, tmp); */ ! timesub(&t, ttisp->tt_gmtoff, sp, tmp); tmp->tm_isdst = ttisp->tt_isdst; tzname[tmp->tm_isdst] = &sp->chars[ttisp->tt_abbrind]; #ifdef TM_ZONE tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind]; #endif /* defined TM_ZONE */ } struct tm * --- 1071,1083 ---- ** t += ttisp->tt_gmtoff; ** timesub(&t, 0L, sp, tmp); */ ! result = timesub(&t, ttisp->tt_gmtoff, sp, tmp); tmp->tm_isdst = ttisp->tt_isdst; tzname[tmp->tm_isdst] = &sp->chars[ttisp->tt_abbrind]; #ifdef TM_ZONE tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind]; #endif /* defined TM_ZONE */ + return result; } struct tm * *************** *** 1084,1091 **** const time_t * const timep; { tzset(); ! localsub(timep, 0L, &tm); ! return &tm; } /* --- 1085,1091 ---- const time_t * const timep; { tzset(); ! return localsub(timep, 0L, &tm); } /* *************** *** 1097,1104 **** const time_t * const timep; struct tm * tm; { ! localsub(timep, 0L, tm); ! return tm; } /* --- 1097,1103 ---- const time_t * const timep; struct tm * tm; { ! return localsub(timep, 0L, tm); } /* *************** *** 1105,1116 **** ** gmtsub is to gmtime as localsub is to localtime. */ ! static void gmtsub(timep, offset, tmp) const time_t * const timep; const long offset; struct tm * const tmp; { if (!gmt_is_set) { gmt_is_set = TRUE; #ifdef ALL_STATE --- 1104,1117 ---- ** gmtsub is to gmtime as localsub is to localtime. */ ! static struct tm * gmtsub(timep, offset, tmp) const time_t * const timep; const long offset; struct tm * const tmp; { + register struct tm * result; + if (!gmt_is_set) { gmt_is_set = TRUE; #ifdef ALL_STATE *************** *** 1119,1125 **** #endif /* defined ALL_STATE */ gmtload(gmtptr); } ! timesub(timep, offset, gmtptr, tmp); #ifdef TM_ZONE /* ** Could get fancy here and deliver something such as --- 1120,1126 ---- #endif /* defined ALL_STATE */ gmtload(gmtptr); } ! result = timesub(timep, offset, gmtptr, tmp); #ifdef TM_ZONE /* ** Could get fancy here and deliver something such as *************** *** 1139,1144 **** --- 1140,1146 ---- #endif /* State Farm */ } #endif /* defined TM_ZONE */ + return result; } struct tm * *************** *** 1145,1152 **** gmtime(timep) const time_t * const timep; { ! gmtsub(timep, 0L, &tm); ! return &tm; } /* --- 1147,1153 ---- gmtime(timep) const time_t * const timep; { ! return gmtsub(timep, 0L, &tm); } /* *************** *** 1158,1165 **** const time_t * const timep; struct tm * tm; { ! gmtsub(timep, 0L, tm); ! return tm; } #ifdef STD_INSPIRED --- 1159,1165 ---- const time_t * const timep; struct tm * tm; { ! return gmtsub(timep, 0L, tm); } #ifdef STD_INSPIRED *************** *** 1169,1181 **** const time_t * const timep; const long offset; { ! gmtsub(timep, offset, &tm); ! return &tm; } #endif /* defined STD_INSPIRED */ ! static void timesub(timep, offset, sp, tmp) const time_t * const timep; const long offset; --- 1169,1180 ---- const time_t * const timep; const long offset; { ! return gmtsub(timep, offset, &tm); } #endif /* defined STD_INSPIRED */ ! static struct tm * timesub(timep, offset, sp, tmp) const time_t * const timep; const long offset; *************** *** 1275,1280 **** --- 1274,1280 ---- #ifdef TM_GMTOFF tmp->TM_GMTOFF = offset; #endif /* defined TM_GMTOFF */ + return tmp; } char * *************** *** 1391,1397 **** static time_t time2sub(tmp, funcp, offset, okayp, do_norm_secs) struct tm * const tmp; ! void (* const funcp) P((const time_t*, long, struct tm*)); const long offset; int * const okayp; const int do_norm_secs; --- 1391,1397 ---- static time_t time2sub(tmp, funcp, offset, okayp, do_norm_secs) struct tm * const tmp; ! struct tm * (* const funcp) P((const time_t*, long, struct tm*)); const long offset; int * const okayp; const int do_norm_secs; *************** *** 1486,1492 **** */ t = TYPE_SIGNED(time_t) ? 0 : (((unsigned long) 1) << bits); for ( ; ; ) { ! (*funcp)(&t, offset, &mytm); dir = tmcomp(&mytm, &yourtm); if (dir != 0) { if (bits-- < 0) --- 1486,1492 ---- */ t = TYPE_SIGNED(time_t) ? 0 : (((unsigned long) 1) << bits); for ( ; ; ) { ! /* XXX */ (void) (*funcp)(&t, offset, &mytm); dir = tmcomp(&mytm, &yourtm); if (dir != 0) { if (bits-- < 0) *************** *** 1524,1530 **** continue; newt = t + sp->ttis[j].tt_gmtoff - sp->ttis[i].tt_gmtoff; ! (*funcp)(&newt, offset, &mytm); if (tmcomp(&mytm, &yourtm) != 0) continue; if (mytm.tm_isdst != yourtm.tm_isdst) --- 1524,1530 ---- continue; newt = t + sp->ttis[j].tt_gmtoff - sp->ttis[i].tt_gmtoff; ! /* XXX */ (void) (*funcp)(&newt, offset, &mytm); if (tmcomp(&mytm, &yourtm) != 0) continue; if (mytm.tm_isdst != yourtm.tm_isdst) *************** *** 1543,1550 **** if ((newt < t) != (saved_seconds < 0)) return WRONG; t = newt; ! (*funcp)(&t, offset, tmp); ! *okayp = TRUE; return t; } --- 1543,1550 ---- if ((newt < t) != (saved_seconds < 0)) return WRONG; t = newt; ! if ((*funcp)(&t, offset, tmp)) ! *okayp = TRUE; return t; } *************** *** 1551,1557 **** static time_t time2(tmp, funcp, offset, okayp) struct tm * const tmp; ! void (* const funcp) P((const time_t*, long, struct tm*)); const long offset; int * const okayp; { --- 1551,1557 ---- static time_t time2(tmp, funcp, offset, okayp) struct tm * const tmp; ! struct tm * (* const funcp) P((const time_t*, long, struct tm*)); const long offset; int * const okayp; { *************** *** 1569,1575 **** static time_t time1(tmp, funcp, offset) struct tm * const tmp; ! void (* const funcp) P((const time_t *, long, struct tm *)); const long offset; { register time_t t; --- 1569,1575 ---- static time_t time1(tmp, funcp, offset) struct tm * const tmp; ! struct tm * (* const funcp) P((const time_t *, long, struct tm *)); const long offset; { register time_t t;

3 2

Israel 2005 and Beyond -- Proposed Timezone Dates
by Ephraim Silverberg Dec. 21, 2004

Dec. 21, 2004

Yesterday, the Knesset Interior Committee passed a proposed (originally in March 2004) change to the Time Setting Law that would make the dates for DST from 2005 and beyond so that DST starts on the night _after_ the first night of the Passover holiday at midnight until midnight of the Saturday night _before_ the fast of Yom Kippur. Those who can read Hebrew can view the proposal at: ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+.ps The proposal still has to be passed by the Knesset (three readings) for it to become law so I'm not sure if they should be incorporated in the global TZ database, but I'm attaching the diffs just in case. I have only calculated the dates for ten years (2005-2014), but if the law passes, I will write a C programme that will output TZ times for Israel for any given year. I will inform the list if and when the law passes the legislative process and if any amendments are made on the way. ___________________________________________________________________________ Ephraim Silverberg, CSE System Group, Phone number: 972-2-6585521 Hebrew University, Jerusalem, Israel. Fax number: 972-2-5617723 WWW: http://www.cs.huji.ac.il/~ephraim E-mail: ephraim(a)cse.huji.ac.il

2 1

Tzcode2004i.tar.gz
by Olson, Arthur David (NIH/NCI) Dec. 14, 2004

Dec. 14, 2004

The file... ftp://elsie.nci.nih.gov/pub/tzcode2004i.tar.gz ...is now available; this incorporates the changes circulated last week to deal with systems where time_t is unsigned. --ado

1 0

FW: Hokkaido "Daylight Savings Time" experiment last summer
by Olson, Arthur David (NIH/NCI) Dec. 13, 2004

Dec. 13, 2004

Jonathan Lennox is on the time zone mailing list as lennox@cs... --ado -----Original Message----- From: Jonathan Lennox [mailto:lennox@cnr.cs.columbia.edu] Sent: Monday, December 13, 2004 2:28 PM To: List Time Zone (E-mail) Subject: Hokkaido "Daylight Savings Time" experiment last summer I don't think this has been mentioned yet on the time zone list. This past summer, a number of companies in Sapporo, the capital of Hokkaido in northern Japan, experimented with a trial-run of Daylight Savings Time in order to boost the local economy, which seems to have been somewhat successful. The experiment seems to have involved just changing working hours, rather than actually changing the clocks, but there are proposals to apply it officially. News stories, in English: Japan Times: <http://202.221.217.59/print/news/nn08-2004/nn20040819a9.htm> Asahi Shimbun: <http://www.asahi.com/english/nation/TKY200408170187.html> I originally spotted this in this week's issue of The Economist, but given the track record (see the comment on Asia/Baghdad) I thought I'd confirm it elsehwere. -- Jonathan Lennox lennox(a)cs.columbia.edu

1 0

Hokkaido "Daylight Savings Time" experiment last summer
by Jonathan Lennox Dec. 13, 2004

Dec. 13, 2004

I don't think this has been mentioned yet on the time zone list. This past summer, a number of companies in Sapporo, the capital of Hokkaido in northern Japan, experimented with a trial-run of Daylight Savings Time in order to boost the local economy, which seems to have been somewhat successful. The experiment seems to have involved just changing working hours, rather than actually changing the clocks, but there are proposals to apply it officially. News stories, in English: Japan Times: <http://202.221.217.59/print/news/nn08-2004/nn20040819a9.htm> Asahi Shimbun: <http://www.asahi.com/english/nation/TKY200408170187.html> I originally spotted this in this week's issue of The Economist, but given the track record (see the comment on Asia/Baghdad) I thought I'd confirm it elsehwere. -- Jonathan Lennox lennox(a)cs.columbia.edu

1 0

Israel 2005-2007 -- Proposed Timezone Dates
by Ephraim Silverberg Dec. 13, 2004

Dec. 13, 2004

Attached are the diffs to 'asia' in tzdata2004e.tar.gz for the proposed dates for the State of Israel for the years 2005-2007. However, I don't know if they should be incorporated in the global database just yet as they have a long legislative path to pass before getting passed into law especially, as noted in the comments, since the Minister of Interior's own government objects to these dates. Nevertheless, I am sending this to the forum since these are better than no dates at all. Furthermore, even though there are no proposed dates for 2008 and beyond, I changed the default guesses to follow the proposed 2005-2007 rules. ___________________________________________________________________________ Ephraim Silverberg, CSE System Group, Phone number: 972-2-6585521 Hebrew University, Jerusalem, Israel. Fax number: 972-2-5617723 WWW: http://www.cs.huji.ac.il/~ephraim E-mail: ephraim(a)cse.huji.ac.il

2 3

Brazilian Time Zones
by Renato S. de Araujo Dec. 11, 2004

Dec. 11, 2004

I noticed the following abbreviation in the ICU southamerica file for Brazil: FNT, BRT,AMT,ACT and respective ST times for DLS. Brazilian time zones were introduced by a decree in 1913, and although many decrees afterward modified the dates and regions for DSL, no one has changed their names. I understand Reinaldo Goulart comments about official time plus/minus naming of time zones as this is widely used in Brasil, however, officially their names still "Primeiro Fuso, Segundo Fuso, Terceiro Fuso, Quarto Fuso", (First,second,third,fourth fuse respectively, and as you mentioned DSL is know in Brazil as "Summer Time" (Horário de Verão), I would propose changing the names for the time zones as follows: std dsl -2:00 BRPF BRPFHV Fernando de Noronha -3:00 BRSF BRSFHV Brasila -4:00 BRTF BRTFHV Rondonia -5:00 BRQF BRQFHV Acre I suggest removing Amazon as a reference State because part of it is in a different time zone. rgds renato ___________________________________________________________ ALL-NEW Yahoo! Messenger - all new features - even more fun! http://uk.messenger.yahoo.com

1 0

Zic on 64-bit systems
by Olson, Arthur David (NIH/NCI) Dec. 7, 2004

Dec. 7, 2004

The last round of changes made zdump work on systems with variant time_t types and made zic compilable on such systems. The name of the game in this round is to make zic work on systems with variant time_t types. The easy way out (adopted below) is to forego (as much as possible) the use of time_t in zic. I've also included a change to localtime.c to cope with situations where time_t is unsigned on the running system but the data file being used contains signed transition times (and vice versa). I'm hoping this makes it more acceptable to adopt the new tactic of having zic always produce files with signed transition times (even on systems with signed time_t values). (Of course there are bigger fish to fry later to extend the time zone package so that 64-bit transition times can be handled. I'm hoping we can tweak the current system as much as possible before beginning the design discussion needed before frying the bigger fish.) --ado ------- zic.c ------- *** /tmp/geta22008 Tue Dec 7 14:49:46 2004 --- /tmp/getb22008 Tue Dec 7 14:49:46 2004 *************** *** 1,5 **** ! static char elsieid[] = "@(#)zic.c 7.117"; #include "private.h" #include "locale.h" #include "tzfile.h" --- 1,11 ---- ! static char elsieid[] = "@(#)zic.c 7.118"; + /* + ** Regardless of the type of time_t, we do our work using this type. + */ + + typedef long zic_t; + #include "private.h" #include "locale.h" #include "tzfile.h" *************** *** 50,56 **** const char * r_abbrvar; /* variable part of abbreviation */ int r_todo; /* a rule to do (used in outzone) */ ! time_t r_temp; /* used in outzone */ }; /* --- 56,62 ---- const char * r_abbrvar; /* variable part of abbreviation */ int r_todo; /* a rule to do (used in outzone) */ ! zic_t r_temp; /* used in outzone */ }; /* *************** *** 76,82 **** int z_nrules; struct rule z_untilrule; ! time_t z_untiltime; }; extern int getopt P((int argc, char * const argv[], --- 82,88 ---- int z_nrules; struct rule z_untilrule; ! zic_t z_untiltime; }; extern int getopt P((int argc, char * const argv[], *************** *** 85,94 **** extern char * optarg; extern int optind; ! static void addtt P((time_t starttime, int type)); static int addtype P((long gmtoff, const char * abbr, int isdst, int ttisstd, int ttisgmt)); ! static void leapadd P((time_t t, int positive, int rolling, int count)); static void adjleap P((void)); static void associate P((void)); static int ciequal P((const char * ap, const char * bp)); --- 91,100 ---- extern char * optarg; extern int optind; ! static void addtt P((zic_t starttime, int type)); static int addtype P((long gmtoff, const char * abbr, int isdst, int ttisstd, int ttisgmt)); ! static void leapadd P((zic_t t, int positive, int rolling, int count)); static void adjleap P((void)); static void associate P((void)); static int ciequal P((const char * ap, const char * bp)); *************** *** 121,133 **** static void outzone P((const struct zone * zp, int ntzones)); static void puttzcode P((long code, FILE * fp)); static int rcomp P((const void * leftp, const void * rightp)); ! static time_t rpytime P((const struct rule * rp, int wantedy)); static void rulesub P((struct rule * rp, const char * loyearp, const char * hiyearp, const char * typep, const char * monthp, const char * dayp, const char * timep)); static void setboundaries P((void)); ! static time_t tadd P((time_t t1, long t2)); static void usage P((void)); static void writezone P((const char * name)); static int yearistype P((int year, const char * type)); --- 127,139 ---- static void outzone P((const struct zone * zp, int ntzones)); static void puttzcode P((long code, FILE * fp)); static int rcomp P((const void * leftp, const void * rightp)); ! static zic_t rpytime P((const struct rule * rp, int wantedy)); static void rulesub P((struct rule * rp, const char * loyearp, const char * hiyearp, const char * typep, const char * monthp, const char * dayp, const char * timep)); static void setboundaries P((void)); ! static zic_t tadd P((zic_t t1, long t2)); static void usage P((void)); static void writezone P((const char * name)); static int yearistype P((int year, const char * type)); *************** *** 141,150 **** static const char * filename; static int leapcnt; static int linenum; ! static time_t max_time; static int max_year; static int max_year_representable; ! static time_t min_time; static int min_year; static int min_year_representable; static int noise; --- 147,156 ---- static const char * filename; static int leapcnt; static int linenum; ! static zic_t max_time; static int max_year; static int max_year_representable; ! static zic_t min_time; static int min_year; static int min_year_representable; static int noise; *************** *** 334,340 **** }; static struct attype { ! time_t at; unsigned char type; } attypes[TZ_MAX_TIMES]; static long gmtoffs[TZ_MAX_TYPES]; --- 340,346 ---- }; static struct attype { ! zic_t at; unsigned char type; } attypes[TZ_MAX_TIMES]; static long gmtoffs[TZ_MAX_TYPES]; *************** *** 343,349 **** static char ttisstds[TZ_MAX_TYPES]; static char ttisgmts[TZ_MAX_TYPES]; static char chars[TZ_MAX_CHARS]; ! static time_t trans[TZ_MAX_LEAPS]; static long corr[TZ_MAX_LEAPS]; static char roll[TZ_MAX_LEAPS]; --- 349,355 ---- static char ttisstds[TZ_MAX_TYPES]; static char ttisgmts[TZ_MAX_TYPES]; static char chars[TZ_MAX_CHARS]; ! static zic_t trans[TZ_MAX_LEAPS]; static long corr[TZ_MAX_LEAPS]; static char roll[TZ_MAX_LEAPS]; *************** *** 665,671 **** */ #define MAX_BITS_IN_FILE 32 ! #define TIME_T_BITS_IN_FILE ((TYPE_BIT(time_t) < MAX_BITS_IN_FILE) ? TYPE_BIT(time_t) : MAX_BITS_IN_FILE) static void setboundaries P((void)) --- 671,678 ---- */ #define MAX_BITS_IN_FILE 32 ! #define TIME_T_BITS_IN_FILE ((TYPE_BIT(zic_t) < MAX_BITS_IN_FILE) ? \ ! TYPE_BIT(zic_t) : MAX_BITS_IN_FILE) static void setboundaries P((void)) *************** *** 672,678 **** { register int i; ! if (TYPE_SIGNED(time_t)) { min_time = -1; for (i = 0; i < TIME_T_BITS_IN_FILE - 1; ++i) min_time *= 2; --- 679,685 ---- { register int i; ! if (TYPE_SIGNED(zic_t)) { min_time = -1; for (i = 0; i < TIME_T_BITS_IN_FILE - 1; ++i) min_time *= 2; *************** *** 686,693 **** max_time *= 2; --max_time; } ! min_year = TM_YEAR_BASE + gmtime(&min_time)->tm_year; ! max_year = TM_YEAR_BASE + gmtime(&max_time)->tm_year; min_year_representable = min_year; max_year_representable = max_year; } --- 693,706 ---- max_time *= 2; --max_time; } ! { ! time_t t; ! ! t = (time_t) min_time; ! min_year = TM_YEAR_BASE + gmtime(&t)->tm_year; ! t = (time_t) max_time; ! max_year = TM_YEAR_BASE + gmtime(&t)->tm_year; ! } min_year_representable = min_year; max_year_representable = max_year; } *************** *** 1113,1119 **** register int i, j; int year, month, day; long dayoff, tod; ! time_t t; if (nfields != LEAP_FIELDS) { error(_("wrong number of fields on Leap line")); --- 1126,1132 ---- register int i, j; int year, month, day; long dayoff, tod; ! zic_t t; if (nfields != LEAP_FIELDS) { error(_("wrong number of fields on Leap line")); *************** *** 1157,1163 **** return; } dayoff = oadd(dayoff, eitol(day - 1)); ! if (dayoff < 0 && !TYPE_SIGNED(time_t)) { error(_("time before zero")); return; } --- 1170,1176 ---- return; } dayoff = oadd(dayoff, eitol(day - 1)); ! if (dayoff < 0 && !TYPE_SIGNED(zic_t)) { error(_("time before zero")); return; } *************** *** 1169,1175 **** error(_("time too large")); return; } ! t = (time_t) dayoff * SECSPERDAY; tod = gethms(fields[LP_TIME], _("invalid time of day"), FALSE); cp = fields[LP_CORR]; { --- 1182,1188 ---- error(_("time too large")); return; } ! t = (zic_t) dayoff * SECSPERDAY; tod = gethms(fields[LP_TIME], _("invalid time of day"), FALSE); cp = fields[LP_CORR]; { *************** *** 1431,1437 **** register int i, j; static char * fullname; static struct tzhead tzh; ! time_t ats[TZ_MAX_TIMES]; unsigned char types[TZ_MAX_TIMES]; /* --- 1444,1450 ---- register int i, j; static char * fullname; static struct tzhead tzh; ! zic_t ats[TZ_MAX_TIMES]; unsigned char types[TZ_MAX_TIMES]; /* *************** *** 1596,1602 **** register struct rule * rp; register int i, j; register int usestart, useuntil; ! register time_t starttime, untiltime; register long gmtoff; register long stdoff; register int year; --- 1609,1615 ---- register struct rule * rp; register int i, j; register int usestart, useuntil; ! register zic_t starttime, untiltime; register long gmtoff; register long stdoff; register int year; *************** *** 1665,1671 **** } for ( ; ; ) { register int k; ! register time_t jtime, ktime; register long offset; char buf[BUFSIZ]; --- 1678,1684 ---- } for ( ; ; ) { register int k; ! register zic_t jtime, ktime; register long offset; char buf[BUFSIZ]; *************** *** 1777,1783 **** static void addtt(starttime, type) ! const time_t starttime; int type; { if (starttime <= min_time || --- 1790,1796 ---- static void addtt(starttime, type) ! const zic_t starttime; int type; { if (starttime <= min_time || *************** *** 1861,1867 **** static void leapadd(t, positive, rolling, count) ! const time_t t; const int positive; const int rolling; int count; --- 1874,1880 ---- static void leapadd(t, positive, rolling, count) ! const zic_t t; const int positive; const int rolling; int count; *************** *** 2049,2060 **** return t; } ! static time_t tadd(t1, t2) ! const time_t t1; const long t2; { ! register time_t t; if (t1 == max_time && t2 > 0) return max_time; --- 2062,2073 ---- return t; } ! static zic_t tadd(t1, t2) ! const zic_t t1; const long t2; { ! register zic_t t; if (t1 == max_time && t2 > 0) return max_time; *************** *** 2073,2079 **** ** 1970, 00:00 LOCAL time - in that year that the rule refers to. */ ! static time_t rpytime(rp, wantedy) register const struct rule * const rp; register const int wantedy; --- 2086,2092 ---- ** 1970, 00:00 LOCAL time - in that year that the rule refers to. */ ! static zic_t rpytime(rp, wantedy) register const struct rule * const rp; register const int wantedy; *************** *** 2080,2086 **** { register int y, m, i; register long dayoff; /* with a nod to Margaret O. */ ! register time_t t; if (wantedy == INT_MIN) return min_time; --- 2093,2099 ---- { register int y, m, i; register long dayoff; /* with a nod to Margaret O. */ ! register zic_t t; if (wantedy == INT_MIN) return min_time; *************** *** 2147,2159 **** warning(_("rule goes past start/end of month--will not work with pre-2004 versions of zic")); } } ! if (dayoff < 0 && !TYPE_SIGNED(time_t)) return min_time; if (dayoff < min_time / SECSPERDAY) return min_time; if (dayoff > max_time / SECSPERDAY) return max_time; ! t = (time_t) dayoff * SECSPERDAY; return tadd(t, rp->r_tod); } --- 2160,2172 ---- warning(_("rule goes past start/end of month--will not work with pre-2004 versions of zic")); } } ! if (dayoff < 0 && !TYPE_SIGNED(zic_t)) return min_time; if (dayoff < min_time / SECSPERDAY) return min_time; if (dayoff > max_time / SECSPERDAY) return max_time; ! t = (zic_t) dayoff * SECSPERDAY; return tadd(t, rp->r_tod); } ------- localtime.c ------- *** /tmp/geta22026 Tue Dec 7 14:49:46 2004 --- /tmp/getb22026 Tue Dec 7 14:49:46 2004 *************** *** 2,10 **** ** XXX--do the right thing if time_t is double and ** the value fed to gmtime or localtime is very very negative or ** very very positive (which causes problems with the days-and-rem logic). - ** Also: what of systems where time_t is unsigned - ** (in particular when used on date files generated on systems where - ** time_t is signed). */ /* --- 2,7 ---- *************** *** 14,20 **** #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)localtime.c 7.82"; #endif /* !defined NOID */ #endif /* !defined lint */ --- 11,17 ---- #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)localtime.c 7.83"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 418,423 **** --- 415,447 ---- return -1; } } + /* + ** Out-of-sort ats should mean we're running on a + ** signed time_t system but using a data file with + ** unsigned values (or vice versa). + */ + for (i = 0; i < sp->timecnt - 2; ++i) + if (sp->ats[i] > sp->ats[i + 1]) { + ++i; + if (TYPE_SIGNED(time_t)) { + /* + ** Ignore the end (easy). + */ + sp->timecnt = i; + } else { + /* + ** Ignore the beginning (harder). + */ + register int j; + + for (j = 0; j + i < sp->timecnt; ++j) { + sp->ats[j] = sp->ats[j + i]; + sp->types[j] = sp->types[j + i]; + } + sp->timecnt = j; + } + break; + } } return 0; }

1 0

Tzcode2004h.tar.gz
by Olson, Arthur David (NIH/NCI) Dec. 7, 2004

Dec. 7, 2004

The file... ftp://elsie.nci.nih.gov/pub/tzcode200h.tar.gz ...is now available; this incorporates the 64-bit-time_t changes (most importantly to zdump.c) circulated last week on the time zone mailing list. Our long time_t nightmare is (almost) over. --ado

1 0

Zdump continued
by Olson, Arthur David (NIH/NCI) Nov. 29, 2004

Nov. 29, 2004

To go along with the new version of zdump.c from the previous message, here are changes to other files. 1. Changes to zdump.8 to document the way to set both the low and high cutoff years and to give the defaults for the cutoffs. 2. Changes to Makefile to let you "make typecheck" as a way of checking compilability and (some) workability on systems with variant time_t types. 3. Changes to localtime.c to make it compilable on systems where time_t is floating and to fix days-between-two-years calculations for negative years. 4. Changes to zic.c to make it compilable on systems where time_t is floating. There's more to do to make stuff workable (not just compilable) on systems with unsigned or floating time_t types. Oh and yes: in the last message I should have mentioned that zdump has been goosed to work on systems where localtime or gmtime return NULL. --ado diff -r -c old/zdump.8 new/zdump.8 *** old/zdump.8 Tue Oct 26 17:29:31 2004 --- new/zdump.8 Mon Nov 22 10:49:25 2004 *************** *** 10,16 **** .B \-v ] [ .B \-c ! cutoffyear ] [ zonename ... ] .SH DESCRIPTION .I Zdump prints the current time in each --- 10,16 ---- .B \-v ] [ .B \-c ! [loyear,]hiyear ] [ zonename ... ] .SH DESCRIPTION .I Zdump prints the current time in each *************** *** 38,45 **** .B isdst=0 otherwise. .TP ! .BI "\-c " cutoffyear ! Cut off the verbose output near the start of the given year. .SH "SEE ALSO" newctime(3), tzfile(5), zic(8) ! .\" @(#)zdump.8 7.4 --- 38,57 ---- .B isdst=0 otherwise. .TP ! .BI "\-c " [loyear,]hiyear ! Cut off verbose output near the start of the given year(s). ! By default, ! the program cuts off verbose output near the starts of the years -500 and 2500. ! .SH LIMITATIONS ! The ! .B \-v ! option may not be used on systems with floating-point time_t values ! that are neither float nor double. ! .PP ! Time discontinuities are found by sampling the results returned by localtime ! at twelve-hour intervals. ! This works in all real-world cases; ! one can construct artificial time zones for which this fails. .SH "SEE ALSO" newctime(3), tzfile(5), zic(8) ! .\" @(#)zdump.8 7.7 diff -r -c old/localtime.c new/localtime.c *** old/localtime.c Tue Oct 26 17:29:30 2004 --- new/localtime.c Mon Nov 29 12:18:27 2004 *************** *** 1,4 **** --- 1,13 ---- /* + ** XXX--do the right thing if time_t is double and + ** the value fed to gmtime or localtime is very very negative or + ** very very positive (which causes problems with the days-and-rem logic). + ** Also: what of systems where time_t is unsigned + ** (in particular when used on date files generated on systems where + ** time_t is signed). + */ + + /* ** This file is in the public domain, so clarified as of ** 1996-06-05 by Arthur David Olson (arthur_david_olson(a)nih.gov) */ *************** *** 5,11 **** #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)localtime.c 7.80"; #endif /* !defined NOID */ #endif /* !defined lint */ --- 14,20 ---- #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)localtime.c 7.82"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 1188,1194 **** } } days = *timep / SECSPERDAY; ! rem = *timep % SECSPERDAY; #ifdef mc68k if (*timep == 0x80000000) { /* --- 1197,1203 ---- } } days = *timep / SECSPERDAY; ! rem = *timep - ((time_t) days) * SECSPERDAY; #ifdef mc68k if (*timep == 0x80000000) { /* *************** *** 1219,1225 **** if (tmp->tm_wday < 0) tmp->tm_wday += DAYSPERWEEK; y = EPOCH_YEAR; ! #define LEAPS_THRU_END_OF(y) ((y) / 4 - (y) / 100 + (y) / 400) while (days < 0 || days >= (long) year_lengths[yleap = isleap(y)]) { register long newy; --- 1228,1235 ---- if (tmp->tm_wday < 0) tmp->tm_wday += DAYSPERWEEK; y = EPOCH_YEAR; ! #define IPQ(i, p) ((i) / (p) - (((i) % (p)) < 0)) ! #define LEAPS_THRU_END_OF(y) (IPQ((y), 4) - IPQ((y), 100) + IPQ((y), 400)) while (days < 0 || days >= (long) year_lengths[yleap = isleap(y)]) { register long newy; *************** *** 1450,1456 **** ** assuming two's complement arithmetic. ** If time_t is unsigned, then (1 << bits) is just above the median. */ ! t = TYPE_SIGNED(time_t) ? 0 : (((time_t) 1) << bits); for ( ; ; ) { (*funcp)(&t, offset, &mytm); dir = tmcomp(&mytm, &yourtm); --- 1460,1466 ---- ** assuming two's complement arithmetic. ** If time_t is unsigned, then (1 << bits) is just above the median. */ ! t = TYPE_SIGNED(time_t) ? 0 : (((unsigned long) 1) << bits); for ( ; ; ) { (*funcp)(&t, offset, &mytm); dir = tmcomp(&mytm, &yourtm); *************** *** 1460,1467 **** if (bits < 0) --t; /* may be needed if new t is minimal */ else if (dir > 0) ! t -= ((time_t) 1) << bits; ! else t += ((time_t) 1) << bits; continue; } if (yourtm.tm_isdst < 0 || mytm.tm_isdst == yourtm.tm_isdst) --- 1470,1477 ---- if (bits < 0) --t; /* may be needed if new t is minimal */ else if (dir > 0) ! t -= ((long) 1) << bits; ! else t += ((long) 1) << bits; continue; } if (yourtm.tm_isdst < 0 || mytm.tm_isdst == yourtm.tm_isdst) diff -r -c old/Makefile new/Makefile *** old/Makefile Tue Oct 26 17:29:30 2004 --- new/Makefile Mon Nov 29 12:32:25 2004 *************** *** 1,4 **** ! # @(#)Makefile 7.98 # Change the line below for your time zone (after finding the zone you want in # the time zone files, or adding it to a time zone file). --- 1,4 ---- ! # @(#)Makefile 7.101 # Change the line below for your time zone (after finding the zone you want in # the time zone files, or adding it to a time zone file). *************** *** 91,97 **** # -DHAVE_GETTEXT=1 if `gettext' works (GNU, Linux, Solaris); also see LDLIBS # -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard (Solaris 8). - # -DHAVE_LONG_DOUBLE=1 if your compiler supports the `long double' type # -DHAVE_SETTIMEOFDAY=0 if settimeofday does not exist (SVR0?) # -DHAVE_SETTIMEOFDAY=1 if settimeofday has just 1 arg (SVR4) # -DHAVE_SETTIMEOFDAY=2 if settimeofday uses 2nd arg (4.3BSD) --- 91,96 ---- *************** *** 395,400 **** --- 394,411 ---- tar cf - $(DOCS) $(SOURCES) $(MISC) *.[1-8].txt | gzip -9 > tzcode.tar.gz tar cf - $(DATA) | gzip -9 > tzdata.tar.gz + typecheck: + make clean + make CFLAGS=-Wp,-D_TIME_T,-Dtime_t=long\\\ long + ./zdump -v US/Eastern + make clean + make CFLAGS=-Wp,-D_TIME_T,-Dtime_t=double + ./zdump -v US/Eastern + make clean + make CFLAGS=-Wp,-D_TIME_T,-Dtime_t=unsigned + ./zdump -v US/Eastern + make clean + zonenames: $(TDATA) @$(AWK) '/^Zone/ { print $$2 } /^Link/ { print $$3 }' $(TDATA) diff -r -c old/zic.c new/zic.c *** old/zic.c Tue Oct 26 17:29:29 2004 --- new/zic.c Mon Nov 29 12:11:10 2004 *************** *** 1,4 **** ! static char elsieid[] = "@(#)zic.c 7.116"; #include "private.h" #include "locale.h" --- 1,4 ---- ! static char elsieid[] = "@(#)zic.c 7.117"; #include "private.h" #include "locale.h" *************** *** 670,685 **** static void setboundaries P((void)) { if (TYPE_SIGNED(time_t)) { ! min_time = ~ (time_t) 0; ! min_time <<= TIME_T_BITS_IN_FILE - 1; ! max_time = ~ (time_t) 0 - min_time; if (sflag) min_time = 0; } else { min_time = 0; max_time = 2 - sflag; ! max_time <<= TIME_T_BITS_IN_FILE - 1; --max_time; } min_year = TM_YEAR_BASE + gmtime(&min_time)->tm_year; --- 670,689 ---- static void setboundaries P((void)) { + register int i; + if (TYPE_SIGNED(time_t)) { ! min_time = -1; ! for (i = 0; i < TIME_T_BITS_IN_FILE - 1; ++i) ! min_time *= 2; ! max_time = -(min_time + 1); if (sflag) min_time = 0; } else { min_time = 0; max_time = 2 - sflag; ! for (i = 0; i < TIME_T_BITS_IN_FILE - 1; ++i) ! max_time *= 2; --max_time; } min_year = TM_YEAR_BASE + gmtime(&min_time)->tm_year;

1 0

Zdump for 64-bit systems
by Olson, Arthur David (NIH/NCI) Nov. 29, 2004

Nov. 29, 2004

Below find a version of zdump.c designed to work on systems where time_t is 64 bits. Some associated changes to other files are to follow in my next message. --ado static char elsieid[] = "@(#)zdump.c 7.57"; /* ** This code has been made independent of the rest of the time ** conversion package to increase confidence in the verification it provides. ** You can use this code to help in verifying other implementations. */ #include "stdio.h" /* for stdout, stderr, perror */ #include "string.h" /* for strcpy */ #include "sys/types.h" /* for time_t */ #include "time.h" /* for struct tm */ #include "stdlib.h" /* for exit, malloc, atoi */ #include "float.h" /* for FLT_MAX and DBL_MAX */ #ifndef ZDUMP_LO_YEAR #define ZDUMP_LO_YEAR (-500) #endif /* !defined ZDUMP_LO_YEAR */ #ifndef ZDUMP_HI_YEAR #define ZDUMP_HI_YEAR 2500 #endif /* !defined ZDUMP_HI_YEAR */ #ifndef MAX_STRING_LENGTH #define MAX_STRING_LENGTH 1024 #endif /* !defined MAX_STRING_LENGTH */ #ifndef TRUE #define TRUE 1 #endif /* !defined TRUE */ #ifndef FALSE #define FALSE 0 #endif /* !defined FALSE */ #ifndef EXIT_SUCCESS #define EXIT_SUCCESS 0 #endif /* !defined EXIT_SUCCESS */ #ifndef EXIT_FAILURE #define EXIT_FAILURE 1 #endif /* !defined EXIT_FAILURE */ #ifndef SECSPERMIN #define SECSPERMIN 60 #endif /* !defined SECSPERMIN */ #ifndef MINSPERHOUR #define MINSPERHOUR 60 #endif /* !defined MINSPERHOUR */ #ifndef SECSPERHOUR #define SECSPERHOUR (SECSPERMIN * MINSPERHOUR) #endif /* !defined SECSPERHOUR */ #ifndef HOURSPERDAY #define HOURSPERDAY 24 #endif /* !defined HOURSPERDAY */ #ifndef EPOCH_YEAR #define EPOCH_YEAR 1970 #endif /* !defined EPOCH_YEAR */ #ifndef TM_YEAR_BASE #define TM_YEAR_BASE 1900 #endif /* !defined TM_YEAR_BASE */ #ifndef DAYSPERNYEAR #define DAYSPERNYEAR 365 #endif /* !defined DAYSPERNYEAR */ #ifndef isleap #define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0)) #endif /* !defined isleap */ #ifndef isleap_sum /* ** See tzfile.h for details on isleap_sum. */ #define isleap_sum(a, b) isleap((a) % 400 + (b) % 400) #endif /* !defined isleap_sum */ #define SECSPERDAY ((long) SECSPERHOUR * HOURSPERDAY) #define SECSPERNYEAR (SECSPERDAY * DAYSPERNYEAR) #define SECSPERLYEAR (SECSPERNYEAR + SECSPERDAY) #if HAVE_GETTEXT #include "locale.h" /* for setlocale */ #include "libintl.h" #endif /* HAVE_GETTEXT */ #ifndef GNUC_or_lint #ifdef lint #define GNUC_or_lint #else /* !defined lint */ #ifdef __GNUC__ #define GNUC_or_lint #endif /* defined __GNUC__ */ #endif /* !defined lint */ #endif /* !defined GNUC_or_lint */ #ifndef INITIALIZE #ifdef GNUC_or_lint #define INITIALIZE(x) ((x) = 0) #else /* !defined GNUC_or_lint */ #define INITIALIZE(x) #endif /* !defined GNUC_or_lint */ #endif /* !defined INITIALIZE */ /* ** For the benefit of GNU folk... ** `_(MSGID)' uses the current locale's message library string for MSGID. ** The default is to use gettext if available, and use MSGID otherwise. */ #ifndef _ #if HAVE_GETTEXT #define _(msgid) gettext(msgid) #else /* !HAVE_GETTEXT */ #define _(msgid) msgid #endif /* !HAVE_GETTEXT */ #endif /* !defined _ */ #ifndef TZ_DOMAIN #define TZ_DOMAIN "tz" #endif /* !defined TZ_DOMAIN */ #ifndef P #ifdef __STDC__ #define P(x) x #else /* !defined __STDC__ */ #define P(x) () #endif /* !defined __STDC__ */ #endif /* !defined P */ extern char ** environ; extern int getopt P((int argc, char * const argv[], const char * options)); extern char * optarg; extern int optind; extern char * tzname[2]; static time_t absolute_min_time; static time_t absolute_max_time; static size_t longest; static char * progname; static char * abbr P((struct tm * tmp)); static long delta P((struct tm * newp, struct tm * oldp)); static void dumptime P((const struct tm * tmp)); static time_t hunt P((char * name, time_t lot, time_t hit)); static void setabsolutes(); static void show P((char * zone, time_t t, int v)); static time_t yeartot P((long y)); int main(argc, argv) int argc; char * argv[]; { register int i; register int c; register int vflag; register char * cutarg; register long cutloyear = ZDUMP_LO_YEAR; register long cuthiyear = ZDUMP_HI_YEAR; register time_t cutlotime; register time_t cuthitime; register char ** fakeenv; time_t now; time_t t; time_t newt; struct tm tm; struct tm newtm; register struct tm * tmp; register struct tm * newtmp; INITIALIZE(cutlotime); INITIALIZE(cuthitime); #if HAVE_GETTEXT (void) setlocale(LC_MESSAGES, ""); #ifdef TZ_DOMAINDIR (void) bindtextdomain(TZ_DOMAIN, TZ_DOMAINDIR); #endif /* defined TEXTDOMAINDIR */ (void) textdomain(TZ_DOMAIN); #endif /* HAVE_GETTEXT */ progname = argv[0]; for (i = 1; i < argc; ++i) if (strcmp(argv[i], "--version") == 0) { (void) printf("%s\n", elsieid); (void) exit(EXIT_SUCCESS); } vflag = 0; cutarg = NULL; while ((c = getopt(argc, argv, "c:v")) == 'c' || c == 'v') if (c == 'v') vflag = 1; else cutarg = optarg; if ((c != EOF && c != -1) || (optind == argc - 1 && strcmp(argv[optind], "=") == 0)) { (void) fprintf(stderr, _("%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"), progname, progname); (void) exit(EXIT_FAILURE); } if (vflag) { if (cutarg != NULL) { long lo; long hi; char c; if (sscanf(cutarg, "%ld%c", &hi, &c) == 1) { cuthiyear = hi; } else if (sscanf(cutarg, "%ld,%ld%c", &lo, &hi, &c) == 2) { cutloyear = lo; cuthiyear = hi; } else { (void) fprintf(stderr, _("%s: wild -c argument %s\n"), progname, cutarg); (void) exit(EXIT_FAILURE); } } setabsolutes(); cutlotime = yeartot(cutloyear); cuthitime = yeartot(cuthiyear); } (void) time(&now); longest = 0; for (i = optind; i < argc; ++i) if (strlen(argv[i]) > longest) longest = strlen(argv[i]); { register int from; register int to; for (i = 0; environ[i] != NULL; ++i) continue; fakeenv = (char **) malloc((size_t) ((i + 2) * sizeof *fakeenv)); if (fakeenv == NULL || (fakeenv[0] = (char *) malloc(longest + 4)) == NULL) { (void) perror(progname); (void) exit(EXIT_FAILURE); } to = 0; (void) strcpy(fakeenv[to++], "TZ="); for (from = 0; environ[from] != NULL; ++from) if (strncmp(environ[from], "TZ=", 3) != 0) fakeenv[to++] = environ[from]; fakeenv[to] = NULL; environ = fakeenv; } for (i = optind; i < argc; ++i) { static char buf[MAX_STRING_LENGTH]; (void) strcpy(&fakeenv[0][3], argv[i]); if (!vflag) { show(argv[i], now, FALSE); continue; } t = absolute_min_time; show(argv[i], t, TRUE); t += SECSPERHOUR * HOURSPERDAY; show(argv[i], t, TRUE); if (t < cutlotime) t = cutlotime; tmp = localtime(&t); if (tmp != NULL) { tm = *tmp; (void) strncpy(buf, abbr(&tm), (sizeof buf) - 1); } for ( ; ; ) { if (t >= cuthitime) break; newt = t + SECSPERHOUR * 12; if (newt >= cuthitime) break; if (newt <= t) break; newtmp = localtime(&newt); if (newtmp != NULL) newtm = *newtmp; if ((tmp == NULL || newtmp == NULL) ? (tmp != newtmp) : (delta(&newtm, &tm) != (newt - t) || newtm.tm_isdst != tm.tm_isdst || strcmp(abbr(&newtm), buf) != 0)) { newt = hunt(argv[i], t, newt); newtmp = localtime(&newt); if (newtmp != NULL) { newtm = *newtmp; (void) strncpy(buf, abbr(&newtm), (sizeof buf) - 1); } } t = newt; tm = newtm; tmp = newtmp; } t = absolute_max_time; t -= SECSPERHOUR * HOURSPERDAY; show(argv[i], t, TRUE); t += SECSPERHOUR * HOURSPERDAY; show(argv[i], t, TRUE); } if (fflush(stdout) || ferror(stdout)) { (void) fprintf(stderr, "%s: ", progname); (void) perror(_("Error writing standard output")); (void) exit(EXIT_FAILURE); } exit(EXIT_SUCCESS); /* If exit fails to exit... */ return EXIT_FAILURE; } static void setabsolutes() { if (0.5 == (time_t) 0.5) { /* ** time_t is floating. */ if (sizeof (time_t) == sizeof (float)) { absolute_min_time = (time_t) -FLT_MAX; absolute_max_time = (time_t) FLT_MAX; } else if (sizeof (time_t) == sizeof (double)) { absolute_min_time = (time_t) -DBL_MAX; absolute_max_time = (time_t) DBL_MAX; } else { (void) fprintf(stderr, _("%s: use of -v on system with floating time_t other than float or double\n"), progname); (void) exit(EXIT_FAILURE); } } else if (0 > (time_t) -1) { /* ** time_t is signed. */ register time_t hibit; for (hibit = 1; (hibit * 2) != 0; hibit *= 2) continue; absolute_min_time = hibit; absolute_max_time = -(hibit + 1); } else { /* ** time_t is unsigned. */ absolute_min_time = 0; absolute_max_time = absolute_min_time - 1; } } static time_t yeartot(y) const long y; { register long myy; register long seconds; register time_t t; myy = EPOCH_YEAR; t = 0; while (myy != y) { if (myy < y) { seconds = isleap(myy) ? SECSPERLYEAR : SECSPERNYEAR; ++myy; if (t > absolute_max_time - seconds) { t = absolute_max_time; break; } t += seconds; } else { --myy; seconds = isleap(myy) ? SECSPERLYEAR : SECSPERNYEAR; if (t < absolute_min_time + seconds) { t = absolute_min_time; break; } t -= seconds; } } return t; } static time_t hunt(name, lot, hit) char * name; time_t lot; time_t hit; { time_t t; long diff; struct tm lotm; register struct tm * lotmp; struct tm tm; register struct tm * tmp; char loab[MAX_STRING_LENGTH]; lotmp = localtime(&lot); if (lotmp != NULL) { lotm = *lotmp; (void) strncpy(loab, abbr(&lotm), (sizeof loab) - 1); } for ( ; ; ) { diff = (long) (hit - lot); if (diff < 2) break; t = lot; t += diff / 2; if (t <= lot) ++t; else if (t >= hit) --t; tmp = localtime(&t); if (tmp != NULL) tm = *tmp; if ((lotmp == NULL || tmp == NULL) ? (lotmp == tmp) : (delta(&tm, &lotm) == (t - lot) && tm.tm_isdst == lotm.tm_isdst && strcmp(abbr(&tm), loab) == 0)) { lot = t; lotm = tm; lotmp = tmp; } else hit = t; } show(name, lot, TRUE); show(name, hit, TRUE); return hit; } /* ** Thanks to Paul Eggert (eggert(a)twinsun.com) for logic used in delta. */ static long delta(newp, oldp) struct tm * newp; struct tm * oldp; { register long result; register int tmy; if (newp->tm_year < oldp->tm_year) return -delta(oldp, newp); result = 0; for (tmy = oldp->tm_year; tmy < newp->tm_year; ++tmy) result += DAYSPERNYEAR + isleap_sum(tmy, TM_YEAR_BASE); result += newp->tm_yday - oldp->tm_yday; result *= HOURSPERDAY; result += newp->tm_hour - oldp->tm_hour; result *= MINSPERHOUR; result += newp->tm_min - oldp->tm_min; result *= SECSPERMIN; result += newp->tm_sec - oldp->tm_sec; return result; } static void show(zone, t, v) char * zone; time_t t; int v; { register struct tm * tmp; (void) printf("%-*s ", (int) longest, zone); if (v) { tmp = gmtime(&t); if (tmp == NULL) { (void) printf("%g", (double) t); } else { dumptime(tmp); (void) printf(" UTC"); } (void) printf(" = "); } tmp = localtime(&t); dumptime(tmp); if (tmp != NULL) { if (*abbr(tmp) != '\0') (void) printf(" %s", abbr(tmp)); if (v) { (void) printf(" isdst=%d", tmp->tm_isdst); #ifdef TM_GMTOFF (void) printf(" gmtoff=%ld", tmp->TM_GMTOFF); #endif /* defined TM_GMTOFF */ } } (void) printf("\n"); } static char * abbr(tmp) struct tm * tmp; { register char * result; static char nada; if (tmp->tm_isdst != 0 && tmp->tm_isdst != 1) return &nada; result = tzname[tmp->tm_isdst]; return (result == NULL) ? &nada : result; } static void dumptime(timeptr) register const struct tm * timeptr; { static const char wday_name[][3] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; static const char mon_name[][3] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; register const char * wn; register const char * mn; register int lead; register int trail; if (timeptr == NULL) { (void) printf("NULL"); return; } /* ** The packaged versions of localtime and gmtime never put out-of-range ** values in tm_wday or tm_mon, but since this code might be compiled ** with other (perhaps experimental) versions, paranoia is in order. */ if (timeptr->tm_wday < 0 || timeptr->tm_wday >= (int) (sizeof wday_name / sizeof wday_name[0])) wn = "???"; else wn = wday_name[timeptr->tm_wday]; if (timeptr->tm_mon < 0 || timeptr->tm_mon >= (int) (sizeof mon_name / sizeof mon_name[0])) mn = "???"; else mn = mon_name[timeptr->tm_mon]; (void) printf("%.3s %.3s%3d %.2d:%.2d:%.2d ", wn, mn, timeptr->tm_mday, timeptr->tm_hour, timeptr->tm_min, timeptr->tm_sec); #define DIVISOR 10 trail = timeptr->tm_year % DIVISOR + TM_YEAR_BASE % DIVISOR; lead = timeptr->tm_year / DIVISOR + TM_YEAR_BASE / DIVISOR + trail / DIVISOR; trail %= DIVISOR; if (trail < 0 && lead > 0) { trail += DIVISOR; --lead; } else if (lead < 0 && trail > 0) { trail -= DIVISOR; ++lead; } if (lead == 0) (void) printf("%d", trail); else (void) printf("%d%d", lead, ((trail < 0) ? -trail : trail)); }

1 0

Re: comments on README and AK time zones
by Paul Eggert Nov. 10, 2004

Nov. 10, 2004

Thanks very much for the detailed historical info about Alaska. May we have permission to adapt those comments for use in the "northamerica" file of the tz database? Also, do you happen to have the exact dates and times for the official transitions for Juneau in 1980? Also, how well did the change "take"? This would seem to be the most urgent correction to the existing database.

2 2

Tzcode2004g.tar.gz and tzdata2004g.tar.gz
by Olson, Arthur David (NIH/NCI) Nov. 8, 2004

Nov. 8, 2004

The files ftp://elsie.nci.nih.gov/pub/tzcode2004g.tar.gz and ftp://elsie.nci.nih.gov/pub/tzdata2004g.tar.gz are now available. The most important change is the update to Cuba (taking effect this weekend); the other changes circulated yesterday by Paul Eggert are includes, as well as a correction of the spelling of Oslo and changed versions of difftime.c and private.h. --ado

2 1

date.c
by Olson, Arthur David (NIH/NCI) Nov. 8, 2004

Nov. 8, 2004

Below find proposed changes to date.c to improve handling of locales and to avoid overflow problems on systems with both 64-bit time_t values. These are variations on Paul Eggert's theme. --ado ------- date.c ------- *** /tmp/geta8752 Mon Nov 8 10:43:48 2004 --- /tmp/getb8752 Mon Nov 8 10:43:48 2004 *************** *** 1,6 **** #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)date.c 7.38"; /* ** Modified from the UCB version with the SCCS ID appearing below. */ --- 1,6 ---- #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)date.c 7.40"; /* ** Modified from the UCB version with the SCCS ID appearing below. */ *************** *** 116,129 **** INITIALIZE(dsttime); INITIALIZE(adjust); INITIALIZE(t); ! #if HAVE_GETTEXT - 0 ! (void) setlocale(LC_MESSAGES, ""); #ifdef TZ_DOMAINDIR (void) bindtextdomain(TZ_DOMAIN, TZ_DOMAINDIR); #endif /* defined(TEXTDOMAINDIR) */ (void) textdomain(TZ_DOMAIN); ! #endif /* HAVE_GETTEXT - 0 */ ! (void) setlocale(LC_TIME, ""); (void) time(&now); format = value = NULL; while ((ch = getopt(argc, argv, "ucnd:t:a:")) != EOF && ch != -1) { --- 116,130 ---- INITIALIZE(dsttime); INITIALIZE(adjust); INITIALIZE(t); ! #ifdef LC_ALL ! (void) setlocale(LC_ALL, ""); ! #endif /* defined(LC_ALL) */ ! #if HAVE_GETTEXT #ifdef TZ_DOMAINDIR (void) bindtextdomain(TZ_DOMAIN, TZ_DOMAINDIR); #endif /* defined(TEXTDOMAINDIR) */ (void) textdomain(TZ_DOMAIN); ! #endif /* HAVE_GETTEXT */ (void) time(&now); format = value = NULL; while ((ch = getopt(argc, argv, "ucnd:t:a:")) != EOF && ch != -1) { *************** *** 630,637 **** time_t outt; tm = *localtime(&t); ! cent = (tm.tm_year + TM_YEAR_BASE) / 100; ! year_in_cent = (tm.tm_year + TM_YEAR_BASE) - cent * 100; month = tm.tm_mon + 1; day = tm.tm_mday; hour = tm.tm_hour; --- 631,645 ---- time_t outt; tm = *localtime(&t); ! #define DIVISOR 100 ! year_in_cent = tm.tm_year % DIVISOR + TM_YEAR_BASE % DIVISOR; ! cent = tm.tm_year / DIVISOR + TM_YEAR_BASE / DIVISOR + ! year_in_cent / DIVISOR; ! year_in_cent %= DIVISOR; ! if (year_in_cent < 0) { ! year_in_cent += DIVISOR; ! --cent; ! } month = tm.tm_mon + 1; day = tm.tm_mday; hour = tm.tm_hour;

1 0

Re: Time Zone change in GEORGIA (Eastern Europe), time zone is no w GMT+3 (no longer GMT+4)
by Aiet Kolkhi Nov. 4, 2004

Nov. 4, 2004

Hmm, interesting discussion. > By that reasoning, since France and the United States belonged to > SEATO (the South-East Asia Treaty Organization), they must be > Southeast Asian countries. I agree with the fact that since a country once belonged to SEATO is not a reason enough to consider a country Asian, but being a EU member, thus being a part of Europian economy, Europian jurisprudence (and bringing your legislation into line with over 90 000 pages of regulations controling everything from fiscal policies to banana-quality standards, like Kim Iskyan suggested), having Euro as a national currency, also being culturally, historically and religiously more Europian than Asian, being a geographical part of Europe, being a member of Europian Council, being politically targeted to Euro-intergration, being a historical and genetic ancestor of all the Europian people, being a member of UN Economic Commission of Europe, adhering EU dst rules, should, in my ipinion, let us think about considering putting the country link in Europian region as well :) Is there any rule that would let us decide whether a country is purely Asian or Europian one? Do we consider the historical, cultural, racial, political, religous and geographical factors, or just geographical? Has there ever been a strict definition where the border between Europe and Asia lies? I think when deviding Europe and Asia historicans or geographers usually considered the cultural background, along with current political state of a country. A clear example can be Byzantine empire, which was purely-europian and it would be improper to refer to it as an Asian country or empire, but since taken over by Ottoman Empire in 15th cent. AD, the country became purely Asian and very little remained from the Byzantine culture, behavour and spirit. Untill 19th cent., it would be improper to refer to Turkey (or Ottoman Empire) as Europian. After that period, Mustafa Kemal Ataturk chose more or less wetern political direction, which led to present-day Turkey, which, along with its Asian culture, is becoming a part of Europe too. What I want to say is that as borders and definitions of countries and empires change as time goes by, so does the geographical definitions of them. Eugene Volokh has some interesting views on the subject too: http://www.mail-archive.com/volokh-l@lists.ucla.edu/msg02346.html and http://www.mail-archive.com/volokh-l@lists.ucla.edu/msg02474.html > OK, to do that, in my next proposed update I'll add a cross > reference from the "europe" file to the "asia" file. We already do > this sort of thing for Turkey and Russia, two other countries that > straddle the boundary between Europe and Asia. I've drafted this > change: Yes, I think that would be the best solution. > I agree with the approach, but I would not recommend the text you have. As I > said, the best reference in all such cases is the UN Statistics Division: > http://unstats.un.org/unsd/methods/m49/m49regin.htm. That is, for example, > what the proposed successor to RFC 3066 (language tags, as used in HTML and > XML) is using. And according to that, Georgia is in Asia. I am not sure if we can rely on it as the only source. Like I mention above, the UN itself is not strict with its division of Europe and Asia, as there are many "Euroasian" countries in its Europian commissions. When it comes to RFC country-specific standards and language codes, we can definetely refer to it as a standard and try to correct any irregularities right there at first, should the case concern the language or country codes, though not when we are talking about defining a country as Europian or Asian. Sorry for the long mail :) Regards, Aiet

2 1

tz update?
by Ryan Kennedy Nov. 3, 2004

Nov. 3, 2004

Hello, I just have a quick question I am hoping someone can help me out with. I am trying to find a way out that I can be notified when the TZ data gets changed/updated. Or if there's nothing like that, is there a site I can visit that will give me that information? thank you, Ryan Kennedy Ryan Kennedy Sayson Tech. Ryan.Kennedy(a)sayson.com

1 0

Chinese local time
by Komka Péter Nov. 3, 2004

Nov. 3, 2004

For China (all territories) the zone line (perhaps) should look like..: # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/China 8:00 - CST Source: http://en.wikipedia.org/wiki/Daylight_saving_time

1 0

RE: difftime
by Olson, Arthur David (NIH/NCI) Nov. 2, 2004

Nov. 2, 2004

Yet another iteration on difftime.c. --ado /* ** This file is in the public domain, so clarified as of ** 1996-06-05 by Arthur David Olson (arthur_david_olson(a)nih.gov) */ #ifndef lint #ifndef NOID static char elsieid[] = "%W%"; #endif /* !defined NOID */ #endif /* !defined lint */ /*LINTLIBRARY*/ #include "sys/types.h" /* for time_t */ #include "private.h" /* for TYPE_INTEGRAL and TYPE_SIGNED */ double difftime(time1, time0) const time_t time1; const time_t time0; { /* ** If (sizeof (double) > sizeof (time_t)) simply convert and subtract ** (assuming that the wider type has more precision). ** This is the common real-world case circa 2004. */ if (sizeof (double) > sizeof (time_t)) return (double) time1 - (double) time0; if (!TYPE_INTEGRAL(time_t)) { /* ** time_t is floating. */ return time1 - time0; } if (!TYPE_SIGNED(time_t)) { /* ** time_t is integral and unsigned. ** The difference of two unsigned values can't overflow ** if the minuend is greater than or equal to the subtrahend. */ if (time1 >= time0) return time1 - time0; else return -((double) (time0 - time1)); } /* ** time_t is integral and signed. ** Handle cases where both time1 and time0 have the same sign ** (meaning that their difference cannot overflow). */ if (time1 >= 0 && time0 >= 0 || time1 < 0 && time0 < 0) return time1 - time0; /* ** time1 and time0 have opposite signs. ** Punt if unsigned long is too narrow. */ if (sizeof (unsigned long) < sizeof (time_t)) return (double) time1 - (double) time0; /* ** Stay calm...decent optimizers will eliminate the complexity below. */ if (time1 >= 0 /* && time0 < 0 */) return (unsigned long) time1 + (unsigned long) (-(time0 + 1)) + 1; return -(double) ((unsigned long) time0 + (unsigned long) (-(time1 + 1)) + 1); }

3 2

Olso city
by Jesper Norgaard Welen Nov. 1, 2004

Nov. 1, 2004

There is a spelling mistake in the 'europe' file, where 'Olso' should be 'Oslo' (the capital of Norway). Maybe because Arthur David Olson was also mentioned in the file!? Regards, Jesper Jesper Nørgaard Welen Email: jnorgard(a)Prodigy.Net.mx Project Leader (Líder de Proyecto) Software CIMMYT - Centro Internacional de Mejoramiento de Maíz y Trigo Dirección: CIMMYT Int. c/o Jesper Nørgaard Km. 45, Carretera México-Veracruz El Batán Texcoco, Edo. de México CP 56130 MEXICO Tel.: +52 (5) 58-04-20-04 ext. 1374 Fax: +52 (5) 58-04-75-58 Tel. Casa: 53-10-05-95 ó 53-10-97-78 Download the free program World Time Explorer, I made: http://www.cimmyt.org/timezone/index.htm

2 1

FW: Time Zone change in GEORGIA (Eastern Europe), time zone is no w GMT+3 (no longer GMT+4)
by Olson, Arthur David (NIH/NCI) Oct. 30, 2004

Oct. 30, 2004

Aiet Kolkhi is not on the time zone mailing list; direct replies appropriately. The change of Georgia to GMT+3 is already reflected in tzdata2004e.tar.gz; the suggested move of Georgia to Europe from Asia is not. --ado -----Original Message----- From: Aiet Kolkhi [mailto:aiet@qartuli.net] Sent: Sunday, October 24, 2004 4:39 PM To: tz(a)lecserver.nci.nih.gov Subject: Time Zone change in GEORGIA (Eastern Europe), time zone is now GMT+3 (no longer GMT+4) Hello, There has been a time zone change in GEORGIA (capital: Tbilisi). Georgia used to be a GMT+4 country, with DST rules just like Berlin or Paris, but since June 27, 2004, the newly-elected Parliament chose to set national time GEST one hour erlier, just like it was in the old days. As a result, the timzone Georgia belongs is GMT+3 (+1 hour during Daylight Saiving Times, just like it is now). DST rules remain, i.e. DST starts on March 28 and ends on Oct. 31. You may read BBC story about the change here: http://news.bbc.co.uk/1/hi/world/europe/3843511.stm Also, the information has been already corrected at timeanddate.com Here is the link to Tbilisi, Georgia: http://www.timeanddate.com/worldclock/city.html?n=371 Another important notice: It would be more proper and politically correct to list Georgia in (East) Europe section and not in Asia. Georgia was considered Asian country due to improper information during Soviet times, but since the break-up of the Soviet, Georgia tends to be included in Europe rather than in Asia in more and more places. The BBC link I provided above for example also includes Georgia in Europian region. It is correct, since Georgia has always been more Europian country than Asian, with Christian religion since 4th AD and Europian traditions. Georgia is also a member of Europian Council and the EU flag is hanging next to the Georgian flag in front of Georgian Parliament :) Please CC any inquiries/replies regarding this matter DIRECTLY to my address, as I'm not subscribed to this list. Thank you. -- Best regards, Aiet Kolkhi mailto:aiet@qartuli.net http://aiet.qartuli.net

6 11

Cuba on DST until 2005
by Steffen Thorsen Oct. 29, 2004

Oct. 29, 2004

Not to interrupt your discussion about Georgia, but... Evert van der Veer <evert.van.der.veer(a)wanadoo.nl> informed me that Cuba was not going back to standard time this year. I was able to find a news arcticle about it, quoted: > To conserve energy, Cuban authorities are closing 110 businesses, > shortening the workday and school day by a half hour, extending > daylight-saving time until October 2005 and shifting production > schedules. The original (subscription) is in the Dallas Morning News from 2004-10-14: http://www.dallasnews.com/sharedcontent/dws/news/world/cuba/stories/101504d… A number of other newspapers carry the same article without subscription, including http://www.kansas.com/mld/kansas/news/world/9920684.htm regards, Steffen

3 2