- tz - lists.iana.org

[PROPOSED] Use %z in vanguard form
by Paul Eggert July 22, 2022

July 22, 2022

* europe (Atlantic/Azores, Atlantic/Madeira): Add comments containing a vanguard equivalent. * ziguard.awk (get_minutes, offset_abbr): New functions. Support the special case for the Azores and Madeira. Convert to and from %z form. --- NEWS | 9 ++++++ europe | 12 ++++++-- ziguard.awk | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 4904819..33261ee 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ Unreleased, experimental changes Iran no longer observes DST after 2022. Rename Europe/Kiev to Europe/Kyiv. New zic -R option + Vanguard form now uses %z. Changes to future timestamps @@ -61,6 +62,14 @@ Unreleased, experimental changes Changes to build procedure + Source data in vanguard form now uses the %z notation, introduced + in release 2015f. For example, for America/Sao_Paulo vanguard + form contains the zone continuation line "-3:00 Brazil %z", which + is simpler and more reliable than the line "-3:00 Brazil -03/-02" + used in main and rearguard forms. The plan is for the main form + to use %z eventually; in the meantime maintainers of zi parsers + are encouraged to test the parsers on vanguard.zi. + 'make install' now defaults LOCALTIME to Factory not GMT, which means the default abbreviation is now "-00" not "GMT". diff --git a/europe b/europe index 0c008b4..776504d 100644 --- a/europe +++ b/europe @@ -2399,9 +2399,13 @@ Zone Europe/Lisbon -0:36:45 - LMT 1884 0:00 W-Eur WE%sT 1992 Sep 27 1:00s 1:00 EU CE%sT 1996 Mar 31 1:00u 0:00 EU WE%sT -# This Zone can be simplified once we assume zic %z. Zone Atlantic/Azores -1:42:40 - LMT 1884 # Ponta Delgada -1:54:32 - HMT 1912 Jan 1 2:00u # Horta MT +# Vanguard section, for zic and other parsers that support %z. +# -2:00 Port %z 1966 Apr 3 2:00 +# -1:00 Port %z 1983 Sep 25 1:00s +# -1:00 W-Eur %z 1992 Sep 27 1:00s +# Rearguard section, for parsers lacking %z; see ziguard.awk. -2:00 Port -02/-01 1942 Apr 25 22:00s -2:00 Port +00 1942 Aug 15 22:00s -2:00 Port -02/-01 1943 Apr 17 22:00s @@ -2413,11 +2417,14 @@ Zone Atlantic/Azores -1:42:40 - LMT 1884 # Ponta Delgada -2:00 Port -02/-01 1966 Apr 3 2:00 -1:00 Port -01/+00 1983 Sep 25 1:00s -1:00 W-Eur -01/+00 1992 Sep 27 1:00s +# End of rearguard section. 0:00 EU WE%sT 1993 Mar 28 1:00u -1:00 EU -01/+00 -# This Zone can be simplified once we assume zic %z. Zone Atlantic/Madeira -1:07:36 - LMT 1884 # Funchal -1:07:36 - FMT 1912 Jan 1 1:00u # Funchal MT +# Vanguard section, for zic and other parsers that support %z. +# -1:00 Port %z +# Rearguard section, for parsers lacking %z; see ziguard.awk. -1:00 Port -01/+00 1942 Apr 25 22:00s -1:00 Port +01 1942 Aug 15 22:00s -1:00 Port -01/+00 1943 Apr 17 22:00s @@ -2427,6 +2434,7 @@ Zone Atlantic/Madeira -1:07:36 - LMT 1884 # Funchal -1:00 Port -01/+00 1945 Apr 21 22:00s -1:00 Port +01 1945 Aug 25 22:00s -1:00 Port -01/+00 1966 Apr 3 2:00 +# End of rearguard section. 0:00 Port WE%sT 1983 Sep 25 1:00s 0:00 EU WE%sT diff --git a/ziguard.awk b/ziguard.awk index 25de617..91f6896 100644 --- a/ziguard.awk +++ b/ziguard.awk @@ -23,6 +23,33 @@ # of the input data as best it can within the constraints of the # rearguard format. +# Given a FIELD like "-0:30", return a minute count like -30. +function get_minutes(field, \ + sign, hours, minutes) +{ + sign = field ~ /^-/ ? -1 : 1 + hours = +field + if (field ~ /:/) { + minutes = field + sub(/[^:]*:/, "", minutes) + } + return 60 * hours + sign * minutes +} + +# Given an OFFSET, which is a minute count like 300 or 330, +# return a %z-style abbreviation like "+05" or "+0530". +function offset_abbr(offset, \ + hours, minutes, sign) +{ + hours = int(offset / 60) + minutes = offset % 60 + if (minutes) { + return sprintf("%+.4d", hours * 100 + minutes); + } else { + return sprintf("%+.2d", hours) + } +} + BEGIN { dataform_type["vanguard"] = 1 dataform_type["main"] = 1 @@ -85,6 +112,16 @@ DATAFORM != "main" { } } + # If this line should differ due to Portugal benefiting from %z if supported, + # uncomment the desired version and comment out the undesired one. + if (/^#?[\t ]+-[12]:00[\t ]+Port[\t ]+[%+-]/) { + if (/%z/ == (DATAFORM == "vanguard")) { + uncomment = in_comment + } else { + comment_out = !in_comment + } + } + if (uncomment) { sub(/^#/, "") } @@ -92,6 +129,52 @@ DATAFORM != "main" { sub(/^/, "#") } + # Prefer %z in vanguard form, explicit abbreviations otherwise. + if (DATAFORM == "vanguard") { + sub(/^(Zone[\t ]+[^\t ]+)?[\t ]+[^\t ]+[\t ]+[^\t ]+[\t ]+[-+][^\t ]+/, \ + "&CHANGE-TO-%z") + sub(/-00CHANGE-TO-%z/, "-00") + sub(/[-+][^\t ]+CHANGE-TO-/, "") + } else { + if (/^[^#]*%z/) { + stdoff_column = 2 * /^Zone/ + 1 + rules_column = stdoff_column + 1 + stdoff = get_minutes($stdoff_column) + rules = $rules_column + stdabbr = offset_abbr(stdoff) + if (rules == "-") { + abbr = stdabbr + } else { + dstabbr_only = rules ~ /^[+0-9-]/ + if (dstabbr_only) { + dstoff = get_minutes(rules) + } else { + # The DST offset is normally an hour, but there are special cases. + if (rules == "Morocco" && NF == 3) { + dstoff = -60 + } else if (rules == "NBorneo") { + dstoff = 20 + } else if (((rules == "Cook" || rules == "LH") && NF == 3) \ + || (rules == "Uruguay" \ + && /[\t ](1942 Dec 14|1960|1970|1974 Dec 22)$/)) { + dstoff = 30 + } else if (rules == "Uruguay" && /[\t ]1974 Mar 10$/) { + dstoff = 90 + } else { + dstoff = 60 + } + } + dstabbr = offset_abbr(stdoff + dstoff) + if (dstabbr_only) { + abbr = dstabbr + } else { + abbr = stdabbr "/" dstabbr + } + } + sub(/%z/, abbr) + } + } + if (DATAFORM == "rearguard") { # In rearguard form, change the Japan rule line with "Sat>=8 25:00" -- 2.36.1

