June 2017 - tz - lists.iana.org

proposed time zone package changes (Samoa, Factory, et al.)
by Arthur David Olson 28 Aug '19

28 Aug '19

Below find proposed time zone package changes; the executive summary: * Makefile Change LOCALTIME default from "Factory" to "GMT"; do not compile "factory" file (but keep it in the distribution). * Theory Remove reference to "Factory" zone. * australasia Change end of DST in Samoa in 2011 from 2011-04-03 0:00 to 2011-04-03 1:00 (thanks to Raymond Hughes for a reference). * localtime.c Initialize ttinfo structures filled by tzparse (thanks to Ravindra for reporting a valgrind warning). * zic.c Fix generation of POSIX strings for zones with rules using "weekday<=n" forms of dates (thanks to Lei Liu for finding the problem). Also, limit output for non-POSIX-specificable zones defined to follow the same rules every year. (Note that no zones of either of the above types appear in the distribution; these changes cater to add-on zones). If no problems are found, 2010n will appear on 2010-10-25. --ado diff -r -c old/Makefile new/Makefile *** old/Makefile Mon Sep 27 09:24:25 2010 --- new/Makefile Tue Oct 12 12:36:50 2010 *************** *** 1,5 **** # <pre> ! # @(#)Makefile 8.8 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. --- 1,5 ---- # <pre> ! # @(#)Makefile 8.9 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. *************** *** 12,18 **** # make zonenames # to get a list of the values you can use for LOCALTIME. ! LOCALTIME= Factory # If you want something other than Eastern United States time as a template # for handling POSIX-style time zone environment variables, --- 12,18 ---- # make zonenames # to get a list of the values you can use for LOCALTIME. ! LOCALTIME= GMT # If you want something other than Eastern United States time as a template # for handling POSIX-style time zone environment variables, *************** *** 262,269 **** DOCS= README Theory $(MANS) date.1 Makefile PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica ! YDATA= $(PRIMARY_YDATA) pacificnew etcetera factory backward ! NDATA= systemv SDATA= solar87 solar88 solar89 TDATA= $(YDATA) $(NDATA) $(SDATA) TABDATA= iso3166.tab zone.tab --- 262,269 ---- DOCS= README Theory $(MANS) date.1 Makefile PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica ! YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward ! NDATA= systemv factory SDATA= solar87 solar88 solar89 TDATA= $(YDATA) $(NDATA) $(SDATA) TABDATA= iso3166.tab zone.tab diff -r -c old/Theory new/Theory *** old/Theory Mon Sep 27 09:24:25 2010 --- new/Theory Tue Oct 12 12:36:50 2010 *************** *** 1,4 **** ! @(#)Theory 8.4 This file is in the public domain, so clarified as of 2009-05-17 by Arthur David Olson. --- 1,4 ---- ! @(#)Theory 8.5 This file is in the public domain, so clarified as of 2009-05-17 by Arthur David Olson. *************** *** 287,294 **** See the file `backward' for most of these older names (e.g. `US/Eastern' instead of `America/New_York'). The other old-fashioned names still supported are ! `WET', `CET', `MET', `EET' (see the file `europe'), ! and `Factory' (see the file `factory'). ----- Time zone abbreviations ----- --- 287,293 ---- See the file `backward' for most of these older names (e.g. `US/Eastern' instead of `America/New_York'). The other old-fashioned names still supported are ! `WET', `CET', `MET', and `EET' (see the file `europe'). ----- Time zone abbreviations ----- diff -r -c old/australasia new/australasia *** old/australasia Mon Sep 27 09:24:27 2010 --- new/australasia Tue Oct 12 13:14:56 2010 *************** *** 1,5 **** # <pre> ! # @(#)australasia 8.18 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. --- 1,5 ---- # <pre> ! # @(#)australasia 8.19 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. *************** *** 487,497 **** # http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%2020… # </a> Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time -11:00 - WST 2010 Sep 26 ! -11:00 1:00 WSDT 2011 Apr 3 -11:00 - WST # Solomon Is --- 487,507 ---- # http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%2020… # </a> + # From Raymond Hughes (2010-10-07): + # Please see + # <a href="http://www.mcil.gov.ws"> + # http://www.mcil.gov.ws + # </a>, + # the Ministry of Commerce, Industry and Labour (sideframe) "Last Sunday + # September 2010 (26/09/10) - adjust clocks forward from 12:00 midnight + # to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks + # backwards from 1:00am to 12:00am" + Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time -11:00 - WST 2010 Sep 26 ! -11:00 1:00 WSDT 2011 Apr 3 1:00 -11:00 - WST # Solomon Is diff -r -c old/localtime.c new/localtime.c *** old/localtime.c Mon Sep 27 09:24:26 2010 --- new/localtime.c Tue Oct 12 12:36:51 2010 *************** *** 5,11 **** #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)localtime.c 8.14"; #endif /* !defined NOID */ #endif /* !defined lint */ --- 5,11 ---- #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)localtime.c 8.15"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 914,919 **** --- 914,920 ---- register unsigned char * typep; register char * cp; register int load_result; + static struct ttinfo zttinfo; INITIALIZE(dstname); stdname = name; *************** *** 986,991 **** --- 987,993 ---- /* ** Two transitions per year, from EPOCH_YEAR forward. */ + sp->ttis[0] = sp->ttis[1] = zttinfo; sp->ttis[0].tt_gmtoff = -dstoffset; sp->ttis[0].tt_isdst = 1; sp->ttis[0].tt_abbrind = stdlen + 1; *************** *** 1099,1106 **** } /* ** Finally, fill in ttis. - ** ttisstd and ttisgmt need not be handled. */ sp->ttis[0].tt_gmtoff = -stdoffset; sp->ttis[0].tt_isdst = FALSE; sp->ttis[0].tt_abbrind = 0; --- 1101,1108 ---- } /* ** Finally, fill in ttis. */ + sp->ttis[0] = sp->ttis[1] = zttinfo; sp->ttis[0].tt_gmtoff = -stdoffset; sp->ttis[0].tt_isdst = FALSE; sp->ttis[0].tt_abbrind = 0; *************** *** 1113,1118 **** --- 1115,1121 ---- dstlen = 0; sp->typecnt = 1; /* only standard time */ sp->timecnt = 0; + sp->ttis[0] = zttinfo; sp->ttis[0].tt_gmtoff = -stdoffset; sp->ttis[0].tt_isdst = 0; sp->ttis[0].tt_abbrind = 0; diff -r -c old/zic.c new/zic.c *** old/zic.c Mon Sep 27 09:24:26 2010 --- new/zic.c Tue Oct 12 13:37:29 2010 *************** *** 3,9 **** ** 2006-07-17 by Arthur David Olson. */ ! static char elsieid[] = "@(#)zic.c 8.22"; #include "private.h" #include "locale.h" --- 3,9 ---- ** 2006-07-17 by Arthur David Olson. */ ! static char elsieid[] = "@(#)zic.c 8.24"; #include "private.h" #include "locale.h" *************** *** 1881,1896 **** register int week; if (rp->r_dycode == DC_DOWGEQ) { ! week = 1 + rp->r_dayofmonth / DAYSPERWEEK; ! if ((week - 1) * DAYSPERWEEK + 1 != rp->r_dayofmonth) return -1; } else if (rp->r_dycode == DC_DOWLEQ) { if (rp->r_dayofmonth == len_months[1][rp->r_month]) week = 5; else { ! week = 1 + rp->r_dayofmonth / DAYSPERWEEK; ! if (week * DAYSPERWEEK - 1 != rp->r_dayofmonth) return -1; } } else return -1; /* "cannot happen" */ (void) sprintf(result, "M%d.%d.%d", --- 1881,1896 ---- register int week; if (rp->r_dycode == DC_DOWGEQ) { ! if ((rp->r_dayofmonth % DAYSPERWEEK) != 1) return -1; + week = 1 + rp->r_dayofmonth / DAYSPERWEEK; } else if (rp->r_dycode == DC_DOWLEQ) { if (rp->r_dayofmonth == len_months[1][rp->r_month]) week = 5; else { ! if ((rp->r_dayofmonth % DAYSPERWEEK) != 0) return -1; + week = rp->r_dayofmonth / DAYSPERWEEK; } } else return -1; /* "cannot happen" */ (void) sprintf(result, "M%d.%d.%d", *************** *** 2018,2023 **** --- 2018,2024 ---- register char * envvar; register int max_abbr_len; register int max_envvar_len; + register int prodstic; /* all rules are min to max */ max_abbr_len = 2 + max_format_len + max_abbrvar_len; max_envvar_len = 2 * max_abbr_len + 5 * 9; *************** *** 2032,2037 **** --- 2033,2039 ---- timecnt = 0; typecnt = 0; charcnt = 0; + prodstic = zonecount == 1; /* ** Thanks to Earl Chew ** for noting the need to unconditionally initialize startttisstd. *************** *** 2053,2058 **** --- 2055,2062 ---- updateminmax(rp->r_loyear); if (rp->r_hiwasnum) updateminmax(rp->r_hiyear); + if (rp->r_lowasnum || rp->r_hiwasnum) + prodstic = FALSE; } } /* *************** *** 2075,2080 **** --- 2079,2094 ---- if (max_year <= INT_MAX - YEARSPERREPEAT) max_year += YEARSPERREPEAT; else max_year = INT_MAX; + /* + ** Regardless of any of the above, + ** for a "proDSTic" zone which specifies that its rules + ** always have and always will be in effect, + ** we only need one cycle to define the zone. + */ + if (prodstic) { + min_year = 1900; + max_year = min_year + YEARSPERREPEAT; + } } /* ** For the benefit of older systems,

