- tz - lists.iana.org

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

Time Zone change in GEORGIA (Eastern Europe), time zone is now GMT+3 (no longer GMT+4)
by Aiet Kolkhi Oct. 24, 2004

Oct. 24, 2004

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

1 0

Using tz as linked libraries
by Wendel Schultz Oct. 22, 2004

Oct. 22, 2004

Has anybody had any success linking to the libraries and using these functions? Any sample programs that illustrate this? Also, is it better to build this under Cygwin or use MS VC++ to compile?

2 1

difftime
by Olson, Arthur David (NIH/NCI) Oct. 21, 2004

Oct. 21, 2004

So...can we apply our hard-earned knowledge of modular arithmetic to the task of getting difftime to do the right thing in the face of the various types that time_t is allowed to assume? A possibility would be to add to private.h... ------- private.h ------- *** /tmp/geta29733 Thu Oct 21 10:29:48 2004 --- /tmp/getb29733 Thu Oct 21 10:29:48 2004 *************** *** 21,27 **** #ifndef lint #ifndef NOID ! static char privatehid[] = "@(#)private.h 7.54"; #endif /* !defined NOID */ #endif /* !defined lint */ --- 21,27 ---- #ifndef lint #ifndef NOID ! static char privatehid[] = "@(#)private.h 7.55"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 238,243 **** --- 238,247 ---- #define TYPE_SIGNED(type) (((type) -1) < 0) #endif /* !defined TYPE_SIGNED */ + #ifndef TYPE_INTEGRAL + #define TYPE_INTEGRAL(type) (((type) 0.4) == 0) + #endif /* !defined TYPE_INTEGRAL */ + #ifndef INT_STRLEN_MAXIMUM /* ** 302 / 1000 is log10(2.0) rounded up. ...and then use the difftime.c that appears below. --ado /* ** This file is in the public domain, so clarified as of ** June 5, 1996 by Arthur David Olson (arthur_david_olson(a)nih.gov) */ #ifndef lint #ifndef NOID static char elsieid[] = "@(#)difftime.c 7.11"; #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 (!TYPE_INTEGRAL(time_t)) { /* ** time_t is floating. ** We can't apply % to floats. ** Do the math in whichever of time_t or double is wider. */ if (sizeof (time_t) >= sizeof (double)) return time1 - time0; else return (double) time1 - (double) time0; } else { /* ** time_t is integral. ** As elsewhere in the time zone package, ** use modular arithmetic to avoid overflow. */ register time_t lead; register time_t trail; lead = time1 / 2 - time0 / 2; trail = time1 % 2 - time0 % 2; return 2 * ((double) lead) + trail; } }

2 1

Tzcode2004f.tar.gz
by Olson, Arthur David (NIH/NCI) Oct. 21, 2004

Oct. 21, 2004

The file... ftp://elsie.nci.nih.gov/pub/tzcode2004f.tar.gz ...is now available; this includes the changes circulated earlier on the list to cope with wide-ranging tm_year values. --ado

1 0

Re: Re: Strftime's %C and %y formats versus wide-ranging tm_yea
by WHarms＠bfs.de Oct. 19, 2004

Oct. 19, 2004