1 0

[PATCH] * europe: Fix a few more "Kiev"s in comments.
by Paul Eggert July 21, 2022

July 21, 2022

--- europe | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/europe b/europe index 55217a1..0c008b4 100644 --- a/europe +++ b/europe @@ -2845,18 +2845,18 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880 2:00 - EET 1992 Mar 20 # Central Crimea used Moscow time 1994/1997. # -# From Paul Eggert (2022-04-18): -# The _Economist_ (1994-05-28, p 45) reports that central Crimea switched -# from Kiev to Moscow time sometime after the January 1994 elections. +# From Paul Eggert (2022-07-21): +# The _Economist_ (1994-05-28, p 45) reported that central Crimea switched +# from Kyiv to Moscow time sometime after the January 1994 elections. # Shanks (1999) says "date of change uncertain", but implies that it happened # sometime between the 1994 DST switches. Shanks & Pottenger simply say # 1994-09-25 03:00, but that can't be right. For now, guess it # changed in May. This change evidently didn't last long; see below. 2:00 C-Eur EE%sT 1994 May -# From IATA SSIM (1994/1997), which also says that Kerch is still like Kiev. +# From IATA SSIM (1994/1997), which also said that Kerch is still like Kyiv. 3:00 C-Eur MSK/MSD 1996 Mar 31 0:00s 3:00 1:00 MSD 1996 Oct 27 3:00s -# IATA SSIM (1997-09) says Crimea switched to EET/EEST. +# IATA SSIM (1997-09) said Crimea switched to EET/EEST. # Assume it happened in March by not changing the clocks. 3:00 - MSK 1997 Mar lastSun 1:00u # From Alexander Krivenyshev (2014-03-17): @@ -4078,7 +4078,7 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. # The law documents themselves are at # http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484 -# From Vladimir in Moscow via Alois Treindl re Kiev time 1991/2 (2014-02-28): +# From Vladimir in Moscow via Alois Treindl re Kyiv time 1991/2 (2014-02-28): # First in Ukraine they changed Time zone from UTC+3 to UTC+2 with DST: # 03 25 1990 02:00 -03.00 1 Time Zone 3 with DST # 07 01 1990 02:00 -02.00 1 Time Zone 2 with DST -- 2.36.1