5 6

Alberta Tory leadership candidate petitions to drop DST and move to CT
by Brian Inglis 19 Sep '17

19 Sep '17

On the final day of the fall sitting on Tuesday, Alberta Progressive Conservative leadership candidate, Vermilion-Lloydminster MLA Richard Starke presented a petition to the legislature calling for repeal of the Daylight Saving Time Act and a move to Central Time (from Mountain Time), to be decided by a referendum. The stories linked below are all from the same news org and under the same byline. The latter two have a vote button at the bottom to poll readers' opinions, each currently running about 80/20 in favour of dropping DST, and/or possibly also of switching to permanent CT, depending on whether the voters read the question or just clicked. http://calgaryherald.com/news/politics/pc-leadership-candidate-starke-calls… http://www.edmontonjournal.com/news/politics/leadership+candidate+starke+ca… http://www.calgarysun.com/2016/12/14/to-keep-or-ditch-daylight-saving-time-… http://www.edmontonsun.com/2016/12/14/to-keep-or-ditch-daylight-saving-time… -- Take care. Thanks, Brian Inglis, Calgary, Alberta, Canada

6 14

Syntax highlighting for Sublime Text
by Gilmore Davidson 16 Aug '17

16 Aug '17

Hi, I’ve created some tzdata syntax highlighting rules for the Sublime Text editor: https://packagecontrol.io/packages/zoneinfo <https://packagecontrol.io/packages/zoneinfo> I have no idea if anyone other than me uses that particular text editor for looking at tzdata files. But I thought I’d mention it just in case it’s useful to someone. Cheers, Gil

