- tz - lists.iana.org

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