1 0

[PATCH 1/3] * backward: Add backward-compatibility comment.
by Paul Eggert July 21, 2022

July 21, 2022

--- backward | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backward b/backward index a8fd620..5a86400 100644 --- a/backward +++ b/backward @@ -8,6 +8,10 @@ # also present in the file 'backzone', which has data important only # for pre-1970 timestamps and so is out of scope for tzdb proper. +# Although this file is optional and tzdb will work if you omit it by +# building with 'make BACKWARD=', in practice downstream users +# typically use this file for backward compatibility. + # Link TARGET LINK-NAME Link Africa/Nairobi Africa/Asmera Link Africa/Abidjan Africa/Timbuktu -- 2.36.1

1 2

Re: [tz] Fixing GeoNames timezone error
by dpatte July 19, 2022

July 19, 2022

I may be mistaken, but these other zones may be based on Indigenous reservations in these areas, some of which may not have used daylight saving time. ----- Original Message ----- From: Chris Walton via tz [mailto:tz@iana.org] To: "Evan Siroky" <evan.siroky(a)yahoo.com> Cc: kerry(a)shetline.com, tz(a)iana.org Sent: Tue, 19 Jul 2022 12:49:12 -0400 Subject: Re: [tz] Fixing GeoNames timezone error I mentioned earlier in this email thread that a large portion of Ontario (including the city of Barrie) is currently within the America/Nipigon boundary in Openstreetmap (OSM). I am 100% convinced the boundary is completely wrong. e.g. #1: The city of Barrie has been using daylight saving (during summer months) since at least 1930 which means it should be included within the America/Toronto boundary instead of the America/Nipigon boundary. Here are some newspaper pages containing Barrie daylight saving announcements for several different years that I picked at random: 1930: https://news.ourontario.ca/2760660/page/1835517 1946: https://news.ourontario.ca/2909650/page/13 1960: https://news.ourontario.ca/2919309/page/2280030 1970: https://news.ourontario.ca/2914181/page/2325462 1972: https://news.ourontario.ca/2917630/page/2349924 e.g. #2: I found documented proof that Prince Edward County was using daylight saving in 1970 which means it too should be moved from America/Nipigon to America/Toronto. Realistically it has probably been using daylight saving since WWII or earlier. The Kingston Whig Standard published this blurb on April 25, 1970:PICTON — Clocks go ahead one hour here Saturday night or Sunday morning, whichever you prefer, as Daylight Saving Time takes over in Prince Edward County. OSM mapper "ArcticGnome" claims to have based the OSM boundaries for America/Nipigon and America/Toronto on Shanks and Pottenger's International Atlas without realizing that much of the Shanks & Pottenger data was fake. Both myself and ArcticGnome are now pondering whether the inaccuracy of the data warrants eliminating the following zones from OSM. America/Nipigon America/Rainy_River America/Thunder_Bay America/Glace_Bay I believe that that decision should depend on whether Paul decides to continue maintaining them as dedicated zones in the TZ database. In my opinion, none of the data for these zones is trustworthy. America/Nipigon: Currently the TZ database shows that America/Nipigon adopted daylight saving in 1974. I don't have a complete history of daylight saving for Nipigon, but I did find a page from the Nipigon Gazette that clearly shows daylight saving ending for the 1972 season on October 29, 1972. https://news.ourontario.ca/npl/122271/page/2 The implication is that Nipigon has been using daylight saving since at least 1972 and therefore the data we are using for America/Nipigon is bogus. America/Rainy_River: I could not find any useful information to prove that the data for this zone is either correct or incorrect. America/Thunder_Bay: The TZ database shows that Thunder Bay and Toronto have been in sync since 1970 except for the year 1973. The database shows Thunder Bay skipped daylight saving in 1973. However, a relatively recent article in the Bayview Magazine seems to indicate that Thunder Bay did not actually skip daylight saving in 1973: http://www.bayviewmagazine.com/article/2022/03/great-springing-forward-deba… I sent an email to both the author of that article and one of the Thunder Bay archivists. In the email I asked for clarification about 1973. I will post here if I actually get a response. America/Glace_Bay: The TZ database shows Glace Bay adopted daylight saving in 1972. It is possible that this data is correct, but I am a bit skeptical. Glace Bay is a small town about 10km from Sydney. According to this document, Sydney was observing daylight saving in the year 1969: https://articles.adsabs.harvard.edu//full/1970JRASC..64..129T/0000135.000.h… There is no compelling reason to believe that Sydney would have abandoned daylight saving in 1970 and 1971. And there is no compelling reason to believe that Glace Bay would have kept its clocks out of sync with Sydney during the summers of 1970 and 1971. The truth about Glace Bay (and other communities in Cape Breton) will likely exist in the archives of the Cape Breton Post which are maintained on microfilm at the Cape Breton Regional Library in Sydney and at the Nova Scotia Archives in Halifax. -chris On Fri, 8 Jul 2022 at 05:33, Evan Siroky <evan.siroky(a)yahoo.com> wrote: I agree with Chris. I'm adding a reference to the GitHub issue that Kerry created. https://github.com/evansiroky/timezone-boundary-builder/issues/131 Evan On Friday, 8 July 2022 at 04:22:26 am GMT+2, Chris Walton via tz <tz(a)iana.org> wrote: The Nipigon/Toronto is a pet peeve of mine. It is the result of some questionable data inside Openstreetmap (OSM). Nipigon is a small township in Northern Ontario with a population of 1473 and an area of 108 square km. To put this into perspective: -Nipigon contains 0.01% of Ontario's total population. -Nipigon makes up 0.01% of Ontario's total land area. Inside OSM, somebody moved 73% of the land in Ontario into the America/Nipigon timezone. It was done with about 120 separate changesets between February and June of 2020. Some of the changesets have no source; others list "Shanks" as a reference. After following this mailing list for 15 years, I am very skeptical of the work published by Shanks, but I am in no position to prove it is wrong. I am also skeptical that anybody travelling directly by car from Windsor to Montreal (post 1970) would have had to pass through multiple time zone regions. The OSM relations are listed below. Note that if you click on the OSM links, the colour orange is used for both inner and outer boundaries thus the inner polygons are "holes" or "excluded areas". Without shading, it is not always simple to recognize this. The relations are large and may take some time to load in your browser. OSM America/Toronto relation: Includes most of Quebec and most urban centres in Ontario. Area: 1,546,844.1 square km. https://www.openstreetmap.org/relation/6483867#map=5/53.592/-73.135 OSM America/Nipigon relation: Includes most rural areas of Ontario east of 90°W Also includes a few populated centers such as Sarnia (pop: 72,047) and Barrie (pop: 147,829). Area: 787,493.2 square km. https://www.openstreetmap.org/relation/6498592#map=6/45.982/-81.573 >From a daylight saving standpoint, both zones have been the same since 1974. It would be very helpful if somebody could accurately determine when Barrie and Sarnia started using daylight saving (without using Shanks or OSM as a reference). -chris On Thu, 7 Jul 2022 at 15:11, Kerry Shetline via tz <tz(a)iana.org> wrote:I’ll post a more detailed comment on GitHub later, and link to my own code where I’m trying to use your boundaries to solve some of these issues. For the example of Walpole Island, Ontario, when I try to find a zone that contains the lat/long of this location, I oddly get the match for America/Nigipon rather than America/Toronto (at least it’s not America/Detroit, as GeoNames has it). I get several matches, in fact, for America/Nigipon that don’t make sense, given that this zone should have a very small area. I’m using the @turf/turf npm library to parse the shape files, and booleanPointInPolygon() to check if a particular zone contains a specific lat/long point. > Evan Siroky <evan.siroky(a)yahoo.com> writes: > > Hello, > I'm the maintainer of?https://github.com/evansiroky/timezone-boundary-builder?which is a project that?extracts data from Open Street Map (OSM) to build shape files of the boundaries of the world's timezones. If you find inaccuracies with the data generated from this project, I'd love to know about these problems. Feel free to submit an issue in the GitHub project noting any problem that you see. > Evan