3 3

backzone/Europe/Guernsey
by Michael Deckers 10 Jul '17

10 Jul '17

For the connoisseurs of olde time stamps: The "LMT location" for backzone/Europe/Guernsey is given as "49.27N -2.33E" -- seemingly in degrees and decimal fractions of degrees. But the point ( +49.27°, -2.33° ) = ( +49°16′12″, -002°19′48″ ) is in open waters about 15 km south of Guernsey and east of Sark in the Channel. The point ( +49°27′, -002°33′ ), however, is in St Peter Port on the island, so that arc minutes and not hundredths of degrees must be meant. This also agrees with zone.tab. Hence: -# LMT Location - 49.27N -2.33E - St.Peter Port +# LMT Location - 49°27′N -2°33′E - St.Peter Port -Zone Europe/Guernsey -0:09:19 - LMT 1913 Jun 18 +Zone Europe/Guernsey -0:10:12 - LMT 1913 Jun 18 Michael Deckers. --- This email has been checked for viruses by Avast antivirus software. https://www.avast.com/antivirus

3 3

[PROPOSED] Avoid zic problems with errno == EOVERFLOW
by Paul Eggert 26 Jun '17

26 Jun '17

Although this patch does not fix any bugs, it makes zic’s ‘stat’ calls less likely to fail unnecessarily with errno == EOVERFLOW, and this should be a bit faster in some cases. Problem reported by Nick Alcock in: https://sourceware.org/ml/libc-alpha/2017-06/msg01264.html * private.h (_FILE_OFFSET_BITS, _LARGE_FILES) (_DARWIN_USE_64_BIT_INODE): New macros. --- private.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/private.h b/private.h index f5e39b5..2e8415e 100644 --- a/private.h +++ b/private.h @@ -102,6 +102,16 @@ /* Enable strtoimax on pre-C99 Solaris 11. */ #define __EXTENSIONS__ 1 +/* To avoid having 'stat' fail unnecessarily with errno == EOVERFLOW, + enable large files on GNUish systems ... */ +#ifndef _FILE_OFFSET_BITS +# define _FILE_OFFSET_BITS 64 +#endif +/* ... and on AIX ... */ +#define _LARGE_FILES 1 +/* ... and enable large inode numbers on Mac OS X 10.5 and later. */ +#define _DARWIN_USE_64_BIT_INODE 1 + /* ** Nested includes */ -- 2.9.4

