October 2004 - tz - lists.iana.org

proposed tz change for Latvia, Lithuania
by Paul Eggert May 25, 2015

May 25, 2015

It's March Madness time for daylight-saving rule changes. Here's a proposed change to the tz database to keep up with the latest political development, which affects time stamps starting March 29: * Latvia and Lithuania will not observe DST, starting this year. Thanks to Andrei Ivanov for this info. =================================================================== RCS file: RCS/europe,v retrieving revision 2000.3 retrieving revision 2000.3.0.1 diff -pu -r2000.3 -r2000.3.0.1 --- europe 2000/03/04 15:31:08 2000.3 +++ europe 2000/03/08 17:48:59 2000.3.0.1 @@ -1135,6 +1135,12 @@ Link Europe/Rome Europe/San_Marino # 1997-01-21 on transition to Summer time ... established the same order of # daylight savings time settings as in the States of the European Union. +# From Andrei Ivanov (2000-03-06): +# This year Latvia will not switch to Daylight Savings Time (as specified in +# <a href="http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm"> +# The Regulations of the Cabinet of Ministers of the Rep. of Latvia of +# 29-Feb-2000 (#79)</a>, in Latvian for subscribers only). + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Latvia 1989 1996 - Mar lastSun 2:00s 1:00 S Rule Latvia 1989 1996 - Sep lastSun 2:00s 0 - @@ -1151,7 +1157,8 @@ Zone Europe/Riga 1:36:24 - LMT 1880 3:00 Russia MSK/MSD 1989 Mar lastSun 2:00s 2:00 1:00 EEST 1989 Sep lastSun 2:00s 2:00 Latvia EE%sT 1997 Jan 21 - 2:00 EU EE%sT + 2:00 EU EE%sT 2000 Feb 29 + 2:00 - EET # Liechtenstein # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1178,6 +1185,11 @@ Zone Europe/Vaduz 0:38:04 - LMT 1894 Jun # motion to give up shifting to summer time in spring, as it was # already done by Estonia. +# From Andrei Ivanov (2000-03-06): +# I've heard that Ministers of three Baltic countries on their summit +# somewhere in February decided not to switch to summer time starting from +# this spring. + # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Vilnius 1:41:16 - LMT 1880 1:24:00 - WMT 1917 # Warsaw Mean Time @@ -1192,7 +1204,8 @@ Zone Europe/Vilnius 1:41:16 - LMT 1880 2:00 C-Eur EE%sT 1998 2:00 - EET 1998 Mar 29 1:00u 1:00 EU CE%sT 1999 Oct 31 1:00u - 2:00 EU EE%sT + 2:00 EU EE%sT 2000 Feb + 2:00 - EET # Luxembourg # Whitman disagrees with most of these dates in minor ways; go with Shanks.

5 5

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

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

RE: UK news: Nigel Beard's Lighter Evenings Bill fails
by Dave Stewart Oct. 18, 2004

Oct. 18, 2004

This may be a silly question but, out of interest, could someone tell me what the main drawbacks of doing this is? My initial reaction was to think this may be a good idea, based on being fed-up with dark evenings riding a motorcycle home from work, but I may have missed something obvious here, which I hope someone can point out? I suppose that if we don't experience GREENWICH Mean Time as the Local time at SOME time in the year, it would be laughable bearing in mind it's a UK town! Best Rgds, Dave Stewart -----Original Message----- From: Peter Ilieve [mailto:peter@aldie.co.uk] Sent: 18 October 2004 10:16 To: tz(a)lecserver.nci.nih.gov Subject: UK news: Nigel Beard's Lighter Evenings Bill fails Nigel Beard's ten minute rule Lighter Evenings Bill came up for its second reading on Friday. The Hansard report is at 15 Oct 2004 Column 594: <http://www.publications.parliament.uk/pa/cm200304/cmhansrd/cm041015/ debtext/41015-19.htm#41015-19_head0>. The bit covering the Lighter Evening Bill is short enough to quote in full: LIGHTER EVENINGS BILL Order for Second Reading read. Hon. Members: Object. To be read a Second time on Friday 5 November. Parliamentary procedure for bills like this is that a single member shouting Object is sufficient to kill it off. Rational debate it ain't. The bit about reading it again on 5 Nov is fairly meaningless. The house won't actually be sitting on that day. Nigel chose a date in the near future rather than giving up just in case some emergency arises that means the house would sit on that day. It's vanishingly unlikely that it will, and even if it does no doubt the Hon. Members would Object again. There was some reporting of this proposal in the Scottish papers early last week. Nigel wrote a letter to the Sunday Herald setting out his case. This appeared in the news section and is available at: <http://www.sundayherald.com/45353>. By the time this appeared the Bill had already been lost. I'm surprised the Herald didn't note this. So that's it for this latest attempt to fiddle with the clocks here in the UK. Peter Ilieve peter(a)aldie.co.uk IMPORTANT NOTICE This communication contains information, which is confidential and may also be privileged. It is for the exclusive use of the intended recipient(s). If you are not the intended recipient(s) please note that any form of distribution, copying or use of this communication or the information in it is strictly prohibited and may be unlawful. If you have received this communication in error please return it to the sender. The opinions expressed within this communication are not necessarily those expressed by Teletext Ltd. Teletext Ltd. Building 10 Chiswick Park 566 Chiswick High Road London W4 5TS Registered in England number 2694814 _____________________________________________________________________ This message has been checked for all known viruses by Star Internet delivered through the MessageLabs Virus Control Centre. For further information visit http://www.star.net.uk/stats.asp