1 0

Re: [tz] Fixing GeoNames timezone error
by Kerry Shetline July 19, 2022

July 19, 2022

I’ll post a more detailed comment on GitHub later, and link to my own code where I’m trying to use your boundaries to solve some of these issues. For the example of Walpole Island, Ontario, when I try to find a zone that contains the lat/long of this location, I oddly get the match for America/Nigipon rather than America/Toronto (at least it’s not America/Detroit, as GeoNames has it). I get several matches, in fact, for America/Nigipon that don’t make sense, given that this zone should have a very small area. I’m using the @turf/turf npm library to parse the shape files, and booleanPointInPolygon() to check if a particular zone contains a specific lat/long point. > Evan Siroky <evan.siroky(a)yahoo.com> writes: > > Hello, > I'm the maintainer of?https://github.com/evansiroky/timezone-boundary-builder?which is a project that?extracts data from Open Street Map (OSM) to build shape files of the boundaries of the world's timezones. If you find inaccuracies with the data generated from this project, I'd love to know about these problems. Feel free to submit an issue in the GitHub project noting any problem that you see. > Evan

4 4

Re: [tz] [PROPOSED] New file tzdata.zi for text-format tzdata
by Dot T July 12, 2022

July 12, 2022

With a few exceptions, all files in the tz code and data (including this one) are in the public domain. The exceptions are date.c, newstrftime.3, and strftime.c, which contain material derived from BSD and which use the BSD 3-clause license.