1 0

[PROPOSED] Port to GCC 4.8.4
by Paul Eggert 16 Jun '17

16 Jun '17

Problem reported by Stan Shebs and Joseph Myers in: https://sourceware.org/ml/libc-alpha/2017-06/msg00741.html * NEWS, Makefile: Document this. * private.h (HAVE_GENERIC): New macro, so that we do not use _Generic with GCC 4.8. (TIME_T_MIN_NO_PADDING, TIME_T_MAX_NO_PADDING): New macros. (TIME_T_MIN, TIME_T_MAX): Rename from time_t_min and time_t_max, and turn them into macros so that problems are less likely to occur for subset uses like glibc where these macros are never expanded. All uses changed. Use new macros to work around GCC 4.8 bug. --- Makefile | 1 + NEWS | 3 +++ date.c | 2 +- localtime.c | 26 +++++++++++++------------- private.h | 60 ++++++++++++++++++++++++++++++++++++++++-------------------- 5 files changed, 58 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 2b31f3f..347ece7 100644 --- a/Makefile +++ b/Makefile @@ -142,6 +142,7 @@ LDLIBS= # -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r # -DHAVE_DECL_ENVIRON if <unistd.h> declares 'environ' # -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows) +# -DHAVE_GENERIC=0 if _Generic does not work # -DHAVE_GETTEXT if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris) # -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard diff --git a/NEWS b/NEWS index ca4fd8e..cfdd620 100644 --- a/NEWS +++ b/NEWS @@ -94,6 +94,9 @@ Unreleased, experimental changes zdump.c no longer assumes snprintf. (Reported by Jonathan Leffler.) + Calculation of time_t extrema works around a bug in GCC 4.8.4 + (Reported by Stan Shebs and Joseph Myers.) + Several minor changes have been made to the code to make it a bit easier to port to MS-Windows and Solaris. (Thanks to Kees Dekker for reporting the problems.) diff --git a/date.c b/date.c index b29e162..2cc533f 100644 --- a/date.c +++ b/date.c @@ -97,7 +97,7 @@ main(const int argc, char *argv[]) secs = strtoimax (optarg, &endarg, 0); if (*endarg || optarg == endarg) errno = EINVAL; - else if (! (time_t_min <= secs && secs <= time_t_max)) + else if (! (TIME_T_MIN <= secs && secs <= TIME_T_MAX)) errno = ERANGE; if (errno) { perror(optarg); diff --git a/localtime.c b/localtime.c index 8c944f3..2e1d621 100644 --- a/localtime.c +++ b/localtime.c @@ -464,17 +464,17 @@ tzloadbody(char const *name, struct state *sp, bool doextend, sp->charcnt = charcnt; /* Read transitions, discarding those out of time_t range. - But pretend the last transition before time_t_min - occurred at time_t_min. */ + But pretend the last transition before TIME_T_MIN + occurred at TIME_T_MIN. */ timecnt = 0; for (i = 0; i < sp->timecnt; ++i) { int_fast64_t at = stored == 4 ? detzcode(p) : detzcode64(p); - sp->types[i] = at <= time_t_max; + sp->types[i] = at <= TIME_T_MAX; if (sp->types[i]) { time_t attime - = ((TYPE_SIGNED(time_t) ? at < time_t_min : at < 0) - ? time_t_min : at); + = ((TYPE_SIGNED(time_t) ? at < TIME_T_MIN : at < 0) + ? TIME_T_MIN : at); if (timecnt && attime <= sp->ats[timecnt - 1]) { if (attime < sp->ats[timecnt - 1]) return EINVAL; @@ -524,7 +524,7 @@ tzloadbody(char const *name, struct state *sp, bool doextend, /* Leap seconds cannot occur before the Epoch. */ if (tr < 0) return EINVAL; - if (tr <= time_t_max) { + if (tr <= TIME_T_MAX) { /* Leap seconds cannot occur more than once per UTC month, and UTC months are at least 28 days long (minus 1 second for a negative leap second). Each leap second's @@ -1795,12 +1795,12 @@ increment_overflow_time(time_t *tp, int_fast32_t j) { /* ** This is like - ** 'if (! (time_t_min <= *tp + j && *tp + j <= time_t_max)) ...', + ** 'if (! (TIME_T_MIN <= *tp + j && *tp + j <= TIME_T_MAX)) ...', ** except that it does the right thing even if *tp + j would overflow. */ if (! (j < 0 - ? (TYPE_SIGNED(time_t) ? time_t_min - j <= *tp : -1 - j < *tp) - : *tp <= time_t_max - j)) + ? (TYPE_SIGNED(time_t) ? TIME_T_MIN - j <= *tp : -1 - j < *tp) + : *tp <= TIME_T_MAX - j)) return true; *tp += j; return false; @@ -1936,8 +1936,8 @@ time2sub(struct tm *const tmp, /* ** Do a binary search (this works whatever time_t's type is). */ - lo = time_t_min; - hi = time_t_max; + lo = TIME_T_MIN; + hi = TIME_T_MAX; for ( ; ; ) { t = lo / 2 + hi / 2; if (t < lo) @@ -1954,12 +1954,12 @@ time2sub(struct tm *const tmp, } else dir = tmcomp(&mytm, &yourtm); if (dir != 0) { if (t == lo) { - if (t == time_t_max) + if (t == TIME_T_MAX) return WRONG; ++t; ++lo; } else if (t == hi) { - if (t == time_t_min) + if (t == TIME_T_MIN) return WRONG; --t; --hi; diff --git a/private.h b/private.h index 2b07251..f5e39b5 100644 --- a/private.h +++ b/private.h @@ -27,6 +27,21 @@ #define HAVE_DECL_ASCTIME_R 1 #endif +#if !defined HAVE_GENERIC && defined __has_extension +# if __has_extension(c_generic_selections) +# define HAVE_GENERIC 1 +# else +# define HAVE_GENERIC 0 +# endif +#endif +/* _Generic is buggy in pre-4.9 GCC. */ +#if !defined HAVE_GENERIC && defined __GNUC__ +# define HAVE_GENERIC (4 < __GNUC__ + (9 <= __GNUC_MINOR__)) +#endif +#ifndef HAVE_GENERIC +# define HAVE_GENERIC (201112 <= __STDC_VERSION__) +#endif + #ifndef HAVE_GETTEXT #define HAVE_GETTEXT 0 #endif /* !defined HAVE_GETTEXT */ @@ -561,27 +576,32 @@ time_t time2posix_z(timezone_t, time_t) ATTRIBUTE_PURE; #define MINVAL(t, b) \ ((t) (TYPE_SIGNED(t) ? - TWOS_COMPLEMENT(t) - MAXVAL(t, b) : 0)) -/* The minimum and maximum finite time values. This implementation - assumes no padding if time_t is signed and either the compiler is - pre-C11 or time_t is not one of the standard signed integer types. */ -#if 201112 <= __STDC_VERSION__ -static time_t const time_t_min - = (TYPE_SIGNED(time_t) - ? _Generic((time_t) 0, - signed char: SCHAR_MIN, short: SHRT_MIN, - int: INT_MIN, long: LONG_MIN, long long: LLONG_MIN, - default: MINVAL(time_t, TYPE_BIT(time_t))) - : 0); -static time_t const time_t_max - = (TYPE_SIGNED(time_t) - ? _Generic((time_t) 0, - signed char: SCHAR_MAX, short: SHRT_MAX, - int: INT_MAX, long: LONG_MAX, long long: LLONG_MAX, - default: MAXVAL(time_t, TYPE_BIT(time_t))) - : -1); +/* The extreme time values, assuming no padding. */ +#define TIME_T_MIN_NO_PADDING MINVAL(time_t, TYPE_BIT(time_t)) +#define TIME_T_MAX_NO_PADDING MAXVAL(time_t, TYPE_BIT(time_t)) + +/* The extreme time values. These are macros, not constants, so that + any portability problem occur only when compiling .c files that use + the macros, which is safer for applications that need only zdump and zic. + This implementation assumes no padding if time_t is signed and + either the compiler lacks support for _Generic or time_t is not one + of the standard signed integer types. */ +#if HAVE_GENERIC +# define TIME_T_MIN \ + _Generic((time_t) 0, \ + signed char: SCHAR_MIN, short: SHRT_MIN, \ + int: INT_MIN, long: LONG_MIN, long long: LLONG_MIN, \ + default: TIME_T_MIN_NO_PADDING) +# define TIME_T_MAX \ + (TYPE_SIGNED(time_t) \ + ? _Generic((time_t) 0, \ + signed char: SCHAR_MAX, short: SHRT_MAX, \ + int: INT_MAX, long: LONG_MAX, long long: LLONG_MAX, \ + default: TIME_T_MAX_NO_PADDING) \ + : (time_t) -1) #else -static time_t const time_t_min = MINVAL(time_t, TYPE_BIT(time_t)); -static time_t const time_t_max = MAXVAL(time_t, TYPE_BIT(time_t)); +# define TIME_T_MIN TIME_T_MIN_NO_PADDING +# define TIME_T_MAX TIME_T_MAX_NO_PADDING #endif /* -- 2.9.4