2 1

Brazil's DST update
by e0000111＠linf.unb.br Oct. 18, 2004

Oct. 18, 2004

Hi, I thought you should know that Brazil changed DST rules once again. :) Begins at 02 Nov 2004 00:00 hours Ends at 20 Feb 2005 00:00 hours I added a sample southamerica patch line as an attachment. I hope it is correct and useful. Regards, Mario Ferreira <lioux(a)FreeBSD.org>

1 0

UK news: Nigel Beard's Lighter Evenings Bill fails
by Peter Ilieve Oct. 18, 2004

Oct. 18, 2004

Nigel Beard's ten minute rule Lighter Evenings Bill came up for its second reading on Friday. The Hansard report is at 15 Oct 2004 Column 594: <http://www.publications.parliament.uk/pa/cm200304/cmhansrd/cm041015/ debtext/41015-19.htm#41015-19_head0>. The bit covering the Lighter Evening Bill is short enough to quote in full: LIGHTER EVENINGS BILL Order for Second Reading read. Hon. Members: Object. To be read a Second time on Friday 5 November. Parliamentary procedure for bills like this is that a single member shouting Object is sufficient to kill it off. Rational debate it ain't. The bit about reading it again on 5 Nov is fairly meaningless. The house won't actually be sitting on that day. Nigel chose a date in the near future rather than giving up just in case some emergency arises that means the house would sit on that day. It's vanishingly unlikely that it will, and even if it does no doubt the Hon. Members would Object again. There was some reporting of this proposal in the Scottish papers early last week. Nigel wrote a letter to the Sunday Herald setting out his case. This appeared in the news section and is available at: <http://www.sundayherald.com/45353>. By the time this appeared the Bill had already been lost. I'm surprised the Herald didn't note this. So that's it for this latest attempt to fiddle with the clocks here in the UK. Peter Ilieve peter(a)aldie.co.uk

1 0

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

Oct. 16, 2004

Below might be a simpler asctime.c fix. --ado ------- asctime.c ------- *** /tmp/geta7409 Thu Oct 14 17:29:28 2004 --- /tmp/getb7409 Thu Oct 14 17:29:28 2004 *************** *** 5,11 **** #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)asctime.c 7.26"; #endif /* !defined NOID */ #endif /* !defined lint */ --- 5,11 ---- #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)asctime.c 7.27"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 83,89 **** --- 83,96 ---- if (timeptr->tm_mon < 0 || timeptr->tm_mon >= MONSPERYEAR) mn = "???"; else mn = mon_name[timeptr->tm_mon]; + #if STRICTLY_STANDARD_ASCTIME /* + ** Be strict, potential overflow problems included. + ** In an ideal world, this code is never going to be used. + */ + (void) sprintf(year, "%d", timeptr->tm_year + TM_YEAR_BASE); + #else /* !STRICTLY_STANDARD_ASCTIME */ + /* ** 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 *************** *** 90,95 **** --- 97,103 ---- ** (e.g., timeptr->tm_mday) when processing "%Y". */ (void) strftime(year, sizeof year, "%Y", timeptr); + #endif /* !STRICTLY_STANDARD_ASCTIME */ /* ** We avoid using snprintf since it's not available on all systems. */

3 2

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

Oct. 14, 2004