hi paul IMHO this will fail in case of error. 1. snprint() old version return -1 on error therefor reducing result by one 2. snprint() new version return size that is *needed* any overflow will cause pt point to exacly were i should not be is a private version of snprintf/strftime an option ? regards, walter - - - - - - - - - - - - - - Original Message - - - - - - - - - - - - - - From: Paul Eggert <eggert(a)CS.UCLA.EDU> Subject: Re: Strftime's %C and %y formats versus wide-ranging tm_year va Date: 10/15/04 21:03 "Olson, Arthur David (NIH/NCI)" <olsona(a)dc37a.nci.nih.gov> writes: ** We avoid using snprintf since it's not available on all systems. */ ! pt = result + sprintf(result, ! ASCTIME_FMT, wn, mn, timeptr->tm_mday, timeptr->tm_hour, ! timeptr->tm_min, timeptr->tm_sec); ! if (-999 - TM_YEAR_BASE <= timeptr->tm_year ! && timeptr->tm_year <= 9999 - TM_YEAR_BASE) ! pt += sprintf(pt, ! SMALL_YEAR_FMT, timeptr->tm_year + TM_YEAR_BASE); ! else ! /*

1 0

bogus c++'ism in tzcode2004e
by Todd C. Miller Oct. 18, 2004

Oct. 18, 2004

This fixes the compilation error. - todd --- strftime.c.orig Mon Oct 11 12:46:51 2004 +++ strftime.c Mon Oct 18 16:10:37 2004 @@ -446,7 +446,7 @@ pt, ptlim); else if (*format == 'g') { *warnp = IN_ALL; - pt = _conv(int(year % 100), + pt = _conv((int) (year % 100), "%02d", pt, ptlim); } else pt = _lconv(year, "%04ld", pt, ptlim);

1 0

newbie here
by Wendel Schultz Oct. 18, 2004

Oct. 18, 2004

I'm a new comer to the tz database community. I'd really like to integrate it into some stuff we're doing, but I need some sort of "orientation" material. Any suggestions? It doesn't seem as obvious using these libraries with MFC apps. Wendel Schultz

2 1

RE: Strftime's %C and %y formats versus wide-ranging tm_year valu es
by Olson, Arthur David (NIH/NCI) Oct. 18, 2004

Oct. 18, 2004

Yet another iteration on wide-ranging tm_year values; as usual, the diffs below are against the stuff in ftp://elsie.nci.nih.gov/pub at the moment. To avoid putting work into getting STRICTLY_STANDARD_ASCTIME code right, I've removed the code (and the associated Makefile commentary). My preference is to have the zdump handling of years parallel the strftime handling as closely as possible, even though we "know" that TM_YEAR_BASE % DIVISOR is zero and that some code could be removed. Note that right after the year calculations in zdump there appears... if (lead == 0) (void) printf("%d", trail); else (void) printf("%d%d", lead, ((trail < 0) ? -trail : trail)); ...meaning that any cycles eaten up by extra mod operators are going to be swamped by the cycles devoted to generating output. --ado diff -r -c old/Makefile new/Makefile *** old/Makefile Mon Oct 11 14:44:49 2004 --- new/Makefile Mon Oct 18 11:43:16 2004 *************** *** 1,4 **** ! # @(#)Makefile 7.95 # 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.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). *************** *** 103,110 **** # -DLOCALE_HOME=\"path\" if locales are in "path", not "/usr/lib/locale" # -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?) # -DHAVE_UTMPX_H=1 if your compiler has a "utmpx.h" - # -DSTRICTLY_STANDARD_ASCTIME=1 if you want a strictly standard (and arguably - # broken) version of asctime (see asctime.c for details) # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified # DST transitions if the time zone files cannot be accessed # -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" --- 103,108 ---- diff -r -c old/asctime.c new/asctime.c *** old/asctime.c Mon Oct 11 14:47:03 2004 --- new/asctime.c Mon Oct 18 11:37:53 2004 *************** *** 5,11 **** #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)asctime.c 7.22"; #endif /* !defined NOID */ #endif /* !defined lint */ --- 5,11 ---- #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)asctime.c 7.28"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 14,23 **** #include "private.h" #include "tzfile.h" - #if STRICTLY_STANDARD_ASCTIME - #define ASCTIME_FMT "%.3s %.3s%3d %.2d:%.2d:%.2d %ld\n" - #define ASCTIME_FMT_B ASCTIME_FMT - #else /* !STRICTLY_STANDARD_ASCTIME */ /* ** Some systems only handle "%.2d"; others only handle "%02d"; ** "%02.2d" makes (most) everybody happy. --- 14,19 ---- *************** *** 29,37 **** ** Vintage programs are coded for years that are always four digits long ** and may assume that the newline always lands in the same place. ** For years that are less than four digits, we pad the output with ! ** spaces before the newline to get the newline in the traditional place. */ ! #define ASCTIME_FMT "%.3s %.3s%3d %02.2d:%02.2d:%02.2d %-4ld\n" /* ** For years that are more than four digits we put extra spaces before the year ** so that code trying to overwrite the newline won't end up overwriting --- 25,35 ---- ** Vintage programs are coded for years that are always four digits long ** and may assume that the newline always lands in the same place. ** For years that are less than four digits, we pad the output with ! ** leading zeroes to get the newline in the traditional place. ! ** The -4 ensures that we get four characters of output even if ! ** we call a strftime variant that produces fewer characters for some years. */ ! #define ASCTIME_FMT "%.3s %.3s%3d %02.2d:%02.2d:%02.2d %-4s\n" /* ** For years that are more than four digits we put extra spaces before the year ** so that code trying to overwrite the newline won't end up overwriting *************** *** 38,45 **** ** a digit within a year and truncating the year (operating on the assumption ** that no output is better than wrong output). */ ! #define ASCTIME_FMT_B "%.3s %.3s%3d %02.2d:%02.2d:%02.2d %ld\n" ! #endif /* !STRICTLY_STANDARD_ASCTIME */ #define STD_ASCTIME_BUF_SIZE 26 /* --- 36,42 ---- ** a digit within a year and truncating the year (operating on the assumption ** that no output is better than wrong output). */ ! #define ASCTIME_FMT_B "%.3s %.3s%3d %02.2d:%02.2d:%02.2d %s\n" #define STD_ASCTIME_BUF_SIZE 26 /* *************** *** 74,80 **** }; register const char * wn; register const char * mn; ! long year; char result[MAX_ASCTIME_BUF_SIZE]; if (timeptr->tm_wday < 0 || timeptr->tm_wday >= DAYSPERWEEK) --- 71,77 ---- }; register const char * wn; register const char * mn; ! char year[INT_STRLEN_MAXIMUM(int) + 2]; char result[MAX_ASCTIME_BUF_SIZE]; if (timeptr->tm_wday < 0 || timeptr->tm_wday >= DAYSPERWEEK) *************** *** 83,94 **** if (timeptr->tm_mon < 0 || timeptr->tm_mon >= MONSPERYEAR) mn = "???"; else mn = mon_name[timeptr->tm_mon]; - year = timeptr->tm_year + (long) TM_YEAR_BASE; /* ** We avoid using snprintf since it's not available on all systems. */ ! (void) sprintf(result, ! ((year >= -999 && year <= 9999) ? ASCTIME_FMT : ASCTIME_FMT_B), wn, mn, timeptr->tm_mday, timeptr->tm_hour, timeptr->tm_min, timeptr->tm_sec, --- 80,97 ---- if (timeptr->tm_mon < 0 || timeptr->tm_mon >= MONSPERYEAR) mn = "???"; else mn = mon_name[timeptr->tm_mon]; /* + ** Use strftime's %Y to generate the year, to avoid overflow problems + ** when computing timeptr->tm_year + TM_YEAR_BASE. + ** Assume that strftime is unaffected by other out-of-range members + ** (e.g., timeptr->tm_mday) when processing "%Y". + */ + (void) strftime(year, sizeof year, "%Y", timeptr); + /* ** We avoid using snprintf since it's not available on all systems. */ ! (void) sprintf(result, ! ((strlen(year) <= 4) ? ASCTIME_FMT : ASCTIME_FMT_B), wn, mn, timeptr->tm_mday, timeptr->tm_hour, timeptr->tm_min, timeptr->tm_sec, diff -r -c old/newctime.3 new/newctime.3 *** old/newctime.3 Mon Oct 11 14:44:49 2004 --- new/newctime.3 Thu Oct 14 13:00:48 2004 *************** *** 46,52 **** Thu Nov 24 18:22:48 1986\n\0 .br .ec ! Years requiring fewer than four characters are padded with trailing spaces. For years longer than four characters, the string is of the form .br .ce --- 46,52 ---- Thu Nov 24 18:22:48 1986\n\0 .br .ec ! Years requiring fewer than four characters are padded with leading zeroes. For years longer than four characters, the string is of the form .br .ce *************** *** 55,61 **** .ec .br with five spaces before the year. ! This unusual format is designed to make it less likely that older software that expects exactly 26 bytes of output will mistakenly output misleading values for out-of-range years. .PP --- 55,61 ---- .ec .br with five spaces before the year. ! These unusual formats are designed to make it less likely that older software that expects exactly 26 bytes of output will mistakenly output misleading values for out-of-range years. .PP *************** *** 65,71 **** return pointers to ``tm'' structures, described below. .I Localtime\^ corrects for the time zone and any time zone adjustments ! (such as Daylight Saving Time in the U.S.A.). After filling in the ``tm'' structure, .I localtime sets the --- 65,71 ---- return pointers to ``tm'' structures, described below. .I Localtime\^ corrects for the time zone and any time zone adjustments ! (such as Daylight Saving Time in the United States). After filling in the ``tm'' structure, .I localtime sets the *************** *** 234,237 **** Avoid using out-of-range values with .I mktime when setting up lunch with promptness sticklers in Riyadh. ! .\" @(#)newctime.3 7.16 --- 234,237 ---- Avoid using out-of-range values with .I mktime when setting up lunch with promptness sticklers in Riyadh. ! .\" @(#)newctime.3 7.17 diff -r -c old/strftime.c new/strftime.c *** old/strftime.c Mon Oct 11 14:46:51 2004 --- new/strftime.c Mon Oct 18 11:37:53 2004 *************** *** 1,12 **** - /* - ** XXX To do: figure out correct (as distinct from standard-mandated) - ** output for "two digits of year" and "century" formats when - ** the year is negative or less than 100. --ado, 2004-09-09 - */ - #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)strftime.c 7.67"; /* ** Based on the UCB version with the ID appearing below. ** This is ANSIish only when "multibyte character == plain character". --- 1,6 ---- #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)strftime.c 7.73"; /* ** Based on the UCB version with the ID appearing below. ** This is ANSIish only when "multibyte character == plain character". *************** *** 114,124 **** static char * _add P((const char *, char *, const char *)); static char * _conv P((int, const char *, char *, const char *)); - static char * _lconv P((long, const char *, char *, const char *)); static char * _fmt P((const char *, const struct tm *, char *, const char *, int *)); - size_t strftime P((char *, size_t, const char *, const struct tm *)); - extern char * tzname[]; #ifndef YEAR_2000_NAME --- 108,116 ---- static char * _add P((const char *, char *, const char *)); static char * _conv P((int, const char *, char *, const char *)); static char * _fmt P((const char *, const struct tm *, char *, const char *, int *)); + static char * _yconv P((int, int, int, int, char *, const char *)); extern char * tzname[]; #ifndef YEAR_2000_NAME *************** *** 125,131 **** #define YEAR_2000_NAME "CHECK_STRFTIME_FORMATS_FOR_TWO_DIGIT_YEARS" #endif /* !defined YEAR_2000_NAME */ - #define IN_NONE 0 #define IN_SOME 1 #define IN_THIS 2 --- 117,122 ---- *************** *** 217,225 **** ** something completely different. ** (ado, 1993-05-24) */ ! pt = _conv((int) ((t->tm_year + ! (long) TM_YEAR_BASE) / 100), ! "%02d", pt, ptlim); continue; case 'c': { --- 208,215 ---- ** something completely different. ** (ado, 1993-05-24) */ ! pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 0, ! pt, ptlim); continue; case 'c': { *************** *** 387,399 **** ** (ado, 1996-01-02) */ { ! long year; int yday; int wday; int w; year = t->tm_year; ! year += TM_YEAR_BASE; yday = t->tm_yday; wday = t->tm_wday; for ( ; ; ) { --- 377,390 ---- ** (ado, 1996-01-02) */ { ! int year; ! int base; int yday; int wday; int w; year = t->tm_year; ! base = TM_YEAR_BASE; yday = t->tm_yday; wday = t->tm_wday; for ( ; ; ) { *************** *** 401,407 **** int bot; int top; ! len = isleap(year) ? DAYSPERLYEAR : DAYSPERNYEAR; /* --- 392,398 ---- int bot; int top; ! len = isleap_sum(year, base) ? DAYSPERLYEAR : DAYSPERNYEAR; /* *************** *** 420,426 **** top += DAYSPERWEEK; top += len; if (yday >= top) { ! ++year; w = 1; break; } --- 411,417 ---- top += DAYSPERWEEK; top += len; if (yday >= top) { ! ++base; w = 1; break; } *************** *** 429,436 **** DAYSPERWEEK); break; } ! --year; ! yday += isleap(year) ? DAYSPERLYEAR : DAYSPERNYEAR; } --- 420,427 ---- DAYSPERWEEK); break; } ! --base; ! yday += isleap_sum(year, base) ? DAYSPERLYEAR : DAYSPERNYEAR; } *************** *** 446,455 **** pt, ptlim); else if (*format == 'g') { *warnp = IN_ALL; ! pt = _conv(int(year % 100), ! "%02d", pt, ptlim); ! } else pt = _lconv(year, "%04ld", pt, ptlim); } continue; case 'v': --- 437,446 ---- pt, ptlim); else if (*format == 'g') { *warnp = IN_ALL; ! pt = _yconv(year, base, 0, 1, pt, ptlim); + } else pt = _yconv(year, base, 1, 1, + pt, ptlim); } continue; case 'v': *************** *** 486,498 **** continue; case 'y': *warnp = IN_ALL; ! pt = _conv((int) ((t->tm_year + ! (long) TM_YEAR_BASE) % 100), ! "%02d", pt, ptlim); continue; case 'Y': ! pt = _lconv(t->tm_year + (long) TM_YEAR_BASE, ! "%04ld", pt, ptlim); continue; case 'Z': #ifdef TM_ZONE --- 477,488 ---- continue; case 'y': *warnp = IN_ALL; ! pt = _yconv(t->tm_year, TM_YEAR_BASE, 0, 1, ! pt, ptlim); continue; case 'Y': ! pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 1, ! pt, ptlim); continue; case 'Z': #ifdef TM_ZONE *************** *** 556,564 **** diff = -diff; } else sign = "+"; pt = _add(sign, pt, ptlim); ! diff /= 60; ! pt = _conv((diff/60)*100 + diff%60, ! "%04d", pt, ptlim); } continue; case '+': --- 546,555 ---- diff = -diff; } else sign = "+"; pt = _add(sign, pt, ptlim); ! diff /= SECSPERMIN; ! diff = (diff / MINSPERHOUR) * 100 + ! (diff % MINSPERHOUR); ! pt = _conv(diff, "%04d", pt, ptlim); } continue; case '+': *************** *** 596,614 **** } static char * - _lconv(n, format, pt, ptlim) - const long n; - const char * const format; - char * const pt; - const char * const ptlim; - { - char buf[INT_STRLEN_MAXIMUM(long) + 1]; - - (void) sprintf(buf, format, n); - return _add(buf, pt, ptlim); - } - - static char * _add(str, pt, ptlim) const char * str; char * pt; --- 587,592 ---- *************** *** 619,624 **** --- 597,642 ---- return pt; } + /* + ** POSIX and the C Standard are unclear or inconsistent about + ** what %C and %y do if the year is negative or exceeds 9999. + ** Use the convention that %C concatenated with %y yields the + ** same output as %Y, and that %Y contains at least 4 bytes, + ** with more only if necessary. + */ + + static char * + _yconv(a, b, convert_top, convert_yy, pt, ptlim) + const int a; + const int b; + const int convert_top; + const int convert_yy; + char * pt; + const char * const ptlim; + { + register int lead; + register int trail; + + #define DIVISOR 100 + trail = a % DIVISOR + b % DIVISOR; + lead = a / DIVISOR + b / DIVISOR + trail / DIVISOR; + trail %= DIVISOR; + if (trail < 0 && lead > 0) { + trail += DIVISOR; + --lead; + } else if (lead < 0 && trail > 0) { + trail -= DIVISOR; + ++lead; + } + if (convert_top) { + if (lead == 0 && trail < 0) + pt = _add("-0", pt, ptlim); + else pt = _conv(lead, "%02d", pt, ptlim); + } + if (convert_yy) + pt = _conv(((trail < 0) ? -trail : trail), "%02d", pt, ptlim); + } + #ifdef LOCALE_HOME static struct lc_time_T * _loc P((void)) diff -r -c old/tzfile.h new/tzfile.h *** old/tzfile.h Mon Oct 11 14:46:42 2004 --- new/tzfile.h Mon Oct 11 15:20:25 2004 *************** *** 21,27 **** #ifndef lint #ifndef NOID ! static char tzfilehid[] = "@(#)tzfile.h 7.14"; #endif /* !defined NOID */ #endif /* !defined lint */ --- 21,27 ---- #ifndef lint #ifndef NOID ! static char tzfilehid[] = "@(#)tzfile.h 7.16"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 156,167 **** #define EPOCH_YEAR 1970 #define EPOCH_WDAY TM_THURSDAY /* ! ** Accurate only for the past couple of centuries; ! ** that will probably do. */ ! #define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0)) #ifndef USG --- 156,176 ---- #define EPOCH_YEAR 1970 #define EPOCH_WDAY TM_THURSDAY + #define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0)) + /* ! ** Since everything in isleap is modulo 400 (or a factor of 400), we know that ! ** isleap(y) == isleap(y % 400) ! ** and so ! ** isleap(a + b) == isleap((a + b) % 400) ! ** or ! ** isleap(a + b) == isleap(a % 400 + b % 400) ! ** This is true even if % means modulo rather than Fortran remainder ! ** (which is allowed by C89 but not C99). ! ** We use this to avoid addition overflow problems. */ ! #define isleap_sum(a, b) isleap((a) % 400 + (b) % 400) #ifndef USG diff -r -c old/zdump.c new/zdump.c *** old/zdump.c Mon Oct 11 14:46:47 2004 --- new/zdump.c Mon Oct 18 11:37:53 2004 *************** *** 1,4 **** ! static char elsieid[] = "@(#)zdump.c 7.40"; /* ** This code has been made independent of the rest of the time --- 1,4 ---- ! static char elsieid[] = "@(#)zdump.c 7.47"; /* ** This code has been made independent of the rest of the time *************** *** 61,69 **** #endif /* !defined DAYSPERNYEAR */ #ifndef isleap ! #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) #endif /* !defined isleap */ #if HAVE_GETTEXT #include "locale.h" /* for setlocale */ #include "libintl.h" --- 61,76 ---- #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 */ + #if HAVE_GETTEXT #include "locale.h" /* for setlocale */ #include "libintl.h" *************** *** 321,327 **** return -delta(oldp, newp); result = 0; for (tmy = oldp->tm_year; tmy < newp->tm_year; ++tmy) ! result += DAYSPERNYEAR + isleap(tmy + (long) TM_YEAR_BASE); result += newp->tm_yday - oldp->tm_yday; result *= HOURSPERDAY; result += newp->tm_hour - oldp->tm_hour; --- 328,334 ---- 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; *************** *** 384,389 **** --- 391,398 ---- }; register const char * wn; register const char * mn; + register int lead; + register int trail; /* ** The packaged versions of localtime and gmtime never put out-of-range *************** *** 398,406 **** (int) (sizeof mon_name / sizeof mon_name[0])) mn = "???"; else mn = mon_name[timeptr->tm_mon]; ! (void) printf("%.3s %.3s%3d %.2d:%.2d:%.2d %ld", wn, mn, timeptr->tm_mday, timeptr->tm_hour, ! timeptr->tm_min, timeptr->tm_sec, ! timeptr->tm_year + (long) TM_YEAR_BASE); } --- 407,429 ---- (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)); }

2 1