1 0

[PROPOSED] Port check_time_t_alternatives to June 8 AIX fix
by Paul Eggert 16 Jun '17

16 Jun '17

* private.h (TZ_TIME_T): Declare strftime. This is helpful now that we use our own strftime. Declare strftime_l too, if present. --- private.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/private.h b/private.h index 982ddf3..2b07251 100644 --- a/private.h +++ b/private.h @@ -424,6 +424,12 @@ typedef time_tz tz_time_t; char *ctime(time_t const *); char *ctime_r(time_t const *, char *); double difftime(time_t, time_t) ATTRIBUTE_CONST; +size_t strftime(char *restrict, size_t, char const *restrict, + struct tm const *restrict); +# if HAVE_STRFTIME_L +size_t strftime_l(char *restrict, size_t, char const *restrict, + struct tm const *restrict, locale_t); +# endif struct tm *gmtime(time_t const *); struct tm *gmtime_r(time_t const *restrict, struct tm *restrict); struct tm *localtime(time_t const *); -- 2.9.4

1 0

Re: [tz] 1 s error in America/Adak and America/Nome
by Paul Eggert 15 Jun '17

15 Jun '17

On 06/10/2017 07:42 AM, Michael H Deckers wrote: > I do not understand the evidence for the proposed changes. A change of > time scale by 24 h is only observable though the day of the week and > the day number in a calendar (which may be combined with a switch of > calendars), but not through the time of day. > > Where two successive days are observed as Sundays, this is evidence > for the change of time scale having occurred at the instant between > the two. Yes. However, the the question is whether America/Sitka should record the time kept by those in formal control of Sitka, or the time kept by Toomas Ahllund and his fellow workers who made the transition on Sunday in order to have a longer weekend. If the former, the transition should be at 15:30 Friday (Gregorian); if the latter, it should presumably be at 00:00 Sunday (Gregorian). I chose the former, partly because it reflects formal transfer of control, and partly because we have a specific time-of-day recorded for it. > And if a precise instant for the acquisition of Alaska is > to be taken as the instant of the time zone change, then this > assumption > should be applied to all locations (where nothing else is known). > But the proposed changes to tzdb amount to the change happening when > UT = 1867-10-19 + 00:41:37 h for Yakutat > UT = 1867-10-19 + 00:31:13 h for Sitka, Juneau, Metlakatla > UT = 1867-10-19 + 00:31:03 h for Adak, Nome > UT = 1867-10-19 + 00:30:59 h for Anchorage > I do not see support for such variations. Thanks for reporting that; those were due to bugs in my calculations. I installed the attached patch to fix the bugs, and to try to clarify the point you mentioned.