Below find the latest iteration on handling wide-ranging tm_year values. 1. The asctime function punts to strftime to generate output representing the year; the asctime documentation has been adjusted accordingly; a comment based on Paul Eggert's suggestion has been added. 2. zdump.c and strftime.c have been changed along the lines proposed by Paul Eggert; I've tried to make the code as similar as possible in the two places. I've stayed with the "% 400" version of isleap_sum since it's correct and relatively simple (if not efficient). I'd suggest not worrying about this too much. I don't know of any real-world applications where code relying on isleap is a bottleneck. I also foresee that with the extension of the range of time_t to the distant past, the days of being able to determine leap-year status with a macro are numbered. This round of changes does not split tzfile.h into caldefs.h and tzfile.h. --ado diff -c -r old/asctime.c new/asctime.c *** old/asctime.c Mon Oct 11 14:47:03 2004 --- new/asctime.c Thu Oct 14 13:36:37 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.26"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 15,21 **** #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 */ /* --- 15,21 ---- #include "tzfile.h" #if STRICTLY_STANDARD_ASCTIME ! #define ASCTIME_FMT "%.3s %.3s%3d %.2d:%.2d:%.2d %s\n" #define ASCTIME_FMT_B ASCTIME_FMT #else /* !STRICTLY_STANDARD_ASCTIME */ /* *************** *** 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 --- 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 ! ** leading zeroes to get the newline in the traditional place. */ ! #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,44 **** ** 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 --- 38,44 ---- ** 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" #endif /* !STRICTLY_STANDARD_ASCTIME */ #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) --- 74,80 ---- }; 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, --- 83,100 ---- 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 -c -r 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 -c -r old/strftime.c new/strftime.c *** old/strftime.c Mon Oct 11 14:46:51 2004 --- new/strftime.c Thu Oct 14 13:36:37 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.71"; /* ** 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,641 ---- 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 + lead = a / DIVISOR + b / DIVISOR; + trail = a % DIVISOR + b % DIVISOR; + while (trail < 0) { + trail += DIVISOR; + --lead; + } + 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 -c -r 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 -c -r old/zdump.c new/zdump.c *** old/zdump.c Mon Oct 11 14:46:47 2004 --- new/zdump.c Thu Oct 14 13:00:49 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.43"; /* ** 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; + int lead; + 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,428 ---- (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 ! lead = timeptr->tm_year / DIVISOR + TM_YEAR_BASE / DIVISOR; ! trail = timeptr->tm_year % DIVISOR + TM_YEAR_BASE % DIVISOR; ! while (trail < 0) { ! trail += DIVISOR; ! --lead; ! } ! 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

RE: Duplicated effort
by Olson, Arthur David (NIH/NCI) Oct. 12, 2004

Oct. 12, 2004