1 0

Re: [tz] [PROPOSED] New file tzdata.zi for text-format tzdata
by Dot T July 12, 2022

July 12, 2022

With a few exceptions, all files in the tz code and data (including this one) are in the public domain. The exceptions are date.c, newstrftime.3, and strftime.c, which contain material derived from BSD and which use the BSD 3-clause license.

1 0

[PROPOSED 1/5] * zic.8: fix minus typo
by Paul Eggert July 12, 2022

July 12, 2022

--- zic.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zic.8 b/zic.8 index 0cd0781..e8816e5 100644 --- a/zic.8 +++ b/zic.8 @@ -145,7 +145,7 @@ outputs data intended only for nonnegative timestamps that fit into 31-bit signed integers. On platforms with GNU .BR date , -.q "zic \-r @$(date +%s)" +.q "zic \*-r @$(date +%s)" omits data intended for past timestamps. Although this option typically reduces the output file's size, the size can increase due to the need to represent the timestamp range -- 2.34.1

1 4

[PATCH] Add -R option to zic
by Paul Eggert July 12, 2022

July 12, 2022

(Need suggested by Almaz Mingaleev.) * NEWS, zic.8: Document option. * zic.c (usage): Mention new option. (redundant_time): New static var. (redundant_time_option): New function. (main, writezone, outzone): Support -R. --- NEWS | 4 ++++ zic.8 | 11 +++++++++++ zic.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 60deee4..850e38b 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ Unreleased, experimental changes Briefly: Iran no longer observes DST after 2022. Rename Europe/Kiev to Europe/Kyiv. + New zic -R option Changes to future timestamps @@ -38,6 +39,9 @@ Unreleased, experimental changes Changes to code + zic has a new option '-R @N' to output explicit transitions < N. + (Need suggested by Almaz Mingaleev.) + 'zic -r @N' no longer outputs bad data when N < first transition. (Problem introduced in 2021d and reported by Peter Krefting.) diff --git a/zic.8 b/zic.8 index 3f228a6..0cd0781 100644 --- a/zic.8 +++ b/zic.8 @@ -159,6 +159,17 @@ Also see the .B "\*-b slim" option for another way to shrink output size. .TP +.BI "\*-R @" hi +Generate redundant trailing explicit transitions for timestamps +that occur less than +.I hi +seconds since the Epoch, even though the transitions could be +more concisely represented via the extended POSIX TZ string. +This option does not affect the represented timestamps. +Although it accommodates nonstandard TZif readers +that ignore the extended POSIX TZ string, +it increases the size of the altered output files. +.TP .BI "\*-t " file When creating local time information, put the configuration link in the named file rather than in the standard location. diff --git a/zic.c b/zic.c index 19e145a..e081c3d 100644 --- a/zic.c +++ b/zic.c @@ -579,7 +579,8 @@ usage(FILE *stream, int status) _("%s: usage is %s [ --version ] [ --help ] [ -v ] \\\n" "\t[ -b {slim|fat} ] [ -d directory ] [ -l localtime ]" " [ -L leapseconds ] \\\n" - "\t[ -p posixrules ] [ -r '[@lo][/@hi]' ] [ -t localtime-link ] \\\n" + "\t[ -p posixrules ] [ -r '[@lo][/@hi]' ] [ -R '@hi' ] \\\n" + "\t[ -t localtime-link ] \\\n" "\t[ filename ... ]\n\n" "Report bugs to %s.\n"), progname, progname, REPORT_BUGS_TO); @@ -681,6 +682,9 @@ static zic_t const max_time = MAXVAL(zic_t, TIME_T_BITS_IN_FILE); static zic_t lo_time = MINVAL(zic_t, TIME_T_BITS_IN_FILE); static zic_t hi_time = MAXVAL(zic_t, TIME_T_BITS_IN_FILE); +/* The time specified by the -R option, defaulting to MIN_TIME. */ +static zic_t redundant_time = MINVAL(zic_t, TIME_T_BITS_IN_FILE); + /* The time specified by an Expires line, or negative if no such line. */ static zic_t leapexpires = -1; @@ -712,6 +716,22 @@ timerange_option(char *timerange) return true; } +/* Generate redundant time stamps up to OPT. Return true if successful. */ +static bool +redundant_time_option(char *opt) +{ + if (*opt == '@') { + intmax_t redundant; + char *opt_end; + redundant = strtoimax(opt + 1, &opt_end, 10); + if (opt_end != opt + 1 && !*opt_end) { + redundant_time = max(redundant_time, redundant); + return true; + } + } + return false; +} + static const char * psxrules; static const char * lcltime; static const char * directory; @@ -764,7 +784,8 @@ main(int argc, char **argv) } else if (strcmp(argv[k], "--help") == 0) { usage(stdout, EXIT_SUCCESS); } - while ((c = getopt(argc, argv, "b:d:l:L:p:r:st:vy:")) != EOF && c != -1) + while ((c = getopt(argc, argv, "b:d:l:L:p:r:R:st:vy:")) != EOF + && c != -1) switch (c) { default: usage(stderr, EXIT_FAILURE); @@ -851,12 +872,23 @@ _("%s: invalid time range: %s\n"), } timerange_given = true; break; + case 'R': + if (! redundant_time_option(optarg)) { + fprintf(stderr, _("%s: invalid time: %s\n"), + progname, optarg); + return EXIT_FAILURE; + } + break; case 's': warning(_("-s ignored")); break; } if (optind == argc - 1 && strcmp(argv[optind], "=") == 0) usage(stderr, EXIT_FAILURE); /* usage message by request */ + if (hi_time + (hi_time < ZIC_MAX) < redundant_time) { + fprintf(stderr, _("%s: -R time exceeds -r cutoff\n"), progname); + return EXIT_FAILURE; + } if (bloat == 0) { static char const bloat_default[] = ZIC_BLOAT_DEFAULT; if (strcmp(bloat_default, "slim") == 0) @@ -2139,7 +2171,10 @@ writezone(const char *const name, const char *const string, char version, rangeall.defaulttype = defaulttype; rangeall.count = timecnt; rangeall.leapcount = leapcnt; - range64 = limitrange(rangeall, lo_time, hi_time, ats, types); + range64 = limitrange(rangeall, lo_time, + max(hi_time, + redundant_time - (ZIC_MIN < redundant_time)), + ats, types); range32 = limitrange(range64, INT32_MIN, INT32_MAX, ats, types); /* TZif version 4 is needed if a no-op transition is appended to @@ -2893,6 +2928,8 @@ outzone(const struct zone *zpfirst, ptrdiff_t zonecount) max_year = min_year + years_of_observations; } } + max_year = max(max_year, (redundant_time / (SECSPERDAY * DAYSPERNYEAR) + + EPOCH_YEAR + 1)); max_year0 = max_year; if (want_bloat()) { /* For the benefit of older systems, @@ -3061,6 +3098,7 @@ outzone(const struct zone *zpfirst, ptrdiff_t zonecount) offset = oadd(zp->z_stdoff, rp->r_save); if (!want_bloat() && !useuntil && !do_extend && prevrp && lo_time <= prevktime + && redundant_time <= ktime && rp->r_hiyear == ZIC_MAX && prevrp->r_hiyear == ZIC_MAX) break; -- 2.34.1

1 0

to Pierre Cashon
by Petro Ordynskyi July 12, 2022

July 12, 2022

1 0