5 12

[PROPOSED] Remove incorrect #endif comments
by Paul Eggert 14 Jun '17

14 Jun '17

--- localtime.c | 2 +- private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/localtime.c b/localtime.c index 1f5bbb2..8c944f3 100644 --- a/localtime.c +++ b/localtime.c @@ -94,7 +94,7 @@ static const char gmt[] = "GMT"; */ #ifndef TZDEFRULESTRING #define TZDEFRULESTRING ",M3.2.0,M11.1.0" -#endif /* !defined TZDEFDST */ +#endif struct ttinfo { /* time type information */ int_fast32_t tt_gmtoff; /* UT offset in seconds */ diff --git a/private.h b/private.h index e6cb21d..982ddf3 100644 --- a/private.h +++ b/private.h @@ -33,7 +33,7 @@ #ifndef HAVE_INCOMPATIBLE_CTIME_R #define HAVE_INCOMPATIBLE_CTIME_R 0 -#endif /* !defined INCOMPATIBLE_CTIME_R */ +#endif #ifndef HAVE_LINK #define HAVE_LINK 1 -- 2.9.4

1 0

[PROPOSED] Remove old Y2K code
by Paul Eggert 14 Jun '17

14 Jun '17

The circa-1996 runtime tests to catch potential Y2K problems are no longer worth the maintenance hassle, as the Y2K transition was done many years ago. * Makefile, NEWS: Mention this. * strftime.c (YEAR_2000_NAME, IN_NONE, IN_SOME, IN_THIS, IN_ALL): Remove. All uses removed. (strftime): Do not warn about Y2K problems. (_fmt): Omit last (warning) arg; all uses changed. --- Makefile | 3 --- NEWS | 2 ++ strftime.c | 71 ++++++++++++-------------------------------------------------- 3 files changed, 15 insertions(+), 61 deletions(-) diff --git a/Makefile b/Makefile index 07f4f77..65915ea 100644 --- a/Makefile +++ b/Makefile @@ -162,9 +162,6 @@ LDLIBS= # than what POSIX specifies, assuming local time is UT. # For example, N is 252460800 on AmigaOS. # -Dlocale_t=XXX if your system uses XXX instead of locale_t -# -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1 -# if you do not want run time warnings about formats that may cause -# year 2000 grief # -Dssize_t=long on hosts like MS-Windows that lack ssize_t # -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; # not needed by the main-program tz code, which is single-threaded. diff --git a/NEWS b/NEWS index 2c86e90..40285bf 100644 --- a/NEWS +++ b/NEWS @@ -81,6 +81,8 @@ Unreleased, experimental changes other two variables as optional. Also, USG_COMPAT is now 1 or 0: if not defined, the code attempts to guess it from other macros. + Y2K runtime checks have been removed, as Y2K was years ago. + Several minor changes have been made to the code to make it a bit easier to port to MS-Windows and Solaris. (Thanks to Kees Dekker for reporting the problems.) diff --git a/strftime.c b/strftime.c index 173ff8b..9df4176 100644 --- a/strftime.c +++ b/strftime.c @@ -101,19 +101,9 @@ static const struct lc_time_T C_time_locale = { static char * _add(const char *, char *, const char *); static char * _conv(int, const char *, char *, const char *); -static char * _fmt(const char *, const struct tm *, char *, const char *, - int *); +static char * _fmt(const char *, const struct tm *, char *, const char *); static char * _yconv(int, int, bool, bool, char *, char const *); -#ifndef YEAR_2000_NAME -#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 -#define IN_ALL 3 - #if HAVE_STRFTIME_L size_t strftime_l(char *s, size_t maxsize, char const *format, struct tm const *t, @@ -128,24 +118,9 @@ size_t strftime(char *s, size_t maxsize, const char *format, const struct tm *t) { char * p; - int warn; tzset(); - warn = IN_NONE; - p = _fmt(format, t, s, s + maxsize, &warn); -#ifndef NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU - if (warn != IN_NONE && getenv(YEAR_2000_NAME) != NULL) { - fprintf(stderr, "\n"); - fprintf(stderr, "strftime format \"%s\" ", format); - fprintf(stderr, "yields only two digits of years in "); - if (warn == IN_SOME) - fprintf(stderr, "some locales"); - else if (warn == IN_THIS) - fprintf(stderr, "the current locale"); - else fprintf(stderr, "all locales"); - fprintf(stderr, "\n"); - } -#endif /* !defined NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU */ + p = _fmt(format, t, s, s + maxsize); if (p == s + maxsize) return 0; *p = '\0'; @@ -153,8 +128,7 @@ strftime(char *s, size_t maxsize, const char *format, const struct tm *t) } static char * -_fmt(const char *format, const struct tm *t, char *pt, - const char *ptlim, int *warnp) +_fmt(const char *format, const struct tm *t, char *pt, const char *ptlim) { for ( ; *format; ++format) { if (*format == '%') { @@ -200,18 +174,10 @@ label: true, false, pt, ptlim); continue; case 'c': - { - int warn2 = IN_SOME; - - pt = _fmt(Locale->c_fmt, t, pt, ptlim, &warn2); - if (warn2 == IN_ALL) - warn2 = IN_THIS; - if (warn2 > *warnp) - *warnp = warn2; - } + pt = _fmt(Locale->c_fmt, t, pt, ptlim); continue; case 'D': - pt = _fmt("%m/%d/%y", t, pt, ptlim, warnp); + pt = _fmt("%m/%d/%y", t, pt, ptlim); continue; case 'd': pt = _conv(t->tm_mday, "%02d", pt, ptlim); @@ -232,7 +198,7 @@ label: pt = _conv(t->tm_mday, "%2d", pt, ptlim); continue; case 'F': - pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp); + pt = _fmt("%Y-%m-%d", t, pt, ptlim); continue; case 'H': pt = _conv(t->tm_hour, "%02d", pt, ptlim); @@ -296,10 +262,10 @@ label: pt, ptlim); continue; case 'R': - pt = _fmt("%H:%M", t, pt, ptlim, warnp); + pt = _fmt("%H:%M", t, pt, ptlim); continue; case 'r': - pt = _fmt("%I:%M:%S %p", t, pt, ptlim, warnp); + pt = _fmt("%I:%M:%S %p", t, pt, ptlim); continue; case 'S': pt = _conv(t->tm_sec, "%02d", pt, ptlim); @@ -322,7 +288,7 @@ label: } continue; case 'T': - pt = _fmt("%H:%M:%S", t, pt, ptlim, warnp); + pt = _fmt("%H:%M:%S", t, pt, ptlim); continue; case 't': pt = _add("\t", pt, ptlim); @@ -424,7 +390,6 @@ label: pt = _conv(w, "%02d", pt, ptlim); else if (*format == 'g') { - *warnp = IN_ALL; pt = _yconv(year, base, false, true, pt, ptlim); @@ -439,7 +404,7 @@ label: ** "date as dd-bbb-YYYY" ** (ado, 1993-05-24) */ - pt = _fmt("%e-%b-%Y", t, pt, ptlim, warnp); + pt = _fmt("%e-%b-%Y", t, pt, ptlim); continue; case 'W': pt = _conv((t->tm_yday + DAYSPERWEEK - @@ -452,21 +417,12 @@ label: pt = _conv(t->tm_wday, "%d", pt, ptlim); continue; case 'X': - pt = _fmt(Locale->X_fmt, t, pt, ptlim, warnp); + pt = _fmt(Locale->X_fmt, t, pt, ptlim); continue; case 'x': - { - int warn2 = IN_SOME; - - pt = _fmt(Locale->x_fmt, t, pt, ptlim, &warn2); - if (warn2 == IN_ALL) - warn2 = IN_THIS; - if (warn2 > *warnp) - *warnp = warn2; - } + pt = _fmt(Locale->x_fmt, t, pt, ptlim); continue; case 'y': - *warnp = IN_ALL; pt = _yconv(t->tm_year, TM_YEAR_BASE, false, true, pt, ptlim); @@ -559,8 +515,7 @@ label: #endif continue; case '+': - pt = _fmt(Locale->date_fmt, t, pt, ptlim, - warnp); + pt = _fmt(Locale->date_fmt, t, pt, ptlim); continue; case '%': /* -- 2.9.4

8 12