The notion would be to rely on strftime only to handle the year (along the lines below); this would avoid some of the problems folks have noted. (There's still the business of zero padding of the year to consider). --ado ------- asctime.c ------- *** /tmp/geta26648 Tue Oct 12 09:41:36 2004 --- /tmp/getb26648 Tue Oct 12 09:41:36 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.25"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 15,21 **** #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 */ /* --- 15,21 ---- #include "tzfile.h" #if STRICTLY_STANDARD_ASCTIME ! #define ASCTIME_FMT "%.3s %.3s%3d %.2d:%.2d:%.2d %s\n" #define ASCTIME_FMT_B ASCTIME_FMT #else /* !STRICTLY_STANDARD_ASCTIME */ /* *************** *** 31,37 **** ** 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 --- 31,37 ---- ** 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 %-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,44 **** ** 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 --- 38,44 ---- ** 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" #endif /* !STRICTLY_STANDARD_ASCTIME */ #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) --- 74,80 ---- }; 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, --- 83,94 ---- if (timeptr->tm_mon < 0 || timeptr->tm_mon >= MONSPERYEAR) mn = "???"; else mn = mon_name[timeptr->tm_mon]; ! (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,

2 1

Re: Duplicated effort
by WHarms＠bfs.de Oct. 12, 2004

Oct. 12, 2004

Hi Ado, as i wrote at the beginning of the time_t discussion, ctime, asctime, etc is obsolet today. the question is only how far are you willing to go ? drop the meaning of a 24h day to include mars-days (or Jupiter-days) ? Or stay on earth and extend struct tm with a tz_offset, and a tz_name ? to make official what is already custom. regards, walter - - - - - - - - - - - - - - Original Message - - - - - - - - - - - - - - From: "Olson, Arthur David (NIH/NCI)" <olsona(a)dc37a.nci.nih.gov> Subject: Duplicated effort Date: 10/11/04 21:19 I'm thinking that a way to reduce the amount of coding to take care of wide-ranging tm_year values is to have asctime rely on strftime to get a correct year string. Can anyone else think of problems with this approach? --ado

1 0

Duplicated effort
by Olson, Arthur David (NIH/NCI) Oct. 12, 2004

Oct. 12, 2004

I'm thinking that a way to reduce the amount of coding to take care of wide-ranging tm_year values is to have asctime rely on strftime to get a correct year string. Can anyone else think of problems with this approach? --ado

3 2

Tzcode2004e.tar.gz and tzdata2004e.tar.gz
by Olson, Arthur David (NIH/NCI) Oct. 11, 2004

Oct. 11, 2004

The files... ftp://elsie.nci.nih.gov/tzcode2004e.tar.gz ...and... ftp://elsie.nci.nih.gov/tzdata2004e.tar.gz ...are now available. Thesse include the Brazil/Argentina/Israel changes circulated last week on the time zone mailing list by Paul Eggert. They also include the changes to tz-link.htm circulated by Paul 2004-09-23, and one small fix to Makefile. I'm holding off on the changes to cope with wide-ranging tm_year values until the dust settles. --ado

2 1

Re: Strftime's %C and %y formats versus wide-ranging tm_year values
by Paul Eggert Oct. 9, 2004

Oct. 9, 2004

OK, here's a proposed patch to the tz code. It is relative to the latest published code on elsie. It incorporates most of Arthur's patch circulated yesterday, except it addresses the issues I mentioned with C99IPMOD, with floating point, and with integer overflow checking; the resulting code uses int arithmetic instead of assuming that long and double are wider than int. =================================================================== RCS file: RCS/tzfile.h,v retrieving revision 1997.9 retrieving revision 1997.9.0.3 diff -pu -r1997.9 -r1997.9.0.3 --- tzfile.h 1997/12/29 14:31:51 1997.9 +++ tzfile.h 2004/10/06 22:25:15 1997.9.0.3 @@ -21,7 +21,7 @@ #ifndef lint #ifndef NOID -static char tzfilehid[] = "@(#)tzfile.h 7.14"; +static char tzfilehid[] = "@(#)tzfile.h 7.15"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -156,12 +156,21 @@ struct tzhead { #define EPOCH_YEAR 1970 #define EPOCH_WDAY TM_THURSDAY +#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0)) + /* -** Accurate only for the past couple of centuries; -** that will probably do. +** 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(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0)) +#define isleap_sum(a, b) isleap((a) % 400 + (b) % 400) #ifndef USG =================================================================== RCS file: RCS/asctime.c,v retrieving revision 2004.3 retrieving revision 2004.3.0.2 diff -pu -r2004.3 -r2004.3.0.2 --- asctime.c 2004/08/11 15:59:06 2004.3 +++ asctime.c 2004/10/06 23:03:13 2004.3.0.2 @@ -5,7 +5,7 @@ #ifndef lint #ifndef NOID -static char elsieid[] = "@(#)asctime.c 7.22"; +static char elsieid[] = "@(#)asctime.c 7.23"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -15,8 +15,8 @@ static char elsieid[] = "@(#)asctime.c 7 #include "tzfile.h" #if STRICTLY_STANDARD_ASCTIME -#define ASCTIME_FMT "%.3s %.3s%3d %.2d:%.2d:%.2d %ld\n" -#define ASCTIME_FMT_B ASCTIME_FMT +#define ASCTIME_FMT "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n" +#define ASCTIME_FMT_B "%.3s %.3s%3d %.2d:%.2d:%.2d %d%d\n" #else /* !STRICTLY_STANDARD_ASCTIME */ /* ** Some systems only handle "%.2d"; others only handle "%02d"; @@ -31,14 +31,14 @@ static char elsieid[] = "@(#)asctime.c 7 ** 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" +#define ASCTIME_FMT "%.3s %.3s%3d %02.2d:%02.2d:%02.2d %-4d\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 ** 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" +#define ASCTIME_FMT_B "%.3s %.3s%3d %02.2d:%02.2d:%02.2d %d%d\n" #endif /* !STRICTLY_STANDARD_ASCTIME */ #define STD_ASCTIME_BUF_SIZE 26 @@ -74,7 +74,8 @@ char * buf; }; register const char * wn; register const char * mn; - long year; + int decade; + int y; char result[MAX_ASCTIME_BUF_SIZE]; if (timeptr->tm_wday < 0 || timeptr->tm_wday >= DAYSPERWEEK) @@ -83,16 +84,34 @@ char * buf; 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, - year); + if (-999 - TM_YEAR_BASE <= timeptr->tm_year + && timeptr->tm_year <= 9999 - TM_YEAR_BASE) { + (void) sprintf(result, + ASCTIME_FMT, + wn, mn, + timeptr->tm_mday, timeptr->tm_hour, + timeptr->tm_min, timeptr->tm_sec, + timeptr->tm_year + TM_YEAR_BASE); + } else { + decade = timeptr->tm_year / 10 + TM_YEAR_BASE / 10; + y = timeptr->tm_year % 10; + if (y < 0 && 0 < decade) { + y += 10; + decade--; + } else if (decade < 0 && 0 < y) { + y -= 10; + decade++; + } + (void) sprintf(result, + ASCTIME_FMT_B, + wn, mn, + timeptr->tm_mday, timeptr->tm_hour, + timeptr->tm_min, timeptr->tm_sec, + decade, y < 0 ? -y : y); + } if (strlen(result) < STD_ASCTIME_BUF_SIZE || buf == buf_asctime) { (void) strcpy(buf, result); return buf; =================================================================== RCS file: RCS/strftime.c,v retrieving revision 2004.4 retrieving revision 2004.4.0.4 diff -pu -r2004.4 -r2004.4.0.4 --- strftime.c 2004/09/09 15:48:53 2004.4 +++ strftime.c 2004/10/06 23:03:13 2004.4.0.4 @@ -1,12 +1,6 @@ -/* -** 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"; +static char elsieid[] = "@(#)strftime.c 7.70"; /* ** Based on the UCB version with the ID appearing below. ** This is ANSIish only when "multibyte character == plain character". @@ -114,10 +108,8 @@ static const struct lc_time_T C_time_loc 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 *)); +static char * _yconv P((int, int, int, int, char *, const char *)); extern char * tzname[]; @@ -125,7 +117,6 @@ extern char * tzname[]; #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 @@ -217,9 +208,8 @@ label: ** something completely different. ** (ado, 1993-05-24) */ - pt = _conv((int) ((t->tm_year + - (long) TM_YEAR_BASE) / 100), - "%02d", pt, ptlim); + pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 0, + pt, ptlim); continue; case 'c': { @@ -387,13 +377,14 @@ label: ** (ado, 1996-01-02) */ { - long year; + int year; + int base; int yday; int wday; int w; year = t->tm_year; - year += TM_YEAR_BASE; + base = TM_YEAR_BASE; yday = t->tm_yday; wday = t->tm_wday; for ( ; ; ) { @@ -401,7 +392,7 @@ label: int bot; int top; - len = isleap(year) ? + len = isleap_sum(year, base) ? DAYSPERLYEAR : DAYSPERNYEAR; /* @@ -420,7 +411,7 @@ label: top += DAYSPERWEEK; top += len; if (yday >= top) { - ++year; + ++base; w = 1; break; } @@ -429,8 +420,8 @@ label: DAYSPERWEEK); break; } - --year; - yday += isleap(year) ? + --base; + yday += isleap_sum(year, base) ? DAYSPERLYEAR : DAYSPERNYEAR; } @@ -444,12 +435,12 @@ label: if (*format == 'V') pt = _conv(w, "%02d", pt, ptlim); - else if (*format == 'g') { - *warnp = IN_ALL; - pt = _conv(int(year % 100), - "%02d", pt, ptlim); - } else pt = _lconv(year, "%04ld", - 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': @@ -484,15 +475,14 @@ label: *warnp = warn2; } 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); + 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,9 +546,10 @@ label: diff = -diff; } else sign = "+"; pt = _add(sign, pt, ptlim); - diff /= 60; - pt = _conv((diff/60)*100 + diff%60, - "%04d", pt, ptlim); + diff /= SECSPERMIN; + diff = (diff / MINSPERHOUR) * 100 + + (diff % MINSPERHOUR); + pt = _conv(diff, "%04d", pt, ptlim); } continue; case '+': @@ -596,26 +587,59 @@ const char * const ptlim; } static char * -_lconv(n, format, pt, ptlim) -const long n; -const char * const format; -char * const pt; +_add(str, pt, ptlim) +const char * str; +char * pt; const char * const ptlim; { - char buf[INT_STRLEN_MAXIMUM(long) + 1]; - - (void) sprintf(buf, format, n); - return _add(buf, pt, ptlim); + while (pt < ptlim && (*pt = *str++) != '\0') + ++pt; + return pt; } static char * -_add(str, pt, ptlim) -const char * str; +_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; { - while (pt < ptlim && (*pt = *str++) != '\0') - ++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. + */ + + int top, yy; + + yy = a % 100 + b % 100; + top = a / 100 + b / 100 + yy / 100; + yy %= 100; + + if (yy < 0 && 0 < top) { + yy += 100; + top--; + } else if (top < 0 && 0 < yy) { + yy -= 100; + top++; + } + + if (convert_top) { + if (top == 0 && yy < 0) { + pt = _add("-0", pt, ptlim); + } else { + pt = _conv(top, "%02d", pt, ptlim); + } + } + + if (convert_yy) { + pt = _conv(yy < 0 ? -yy : yy, "%02d", pt, ptlim); + } + return pt; } =================================================================== RCS file: RCS/zdump.c,v retrieving revision 2004.4 retrieving revision 2004.4.0.3 diff -pu -r2004.4 -r2004.4.0.3 --- zdump.c 2004/09/06 20:00:46 2004.4 +++ zdump.c 2004/10/06 23:03:13 2004.4.0.3 @@ -1,4 +1,4 @@ -static char elsieid[] = "@(#)zdump.c 7.40"; +static char elsieid[] = "@(#)zdump.c 7.41"; /* ** This code has been made independent of the rest of the time @@ -61,9 +61,25 @@ static char elsieid[] = "@(#)zdump.c 7.4 #endif /* !defined DAYSPERNYEAR */ #ifndef isleap -#define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) +#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0)) #endif /* !defined isleap */ +#ifndef isleap_sum +/* +** 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) +#endif /* !defined isleap_sum */ + #if HAVE_GETTEXT #include "locale.h" /* for setlocale */ #include "libintl.h" @@ -321,7 +337,7 @@ struct tm * oldp; 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 += DAYSPERNYEAR + isleap_sum(tmy, TM_YEAR_BASE); result += newp->tm_yday - oldp->tm_yday; result *= HOURSPERDAY; result += newp->tm_hour - oldp->tm_hour; @@ -384,6 +400,8 @@ register const struct tm * timeptr; }; register const char * wn; register const char * mn; + int decade; + int y; /* ** The packaged versions of localtime and gmtime never put out-of-range @@ -398,9 +416,18 @@ register const struct tm * timeptr; (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", + decade = timeptr->tm_year / 10 + TM_YEAR_BASE / 10; + y = timeptr->tm_year % 10; + if (y < 0 && 0 < decade) { + y += 10; + decade--; + } else if (decade < 0 && 0 < y) { + y -= 10; + decade++; + } + (void) printf("%.3s %.3s%3d %.2d:%.2d:%.2d %s%03d%d", wn, mn, timeptr->tm_mday, timeptr->tm_hour, timeptr->tm_min, timeptr->tm_sec, - timeptr->tm_year + (long) TM_YEAR_BASE); + decade == 0 && y < 0 ? "-" : "", decade, y < 0 ? -y : y); }

2 3

proposed tzdata fixes for Brazil, Argentina, Israel
by Paul Eggert Oct. 6, 2004

Oct. 6, 2004

Since the tz database is incorrect for some current time stamps in Argentina and Brazil, it's time for another update. Here's a proposed patch to implement the following changes: * Brazil has changed the DST start-date due to problems with its election software, and Mato Grosso will observe DST this year. (Thanks to Paulo Alexandre Pinto Pires and Rodrigo Severo for this info.) * Mendoza, Argentina is now back at -0300 (effective Sept 26). (Thanks to Steffen Thorsen for this info.) * San Juan, Argentina changed back to -0300 on July 25, and its transition date to -0400 was May 31, not June 1. (Thanks to Mariano Absatz for this info.) The following change affects commentary only: * Israel's Cabinet has discussed new DST rules but no decision has been reached yet. (Thanks to Ephraim Silverberg for this info.) =================================================================== RCS file: RCS/southamerica,v retrieving revision 2004.4 retrieving revision 2004.4.0.1 diff -pu -r2004.4 -r2004.4.0.1 --- southamerica 2004/09/22 12:27:29 2004.4 +++ southamerica 2004/10/06 23:16:13 2004.4.0.1 @@ -186,6 +186,20 @@ Rule Arg 2000 only - Mar Sun>=1 0:00 0 - # contains a contradiction. I would give more credence to the Saturday/Sunday # date than the "three days earlier" phrase, and conclude that Tierra del # Fuego set its clocks back at 2004-05-30 00:00. +# +# From Steffen Thorsen (2004-10-05): +# The previous law 7210 which changed the province of Mendoza's time zone +# back in May have been modified slightly in a new law 7277, which set the +# new end date to 2004-09-26 (original date was 2004-10-17). +# http://www.gobernac.mendoza.gov.ar/boletin/pdf/20040924-27244-normas.pdf +# +# From Mariano Absatz (2004-10-05): +# San Juan changed from UTC-03:00 to UTC-04:00 at midnight between +# Sunday, May 30th and Monday, May 31st. It changed back to UTC-03:00 +# at midnight between Saturday, July 24th and Sunday, July 25th.... +# http://www.sanjuan.gov.ar/prensa/archivo/000329.html +# http://www.sanjuan.gov.ar/prensa/archivo/000426.html +# http://www.sanjuan.gov.ar/prensa/archivo/000441.html # Unless otherwise specified, data are from Shanks through 1992, from # the IATA otherwise. As noted below, Shanks says that @@ -261,8 +275,8 @@ Zone America/Argentina/San_Juan -4:34:04 -4:00 - WART 1991 May 7 -3:00 Arg AR%sT 1999 Oct 3 -4:00 Arg AR%sT 2000 Mar 3 - -3:00 - ART 2004 Jun 1 - -4:00 - WART 2004 Oct 17 + -3:00 - ART 2004 May 31 + -4:00 - WART 2004 Jul 25 -3:00 - ART # # Jujuy (JY) @@ -306,7 +320,7 @@ Zone America/Argentina/Mendoza -4:35:16 -3:00 Arg AR%sT 1999 Oct 3 -4:00 Arg AR%sT 2000 Mar 3 -3:00 - ART 2004 May 23 - -4:00 - WART 2004 Oct 17 + -4:00 - WART 2004 Sep 26 -3:00 - ART # # Chubut (CH) @@ -420,6 +434,11 @@ Zone America/La_Paz -4:32:36 - LMT 1890 # the Government decided to postpone DST, instead of changing the Constitution # (maybe, for the next elections, it will be possible to change the clock)... +# From Rodrigo Severo (2004-10-04): +# It's just the biannual change made necessary by the much hyped, supposedly +# modern Brazilian eletronic voting machines which, apparently, can't deal +# with a time change between the first and the second rounds of the elections. + # From Paul Eggert (2002-10-10): # The official decrees referenced below are mostly taken from # <a href="http://pcdsh01.on.br/DecHV.html"> @@ -556,11 +575,15 @@ Rule Brazil 2001 max - Feb Sun>=15 0:00 Rule Brazil 2002 only - Nov 3 0:00 1:00 S # Decree 4,844 (2003-09-24; corrected 2003-09-26) repeals DST in BA, MT, TO. # <a href="http://www.presidencia.gov.br/CCIVIL/decreto/2003/D4844.htm"></a> -Rule Brazil 2003 max - Oct Sun>=15 0:00 1:00 S +Rule Brazil 2003 only - Oct 19 0:00 1:00 S +# Decree 5,223 (2004-10-01) reestablishes DST in MT. +# <a href="http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2004/Decreto/D5223.htm"></a> +Rule Brazil 2004 only - Nov 2 0:00 1:00 S # The latest ruleset listed above says that the following states observe DST: -# DF, ES, GO, MG, MS, PR, RJ, RS, SC, SP. +# DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP. # -# For dates after mid-2004, the above rules with TO="max" are guesses +Rule Brazil 2005 max - Oct Sun>=15 0:00 1:00 S +# For dates after mid-2005, the above rules with TO="max" are guesses # and are quite possibly wrong, but are more likely than no DST at all. @@ -648,7 +671,8 @@ Zone America/Campo_Grande -3:38:28 - LMT # Mato Grosso (MT) Zone America/Cuiaba -3:44:20 - LMT 1914 -4:00 Brazil AM%sT 2003 Sep 24 - -4:00 - AMT + -4:00 - AMT 2004 Oct 4 + -4:00 Brazil AM%sT # # west Para (PA), Rondonia (RO) # West Para includes Altamira, Oribidos, Prainha, Oriximina, and Santarem. =================================================================== RCS file: RCS/asia,v retrieving revision 2004.4 retrieving revision 2004.4.0.1 diff -pu -r2004.4 -r2004.4.0.1 --- asia 2004/09/22 12:27:29 2004.4 +++ asia 2004/10/06 23:16:13 2004.4.0.1 @@ -639,7 +639,7 @@ Rule Zion 1988 only - Apr 9 0:00 1:00 D Rule Zion 1988 only - Sep 3 0:00 0 S # From Ephraim Silverberg <ephraim(a)cs.huji.ac.il> -# (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17, 2000-07-25, and 2004-09-20): +# (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17 and 2000-07-25): # According to the Office of the Secretary General of the Ministry of # Interior, there is NO set rule for Daylight-Savings/Standard time changes. @@ -735,14 +735,6 @@ Rule Zion 2003 only - Oct 3 1:00 0 S Rule Zion 2004 only - Apr 7 1:00 1:00 D Rule Zion 2004 only - Sep 22 1:00 0 S -# The latest rumour, however, is that in 2005, when the clock changes to -# Daylight Saving Time (date as yet unknown), the move will be a two-hour leap -# forward (from UTC+0200 to UTC+0400) and then, in the fall, the clock will -# move back only an hour to UTC+0300 thus effectively moving Israel's timezone -# from UTC+0200 to UTC+0300. However, no actual draft has been put before the -# Knesset (Israel's Parliament) though the intention is to do so this -# month [2004-09]. - # From Paul Eggert (2000-07-25): # Here are guesses for rules after 2004. # They are probably wrong, but they are more likely than no DST at all. @@ -769,6 +761,26 @@ Zone Asia/Jerusalem 2:20:56 - LMT 1880 # direction is expected until the latter part of 2004 which is a long # time off in terms of Israeli politics. +# (2004-09-20): +# The latest rumour, however, is that in 2005, when the clock changes to +# Daylight Saving Time (date as yet unknown), the move will be a two-hour leap +# forward (from UTC+0200 to UTC+0400) and then, in the fall, the clock will +# move back only an hour to UTC+0300 thus effectively moving Israel's timezone +# from UTC+0200 to UTC+0300. However, no actual draft has been put before the +# Knesset (Israel's Parliament) though the intention is to do so this +# month [2004-09]. + +# (2004-09-26): +# Even though the draft law for the above did pass the Ministerial Committee +# for Legislative Matters three months ago, it was voted down in today's +# Cabinet meeting. The current suggestion is to keep the current timezone at +# UTC+0200 but have an extended period of Daylight Saving Time (UTC+0300) from +# the beginning of Passover holiday in the spring to after the Tabernacle +# holiday in the fall (i.e. the dates of which are governed by the Hebrew +# calendar but this means at least 184 days of DST). However, this is only a +# suggestion that was raised in today's cabinet meeting and has not yet been +# drafted. + ###############################################################################

1 0

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

Oct. 5, 2004

Here's the latest try at coping with wide-ranging tm_year values. This is based on the proposals circulated by Paul Eggert. I've tried to deal with the challenges of systems where the compiler's % operator doesn't do things the C99 way. I've also tried to deal with systems where sizeof (int) == sizeof (long) and the "long long" type is unavailable; Improvidently, this means doing double math in some cases. Note that these changes are relative to the stuff that's currently in ftp://elsie.nci.nih.gov --ado diff -c -r old/code/tzfile.h new/code/tzfile.h *** old/code/tzfile.h Wed Aug 11 11:59:05 2004 --- new/code/tzfile.h Tue Oct 5 10:17:24 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.15"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 157,168 **** #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 /* --- 157,184 ---- #define EPOCH_WDAY TM_THURSDAY /* ! ** Given an integral argument (a) and a positive integral argument (b), ! ** return a % b per C99. */ + #define C99IPMOD(a, b) ((-1 % 2 < 0 || (a) >= 0) ? \ + ((a) % (b)) : ((a) % (b) - (b))) + #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) + ** (at least under the C99 definition of %). + ** We use this to avoid addition overflow problems. + */ + + #define isleap_sum(a, b) isleap(C99IPMOD((a), 400) + C99IPMOD((b), 400)) + #ifndef USG /* diff -c -r old/code/asctime.c new/code/asctime.c *** old/code/asctime.c Wed Aug 11 11:59:06 2004 --- new/code/asctime.c Tue Oct 5 10:27:18 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.23"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 15,21 **** #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 */ /* --- 15,21 ---- #include "tzfile.h" #if STRICTLY_STANDARD_ASCTIME ! #define ASCTIME_FMT "%.3s %.3s%3d %.2d:%.2d:%.2d %.0lf\n" #define ASCTIME_FMT_B ASCTIME_FMT #else /* !STRICTLY_STANDARD_ASCTIME */ /* *************** *** 31,37 **** ** 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 --- 31,37 ---- ** 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 %-4.0lf\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,44 **** ** 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 --- 38,44 ---- ** 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 %.0lf\n" #endif /* !STRICTLY_STANDARD_ASCTIME */ #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) --- 74,80 ---- }; register const char * wn; register const char * mn; ! double year; char result[MAX_ASCTIME_BUF_SIZE]; if (timeptr->tm_wday < 0 || timeptr->tm_wday >= DAYSPERWEEK) *************** *** 83,89 **** 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. */ --- 83,89 ---- if (timeptr->tm_mon < 0 || timeptr->tm_mon >= MONSPERYEAR) mn = "???"; else mn = mon_name[timeptr->tm_mon]; ! year = (double) timeptr->tm_year + (double) TM_YEAR_BASE; /* ** We avoid using snprintf since it's not available on all systems. */ diff -c -r old/code/strftime.c new/code/strftime.c *** old/code/strftime.c Thu Sep 9 11:48:53 2004 --- new/code/strftime.c Tue Oct 5 10:20:02 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.70"; /* ** 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; } *************** *** 444,455 **** if (*format == 'V') pt = _conv(w, "%02d", 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': --- 435,446 ---- if (*format == 'V') pt = _conv(w, "%02d", 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': *************** *** 484,499 **** *warnp = warn2; } 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 if (t->TM_ZONE != NULL) --- 475,489 ---- *warnp = warn2; } 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 if (t->TM_ZONE != NULL) *************** *** 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,632 ---- return pt; } + 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; + { + char buf[INT_STRLEN_MAXIMUM(int) + 2]; + int i; + char * cp; + + if (!convert_top && !convert_yy) + return pt; + cp = buf; + i = a + b; + if ((i > a) == (b > 0)) + (void) sprintf(cp, "%04d", i); + else if (sizeof (long) > sizeof (int)) + (void) sprintf(cp, "%04ld", (long) a + (long) b); + else (void) sprintf(cp, "%04.0lf", (double) a + (double) b); + i = strlen(cp) - 2; + if (!convert_top) + cp += i; + else if (!convert_yy) + cp[i] = '\0'; + return _add(cp, pt, ptlim); + } + #ifdef LOCALE_HOME static struct lc_time_T * _loc P((void)) diff -c -r old/code/zdump.c new/code/zdump.c *** old/code/zdump.c Mon Sep 6 16:00:46 2004 --- new/code/zdump.c Tue Oct 5 10:17:24 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.41"; /* ** This code has been made independent of the rest of the time *************** *** 60,69 **** #define DAYSPERNYEAR 365 #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" --- 60,94 ---- #define DAYSPERNYEAR 365 #endif /* !defined DAYSPERNYEAR */ + #ifndef C99IPMOD + /* + ** Given an integral argument (a) and a positive integral argument (b), + ** return a % b per C99. + */ + + #define C99IPMOD(a, b) ((-1 % 2 < 0 || (a) >= 0) ? \ + ((a) % (b)) : ((a) % (b) - (b))) + #endif /* !defined C99IPMOD */ + #ifndef isleap ! #define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0)) #endif /* !defined isleap */ + #ifndef isleap_sum + /* + ** 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) + ** (at least under the C99 definition of %). + ** We use this to avoid addition overflow problems. + */ + + #define isleap_sum(a, b) isleap(C99IPMOD((a), 400) + C99IPMOD((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; --- 346,352 ---- 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; *************** *** 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); } --- 423,431 ---- (int) (sizeof mon_name / sizeof mon_name[0])) mn = "???"; else mn = mon_name[timeptr->tm_mon]; ! (void) printf("%.3s %.3s%3d %.2d:%.2d:%.2d %.0lf", wn, mn, timeptr->tm_mday, timeptr->tm_hour, timeptr->tm_min, timeptr->tm_sec, ! (double) timeptr->tm_year + (double) TM_YEAR_BASE); }

2 1