- tz - lists.iana.org

[PROPOSED PATCH 1/2] Move out-of-scope UTC+2 African zones to 'backzone'.
by Paul Eggert Sept. 6, 2014

Sept. 6, 2014

* africa (Africa/Blantyre, Africa/Bujumbura, Africa/Gaborone) (Africa/Harare, Africa/Kigali, Africa/Lubumbashi, Africa/Lusaka): Change these from zones to links to Africa/Maputo. (Africa/Maseru, Africa/Mbabane): Change these from zones to links to Africa/Johannesburg. * backzone: Move the old data here. * checktab.awk (tztab): Remove special cases for these zones. * NEWS: Document the above. --- NEWS | 8 ++++++++ africa | 55 ++++++++++++++++++------------------------------------- backzone | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- checktab.awk | 9 --------- 4 files changed, 73 insertions(+), 49 deletions(-) diff --git a/NEWS b/NEWS index 0327005..91ce1e7 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,14 @@ Unreleased, experimental changes Shanks says Asia/Novokuznetsk switched from LMT (not "NMT") on 1924-05-01, not 1920-01-06. The old entry was based on a misinterpretation of Shanks. + Some more zones have been turned into links, when they differed + from existing zones only for older time stamps. As usual, + these changes affect UTC offsets in pre-1970 time stamps only. + Their old contents have been moved to the 'backzone' file. + The affected zones are: Africa/Blantyre, Africa/Bujumbura, + Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi, + Africa/Lusaka, Africa/Maseru, and Africa/Mbabane. + Changes affecting code An access to uninitalized data has been fixed. diff --git a/africa b/africa index 10354b0..b17c62b 100644 --- a/africa +++ b/africa @@ -110,23 +110,13 @@ Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01 # See Africa/Lagos. # Botswana -# From Paul Eggert (2013-02-21): -# Milne says they were regulated by the Cape Town Signal in 1899; -# assume they switched to 2:00 when Cape Town did. -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Gaborone 1:43:40 - LMT 1885 - 1:30 - SAST 1903 Mar - 2:00 - CAT 1943 Sep 19 2:00 - 2:00 1:00 CAST 1944 Mar 19 2:00 - 2:00 - CAT +# See Africa/Maputo. # Burkina Faso # See Africa/Abidjan. # Burundi -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Bujumbura 1:57:28 - LMT 1890 - 2:00 - CAT +# See Africa/Maputo. # Cameroon # See Africa/Lagos. @@ -161,10 +151,7 @@ Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro 3:00 - EAT # Democratic Republic of the Congo -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9 - 2:00 - CAT -# The above is for the eastern part; see Africa/Lagos for the western part. +# See Africa/Lagos for the western part and Africa/Maputo for the eastern. # Republic of the Congo # See Africa/Lagos. @@ -466,11 +453,7 @@ Zone Africa/Nairobi 2:27:16 - LMT 1928 Jul 3:00 - EAT # Lesotho -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Maseru 1:50:00 - LMT 1903 Mar - 2:00 - SAST 1943 Sep 19 2:00 - 2:00 1:00 SAST 1944 Mar 19 2:00 - 2:00 - SAST +# See Africa/Johannesburg. # Liberia # From Paul Eggert (2006-03-22): @@ -552,9 +535,7 @@ Zone Indian/Antananarivo 3:10:04 - LMT 1911 Jul 3:00 - EAT # Malawi -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Blantyre 2:20:00 - LMT 1903 Mar - 2:00 - CAT +# See Africa/Maputo. # Mali # Mauritania @@ -964,6 +945,13 @@ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Maputo 2:10:20 - LMT 1903 Mar 2:00 - CAT +Link Africa/Maputo Africa/Blantyre # Malawi +Link Africa/Maputo Africa/Bujumbura # Burundi +Link Africa/Maputo Africa/Gaborone # Botswana +Link Africa/Maputo Africa/Harare # Zimbabwe +Link Africa/Maputo Africa/Kigali # Rwanda +Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo +Link Africa/Maputo Africa/Lusaka # Zambia # Namibia # The 1994-04-03 transition is from Shanks & Pottenger. @@ -1031,9 +1019,7 @@ Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis # Tromelin - inhabited until at least 1958 # Rwanda -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Kigali 2:00:16 - LMT 1935 Jun - 2:00 - CAT +# See Africa/Maputo. # St Helena # See Africa/Abidjan. @@ -1077,6 +1063,9 @@ Rule SA 1943 1944 - Mar Sun>=15 2:00 0 - Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8 1:30 - SAST 1903 Mar 2:00 SA SAST +Link Africa/Johannesburg Africa/Maseru # Lesotho +Link Africa/Johannesburg Africa/Mbabane # Swaziland +# # Marion and Prince Edward Is # scientific station since 1947 # no information @@ -1104,9 +1093,7 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 Link Africa/Khartoum Africa/Juba # Swaziland -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar - 2:00 - SAST +# See Africa/Johannesburg. # Tanzania # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1227,11 +1214,5 @@ Zone Africa/Kampala 2:09:40 - LMT 1928 Jul 3:00 - EAT # Zambia -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Lusaka 1:53:08 - LMT 1903 Mar - 2:00 - CAT - # Zimbabwe -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Harare 2:04:12 - LMT 1903 Mar - 2:00 - CAT +# See Africa/Maputo. diff --git a/backzone b/backzone index d9183cd..d63afab 100644 --- a/backzone +++ b/backzone @@ -57,10 +57,18 @@ Zone Africa/Banjul -1:06:36 - LMT 1912 -1:00 - WAT 1964 0:00 - GMT +# Malawi +Zone Africa/Blantyre 2:20:00 - LMT 1903 Mar + 2:00 - CAT + # Republic of the Congo Zone Africa/Brazzaville 1:01:08 - LMT 1912 1:00 - WAT +# Burundi +Zone Africa/Bujumbura 1:57:28 - LMT 1890 + 2:00 - CAT + # Guinea Zone Africa/Conakry -0:54:52 - LMT 1912 0:00 - GMT 1934 Feb 26 @@ -92,11 +100,29 @@ Zone Africa/Freetown -0:53:00 - LMT 1882 -1:00 SL %s 1957 0:00 SL %s +# Botswana +# From Paul Eggert (2013-02-21): +# Milne says they were regulated by the Cape Town Signal in 1899; +# assume they switched to 2:00 when Cape Town did. +Zone Africa/Gaborone 1:43:40 - LMT 1885 + 1:30 - SAST 1903 Mar + 2:00 - CAT 1943 Sep 19 2:00 + 2:00 1:00 CAST 1944 Mar 19 2:00 + 2:00 - CAT + +# Zimbabwe +Zone Africa/Harare 2:04:12 - LMT 1903 Mar + 2:00 - CAT + # South Sudan Zone Africa/Juba 2:06:24 - LMT 1931 2:00 Sudan CA%sT 2000 Jan 15 12:00 3:00 - EAT +# Rwanda +Zone Africa/Kigali 2:00:16 - LMT 1935 Jun + 2:00 - CAT + # Democratic Republic of the Congo (west) Zone Africa/Kinshasa 1:01:12 - LMT 1897 Nov 9 1:00 - WAT @@ -105,6 +131,10 @@ Zone Africa/Kinshasa 1:01:12 - LMT 1897 Nov 9 Zone Africa/Libreville 0:37:48 - LMT 1912 1:00 - WAT +# Togo +Zone Africa/Lome 0:04:52 - LMT 1893 + 0:00 - GMT + # Angola # # Shanks gives 1911-05-26 for the transition to WAT, @@ -116,9 +146,13 @@ Zone Africa/Luanda 0:52:56 - LMT 1892 0:52:04 - AOT 1912 Jan 1 # Angola Time 1:00 - WAT -# Togo -Zone Africa/Lome 0:04:52 - LMT 1893 - 0:00 - GMT +# Democratic Republic of the Congo (east) +Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9 + 2:00 - CAT + +# Zambia +Zone Africa/Lusaka 1:53:08 - LMT 1903 Mar + 2:00 - CAT # Equatorial Guinea # @@ -131,6 +165,16 @@ Zone Africa/Malabo 0:35:08 - LMT 1912 0:00 - GMT 1963 Dec 15 1:00 - WAT +# Lesotho +Zone Africa/Maseru 1:50:00 - LMT 1903 Mar + 2:00 - SAST 1943 Sep 19 2:00 + 2:00 1:00 SAST 1944 Mar 19 2:00 + 2:00 - SAST + +# Swaziland +Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar + 2:00 - SAST + # Niger Zone Africa/Niamey 0:08:28 - LMT 1912 -1:00 - WAT 1934 Feb 26 diff --git a/checktab.awk b/checktab.awk index 0f113f4..84c49ff 100644 --- a/checktab.awk +++ b/checktab.awk @@ -17,18 +17,9 @@ BEGIN { if (zone_table == "zone1970.tab") { tztab["Africa/Addis_Ababa"] = 1 tztab["Africa/Asmara"] = 1 - tztab["Africa/Blantyre"] = 1 - tztab["Africa/Bujumbura"] = 1 tztab["Africa/Dar_es_Salaam"] = 1 tztab["Africa/Djibouti"] = 1 - tztab["Africa/Gaborone"] = 1 - tztab["Africa/Harare"] = 1 tztab["Africa/Kampala"] = 1 - tztab["Africa/Kigali"] = 1 - tztab["Africa/Lubumbashi"] = 1 - tztab["Africa/Lusaka"] = 1 - tztab["Africa/Maseru"] = 1 - tztab["Africa/Mbabane"] = 1 tztab["Africa/Mogadishu"] = 1 tztab["America/Antigua"] = 1 tztab["America/Cayman"] = 1 -- 1.9.1

1 1

[PROPOSED PATCH] * europe (Asia/Novokuznetsk), NEWS: Fix misreading of Shanks.
by Paul Eggert Sept. 6, 2014

Sept. 6, 2014

--- NEWS | 8 ++++++++ europe | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 8ddd091..50b5852 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,13 @@ News for the tz database +Unreleased, experimental changes + + Changes affecting past time stamps + + Shanks says Asia/Novokuznetsk switched from LMT (not "NMT") on 1924-05-01, + not 1920-01-06. The old entry was based on a misinterpretation of Shanks. + + Release 2014g - 2014-08-28 12:31:23 -0700 Changes affecting future time stamps diff --git a/europe b/europe index 0130552..067acb6 100644 --- a/europe +++ b/europe @@ -2501,7 +2501,7 @@ Zone Asia/Novosibirsk 5:31:40 - LMT 1919 Dec 14 6:00 # The Kemerovo region will remain at UTC+7 through the 2014-10-26 change, thus # realigning itself with KRAT. -Zone Asia/Novokuznetsk 5:48:48 - NMT 1920 Jan 6 +Zone Asia/Novokuznetsk 5:48:48 - LMT 1924 May 1 6:00 - KRAT 1930 Jun 21 # Krasnoyarsk Time 7:00 Russia KRA%sT 1991 Mar 31 2:00s 6:00 Russia KRA%sT 1992 Jan 19 2:00s -- 1.9.1

1 0

Confirm
by luis zavala Sept. 5, 2014

Sept. 5, 2014

Confirm

1 0

Re: [tz] [tz-announce] 2014g release of tz code and data available
by Paul Eggert Sept. 4, 2014

Sept. 4, 2014

kzimmermann(a)ups.com wrote: > Does this mean that Turks and Caicos will NOT BE OBSERVING DayLight Savings time anymore? Yes, starting in November according to 2014g. See its 'northamerica' file, which cites the following for why they won't change the clocks in November: http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm 2014g models this as a change from Eastern Daylight Time (EDT, UTC-4) to Atlantic Standard Time (AST, UTC-4) on November 2. That is, the clocks won't change in November, but the alphabetic time zone abbreviation will. Admittedly this disagrees with the headline of that news article (which implies they will use DST year-round), but the longstanding convention of the tz database is to model "perpetual DST" as standard time. and since the time stamps will be correct nobody will much care about the distinction. > What will the time zone name be for the Turks and Caicos....currently I have America/Grand Turk? Will this change? No. All you should need is an updated (2014g or later) database.

1 0

Instructions
by luis zavala Sept. 4, 2014

Sept. 4, 2014

1 0

Confusion about links in backward and backzone files
by Jon Skeet Sept. 2, 2014

Sept. 2, 2014

I've just been trying to "compile" the 2014g data into my Noda Time data format, and I've run against a couple of problems due to trying to include both the "backward" and "backzone" files. I'd like to just clarify the intention here, from the perspective of direct consumers of the files providing a service to others. It looks (from a brief look) like everything that's in backzone is also in backward, but the reverse is untrue - so it's not like we should *always* use backwards, but optionally *override* some previous definitions using the data in backzone... so things that would otherwise be defined as aliases may gain full zone rules, and aliases themselves may change (e.g. Antarctica/South_Pole). Is that a fair representation? I suspect that for the moment I just won't include backzone as a data source, with the result of the same set of zone IDs as in 2014f, but more of them being aliases. For most Noda Time users that's probably fine, but I may well want to allow users to use backzone data in the future, so I figure it's worth understanding as early as possible... Jon

3 2

I found a bug in tzdata2014f.tar.gz for Europe/Moscow or similar such as Europe/Volgograd
by azhar saleh Sept. 2, 2014

Sept. 2, 2014

Hi Currently I’m preparing a document to update TZ for one of our customer in Russia due to the following TZ rule. I think I found a bug in tzdata2014f.tar.gz where the time did not move from 01:59:59 to 01:00:00 http://www.timeanddate.com/time/change/russia/moscow?year=2014 Using tzdata2014f.tar.gz $ ls -lrt /etc/localtime lrwxrwxrwx 1 root root 33 Aug 29 13:05 /etc/localtime -> /usr/share/zoneinfo/Europe/Moscow $ /usr/sbin/zdump -v /etc/localtime | grep 201 /etc/localtime Sat Mar 27 22:59:59 2010 UTC = Sun Mar 28 01:59:59 2010 MSK isdst=0 gmtoff=10800 /etc/localtime Sat Mar 27 23:00:00 2010 UTC = Sun Mar 28 03:00:00 2010 MSD isdst=1 gmtoff=14400 /etc/localtime Sat Oct 30 22:59:59 2010 UTC = Sun Oct 31 02:59:59 2010 MSD isdst=1 gmtoff=14400 /etc/localtime Sat Oct 30 23:00:00 2010 UTC = Sun Oct 31 02:00:00 2010 MSK isdst=0 gmtoff=10800 /etc/localtime Sat Mar 26 22:59:59 2011 UTC = Sun Mar 27 01:59:59 2011 MSK isdst=0 gmtoff=10800 /etc/localtime Sat Mar 26 23:00:00 2011 UTC = Sun Mar 27 03:00:00 2011 MSK isdst=0 gmtoff=14400 /etc/localtime Sat Oct 25 21:59:59 2014 UTC = Sun Oct 26 01:59:59 2014 MSK isdst=0 gmtoff=14400 /etc/localtime Sat Oct 25 22:00:00 2014 UTC = Sun Oct 26 01:00:00 2014 MSK isdst=0 gmtoff=10800 Set the date to Sun Mar 27, 2011 (Russia is abolishing DST time) $ date -s "Sun MAR 27 01:59:00 MSK 2011" Sun Mar 27 01:59:00 MSK 2011 Monitor the date $ while true; do date; sleep 2; done: : Sun Mar 27 01:59:57 MSK 2011 Sun Mar 27 01:59:59 MSK 2011 Sun Mar 27 03:00:01 MSK 2011 ß good Sun Mar 27 03:00:03 MSK 2011 : Set the date to Sun Oct 26, 2014 (Russia back to European DST in October 2014) $ date -s "Sun OCT 26 01:59:00 MSK 2014" Sun Oct 26 01:59:00 MSK 2014 Monitor the date $ while true; do date; sleep 2; done : Sun Oct 26 01:59:57 MSK 2014 Sun Oct 26 01:59:59 MSK 2014 Sun Oct 26 02:00:01 MSK 2014 ß Not good. Should move from 01:59:59 to 01:00:00 Sun Oct 26 02:00:03 MSK 2014 : If I test again using Europe/Moscow for year 2010, it works fine for that year $ zdump -v Europe/Moscow | grep 2010 Europe/Moscow Sat Mar 27 22:59:59 2010 UTC = Sun Mar 28 01:59:59 2010 MSK isdst=0 gmtoff=10800 Europe/Moscow Sat Mar 27 23:00:00 2010 UTC = Sun Mar 28 03:00:00 2010 MSD isdst=1 gmtoff=14400 Europe/Moscow Sat Oct 30 22:59:59 2010 UTC = Sun Oct 31 02:59:59 2010 MSD isdst=1 gmtoff=14400 Europe/Moscow Sat Oct 30 23:00:00 2010 UTC = Sun Oct 31 02:00:00 2010 MSK isdst=0 gmtoff=10800 And it works just fine for Europe/Rome for year 2014 as well $ zdump -v /etc/localtime | grep 2014 /etc/localtime Sun Mar 30 00:59:59 2014 UTC = Sun Mar 30 01:59:59 2014 CET isdst=0 gmtoff=3600 /etc/localtime Sun Mar 30 01:00:00 2014 UTC = Sun Mar 30 03:00:00 2014 CEST isdst=1 gmtoff=7200 /etc/localtime Sun Oct 26 00:59:59 2014 UTC = Sun Oct 26 02:59:59 2014 CEST isdst=1 gmtoff=7200 /etc/localtime Sun Oct 26 01:00:00 2014 UTC = Sun Oct 26 02:00:00 2014 CET isdst=0 gmtoff=3600 Please tell me if it is a bug or something wrong in my testing. Best Regards AzharSupport EngineerKuala LumpurMalaysia

3 5

[PROPOSED PATCH] * localtime.c (tzset_unlocked): Don't return a void expression.
by Paul Eggert Aug. 27, 2014

Aug. 27, 2014

The C standard does not allow this, and Sun C 5.12 rejects it. --- localtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localtime.c b/localtime.c index 2434167..622f7d4 100644 --- a/localtime.c +++ b/localtime.c @@ -1229,7 +1229,7 @@ tzsetwall(void) static void tzset_unlocked(void) { - return tzsetlcl(getenv("TZ")); + tzsetlcl(getenv("TZ")); } void -- 1.9.1

1 0

[PATCH] * CONTRIBUTING: New file.
by Paul Eggert Aug. 27, 2014

Aug. 27, 2014

* Makefile (COMMON): Add it. * README, NEWS, Theory, africa, asia, australasia, europe: * northamerica, southamerica: Mention it. --- CONTRIBUTING | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- NEWS | 3 +++ README | 7 ++----- Theory | 6 +++--- africa | 3 ++- asia | 3 ++- australasia | 3 ++- europe | 3 ++- northamerica | 3 ++- southamerica | 3 ++- 11 files changed, 88 insertions(+), 15 deletions(-) create mode 100644 CONTRIBUTING diff --git a/CONTRIBUTING b/CONTRIBUTING new file mode 100644 index 0000000..508071b --- /dev/null +++ b/CONTRIBUTING @@ -0,0 +1,67 @@ +Contributing to the tz code and data + +The time zone database is by no means authoritative: governments +change timekeeping rules erratically and sometimes with little +warning, the data entries do not cover all of civil time before +1970, and undoubtedly errors remain in the code and data. Feel +free to fill gaps or fix mistakes, and please email improvements +to tz(a)iana.org for use in the future. + +To email small changes, please run a POSIX shell command like +'diff -u old/europe new/europe >myfix.patch', and attach +myfix.patch to the email. + +For more-elaborate changes, please read the Theory file and browse +the mailing list archives <http://mm.icann.org/pipermail/tz/> for +examples of patches that tend to work well. Ideally, additions to +data should contain commentary citing reliable sources as +justification. + +Please submit changes against either the latest release in +<ftp://ftp.iana.org/tz/> or the master branch of the experimental +Git repository. If you use Git the following workflow may be helpful: + + * Copy the experimental repository. + + git clone git@github.com:eggert/tz.git + cd tz + + * Get current with the master branch. + + git checkout master + git pull + + * Switch to a new branch for the changes. + + git checkout -b mybranch + + * Edit source files. Include commentary that justifies the + changes by citing reliable sources. + + * Debug the changes, e.g.: + + make check + make install + ./zdump -v America/Los_Angeles + + * For each separable change, commit it in the new branch, e.g.: + + git add northamerica + git commit + + See recent 'git log' output for the commit-message style. + + * Create patch files 0001-*, 0002-*, ... + + git format-patch master + + * After reviewing the patch files, send the patches to tz(a)iana.org + for others to review. + + git send-email master + + * Start anew by getting current with the master branch again. + +Please do not create issues or pull requests on Github, as the +proper procedure for proposing and distributing patches is via +email as illustrated above. diff --git a/Makefile b/Makefile index 285ad22..42d53eb 100644 --- a/Makefile +++ b/Makefile @@ -333,7 +333,7 @@ MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.txt \ time2posix.3.txt \ tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \ date.1.txt -COMMON= Makefile README NEWS +COMMON= CONTRIBUTING Makefile README NEWS WEB_PAGES= tz-art.htm tz-link.htm DOCS= Theory $(MANS) date.1 $(MANTXTS) $(WEB_PAGES) PRIMARY_YDATA= africa antarctica asia australasia \ diff --git a/NEWS b/NEWS index d44cbf0..ce1612a 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,9 @@ Unreleased, experimental changes Changes affecting documentation and commentary + A new file CONTRIBUTING is distributed. (Thanks to Tim Parenti + for suggesting a CONTRIBUTING file.) + tz-link.htm mentions Windows Runtime etc. (thanks to Matt Johnson) and HP-UX's tztab. diff --git a/README b/README index a6796d7..6c685b7 100644 --- a/README +++ b/README @@ -44,11 +44,8 @@ Historical local time information has been included here to: system. The information in the time zone data files is by no means authoritative; -the files currently do not even attempt to cover all time stamps before -1970, and there are undoubtedly errors even for time stamps since 1970. -If you know that the rules are different from those in a file, by all means -feel free to change a file (and please send the changed version to -tz(a)iana.org for use in the future). Europeans take note! +fixes and enhancements are welcome. Please see the file CONTRIBUTING +for details. Thanks to these Time Zone Caballeros who've made major contributions to the time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz; diff --git a/Theory b/Theory index 42070e4..2a3a911 100644 --- a/Theory +++ b/Theory @@ -233,9 +233,9 @@ details of pre-1970 civil timekeeping. ----- Accuracy of the tz database ----- The tz database is not authoritative, and it surely has errors. -Corrections are welcome and encouraged. Users requiring authoritative -data should consult national standards bodies and the references cited -in the database's comments. +Corrections are welcome and encouraged; see the file CONTRIBUTING. +Users requiring authoritative data should consult national standards +bodies and the references cited in the database's comments. Errors in the tz database arise from many sources: diff --git a/africa b/africa index c20a46d..37798e7 100644 --- a/africa +++ b/africa @@ -3,7 +3,8 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz(a)iana.org for general use in the future). +# tz(a)iana.org for general use in the future). For more, please see +# the file CONTRIBUTING in the tz distribution. # From Paul Eggert (2013-02-21): # diff --git a/asia b/asia index 17813ce..f8237f4 100644 --- a/asia +++ b/asia @@ -3,7 +3,8 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz(a)iana.org for general use in the future). +# tz(a)iana.org for general use in the future). For more, please see +# the file CONTRIBUTING in the tz distribution. # From Paul Eggert (2013-08-11): # diff --git a/australasia b/australasia index eceb160..094383e 100644 --- a/australasia +++ b/australasia @@ -763,7 +763,8 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz(a)iana.org for general use in the future). +# tz(a)iana.org for general use in the future). For more, please see +# the file CONTRIBUTING in the tz distribution. # From Paul Eggert (2013-02-21): # A good source for time zone historical data outside the U.S. is diff --git a/europe b/europe index 5d229c2..68a0dc7 100644 --- a/europe +++ b/europe @@ -3,7 +3,8 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz(a)iana.org for general use in the future). +# tz(a)iana.org for general use in the future). For more, please see +# the file CONTRIBUTING in the tz distribution. # From Paul Eggert (2014-05-31): # A good source for time zone historical data outside the U.S. is diff --git a/northamerica b/northamerica index 88e3e33..8958588 100644 --- a/northamerica +++ b/northamerica @@ -5,7 +5,8 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz(a)iana.org for general use in the future). +# tz(a)iana.org for general use in the future). For more, please see +# the file CONTRIBUTING in the tz distribution. # From Paul Eggert (1999-03-22): # A reliable and entertaining source about time zones is diff --git a/southamerica b/southamerica index 4e00cb4..08a0731 100644 --- a/southamerica +++ b/southamerica @@ -3,7 +3,8 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz(a)iana.org for general use in the future). +# tz(a)iana.org for general use in the future). For more, please see +# the file CONTRIBUTING in the tz distribution. # From Paul Eggert (2006-03-22): # A good source for time zone historical data outside the U.S. is -- 1.9.1

5 8

[PROPOSED PATCH 1/9] zdump: use TM_ZONE if available
by Paul Eggert Aug. 27, 2014

Aug. 27, 2014

* zdump.c (abbr): Return pointer-to-const. Use TM_ZONE if available, as it's simpler, more reliable, and a tad faster. --- zdump.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/zdump.c b/zdump.c index a04ba99..9eb434e 100644 --- a/zdump.c +++ b/zdump.c @@ -225,7 +225,7 @@ static char * progname; static bool warned; static bool errout; -static char *abbr(struct tm const *); +static char const *abbr(struct tm const *); static intmax_t delta(struct tm *, struct tm *) ATTRIBUTE_PURE; static void dumptime(struct tm const *); static time_t hunt(char *, time_t, time_t); @@ -738,16 +738,17 @@ show(char *zone, time_t t, bool v) abbrok(abbr(tmp), zone); } -static char * +static char const * abbr(struct tm const *tmp) { - register char * result; - static char nada; - - if (tmp->tm_isdst != 0 && tmp->tm_isdst != 1) - return &nada; - result = tzname[tmp->tm_isdst]; - return (result == NULL) ? &nada : result; +#ifdef TM_ZONE + return tmp->TM_ZONE; +#else + return ((0 <= tmp->tm_isdst && tmp->tm_isdst <= 1 + && tzname[tmp->tm_isdst]) + ? tzname[tmp->tm_isdst] + : ""); +#endif } /* -- 1.9.1

4 15

[PROPOSED PATCH 1/3] * tz-art.htm: Correct the Peanuts quote.
by Paul Eggert Aug. 27, 2014

Aug. 27, 2014

Fix broken links and remove a broken-linked book that wasn't that notable anyway. Use italics for book and movie titles. --- tz-art.htm | 92 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/tz-art.htm b/tz-art.htm index fd56728..ef06675 100644 --- a/tz-art.htm +++ b/tz-art.htm @@ -277,8 +277,8 @@ savings days. Lousy farmers."</td></tr> <tr><td> </td></tr> <tr><td>Artist</td><td>Jules Verne</td></tr> -<tr><td>Book</td><td>Le Tour du Monde en Quatre-Vingts Jours -(Around the World in Eighty Days)</td></tr> +<tr><td>Book</td><td>Around the World in Eighty Days +(Le tour du monde en quatre-vingts jours)</td></tr> <tr><td>Notes</td><td>Wall-clock time plays a central role in the plot. European readers of the 1870s clearly held the U.S. press in deep contempt; the protagonists cross the U.S. without once @@ -292,8 +292,8 @@ An on-line English-language translation of the book is available at <tr><td> </td></tr> <tr><td>Artist</td><td>Umberto Eco</td></tr> -<tr><td>Book</td><td>The Island of the Day Before -(L'isola del giorno prima)</td></tr> +<tr><td>Book</td><td>The Island of the Day Before +(L'isola del giorno prima)</td></tr> <tr><td>Copyright Date</td><td>1994</td></tr> <tr><td>Notes</td><td> "...the story of a 17th century Italian nobleman trapped near an island @@ -301,86 +301,83 @@ on the International Date Line. Time and time zones play an integral part in the novel." (Paul Eggert, 2006-04-22) </td></tr> <tr><td> </td></tr> -<tr><td>Artist</td><td>David Jebb</td></tr> -<tr><td>Book</td><td><a href="http://www.thethirteenthtimezone.com"> -The Thirteenth Time Zone</a></td></tr> -<tr><td>Notes</td><td> -"It's fiction, but it's based on his experiences and travels." (Paul Eggert, 2006-04-22) -</td></tr> -<tr><td> </td></tr> <tr><td>Artist</td><td>John Dunning</td></tr> <tr><td>Book</td><td><a -href="http://www.simonsays.com/content/book.cfm?sid=33&pid=479719">Two -O'Clock, Eastern Wartime</a></td></tr> +href="http://books.simonandschuster.com/Two-OClock-Eastern-Wartime/John-Dunning/9…">Two +O'Clock, Eastern Wartime</a></td></tr> <tr><td>Copyright Date</td><td>2001</td></tr> <tr><td>Notes</td><td> Mystery, history, daylight saving time, and old-time radio. </td></tr> <tr><td> </td></tr> -<tr><td>Film</td><td>Bell Science – About Time</td></tr> -<tr><td>Notes</td><td>The Frank Baxter/Richard Deacon extravaganza. -Information is available at -<a href="http://www.videoflicks.com/titles/1035/1035893.htm">http://www.videoflicks.com/titles/1035/1035893.htm</a></td></tr> +<tr><td>Film</td><td>About Time</td></tr> +<tr><td>Copyright Date</td><td>1962</td></tr> +<tr><td>Notes</td><td>The Bell Science extravaganza, with Frank Baxter, +Richard Deacon, and Les Tremayne. +<a href="http://www.imdb.com/title/tt0154110/">Information</a> +is available at IMDb.</td></tr> </table> <hr> <ul> <li> -An episode of "The Adventures of Superman" entitled "The Mysterious +An episode of The Adventures of Superman entitled "The Mysterious Cube," first aired 1958-02-24, had Superman convincing the controllers of WWV to broadcast time signals five minutes ahead of actual time; doing so got a crook trying to beat the statute of limitations to emerge a bit too early from the titular enclosure. </li> <li> -The 1960s ITC television series "The Prisoner" included an episode +The 1960s ITC television series The Prisoner included an episode entitled "The Chimes of Big Ben" in which our protagonist tumbled to the fraudulent nature of a Poland-to-England escape upon hearing "Big Ben" chiming on Polish local time. </li> <li> -The series "Seinfeld" included an episode entitled "The Susie," first +The series Seinfeld included an episode entitled "The Susie," first broadcast 1997-02-13, in which Kramer decides that daylight saving time isn't coming fast enough, so he sets his watch ahead an hour. </li> <li> -The syndicated comic strip "Dilbert" featured an all-too-rare example of +The syndicated comic strip Dilbert featured an all-too-rare example of time zone humor on 1998-03-14. </li> <li> Surrealist artist Guy Billout's work "Date Line" appeared on page 103 -of the 1999-11 Atlantic Monthly. +of the 1999-11 Atlantic Monthly. </li> <li> -"Gloom, Gloom, Go Away" by Walter Kirn appeared on page 106 of Time -Magazine's 2002-11-11 issue; among other things, it proposed +"Gloom, Gloom, Go Away" by Walter Kirn appeared on page 106 of Time +magazine's 2002-11-11 issue; among other things, it proposed year-round DST as a way of lessening wintertime despair. </li> <li> -The "20 Hours in America" episode of "The West Wing," first aired 2002-09-25, +The "20 Hours in America" episode of The West Wing, +first aired 2002-09-25, saw White House staffers stranded in Indiana; they thought they had time to catch Air Force One but were done in by intra-Indiana local time changes. </li> <li> "In what time zone would you find New York City?" was a $200 question on -the 1999-11-13 United States airing of "Who Wants to Be a Millionaire?" -"In 1883, what industry led the movement to divide the U.S. into four time +the 1999-11-13 United States airing of Who Wants to Be a Millionaire?, +and "In 1883, what industry led the movement to divide the U.S. into four time zones?" was a $32,000 question on the 2001-05-23 United States airing of -"Who Wants to Be a Millionaire?" At this rate, the million-dollar time-zone +the same show. At this rate, the million-dollar time-zone question should have been asked 2002-06-04. </li> <li> A private jet's mid-flight change of time zones distorts Alison Dubois' -premonition in the "We Had a Dream" episode of "Medium" +premonition in the "We Had a Dream" episode of Medium (originally aired 2007-02-28). </li> <li> -In the "30 Rock" episode "Anna Howard Shaw Day" (first broadcast 2010-02-11), +In the 30 Rock episode "Anna Howard Shaw Day" +(first broadcast 2010-02-11), Jack Donaghy's date realizes that a Geneva-to-New-York business phone call received in the evening must be fake given the difference in local times. </li> <li> -In the 1946 movie "A Matter of Life and Death" -(U.S. title "Stairway to Heaven") +In the 1946 movie A Matter of Life and Death +(U.S. title Stairway to Heaven) there is a reference to British Double Summer Time. The time does not play a large part in the plot; it's just a passing reference to the time when one of the @@ -390,7 +387,7 @@ The IMDb page is at http://us.imdb.com/title/tt0038733/ </a>. (Dave Cantor) <li> -The 1953 railway comedy movie "The Titfield Thunderbolt" includes a +The 1953 railway comedy movie The Titfield Thunderbolt includes a play on words on British Double Summer Time. Valentine's wife wants him to leave the pub and asks him, "Do you know what time it is?" And he, happy where he is, replies: "Yes, my love. Summer double time." @@ -400,7 +397,7 @@ http://us.imdb.com/title/tt0046436/ </a>. (Mark Brader, 2009-10-02) </li> <li> -The premise of the 1999 caper movie "Entrapment" involves computers +The premise of the 1999 caper movie Entrapment involves computers in an international banking network being shut down briefly at midnight in each time zone to avoid any problems at the transition from the year 1999 to 2000 in that zone. (Hmmmm.) If this shutdown @@ -415,14 +412,14 @@ http://us.imdb.com/title/tt0137494/ </a>. (Mark Brader, 2009-10-02) </li> <li> -In the "Run by the Monkeys" episode of "Da Vinci's Inquest" +In the "Run by the Monkeys" episode of Da Vinci's Inquest (first broadcast 2002-11-17), a witness in a five-year-old fire case realizes they may not have set their clock back when daylight saving ended on the day of the fire, introducing the possibility of an hour when arson might have occurred. </li> <li> -In "The Todd Couple" episode of "Outsourced" (first aired 2011-02-10), +In "The Todd Couple" episode of Outsourced (first aired 2011-02-10), Manmeet sets up Valentine's Day teledates for 6:00 and 9:00pm; since one is with a New Yorker and the other with a San Franciscan, hilarity ensues. @@ -435,7 +432,7 @@ proceeds as though it's also mid-evening there.) <li> "We've been using the five-cent nickel in this country since 1492. Now that's pretty near 100 years, daylight saving." -(Groucho Marx as Captain Spaulding in "Animal Crackers", 1930, +(Groucho Marx as Captain Spaulding in Animal Crackers, 1930, as noted by Will Fitzgerald) </li> <li> @@ -446,7 +443,7 @@ Drummond: "That Eastern Standard Time? (Laughter) Or Rocky Mountain Time? (More laughter) It wasn't daylight-saving time, was it? Because the Lord didn't make the sun until the fourth day!" -(From the play "Inherit the Wind" by Jerome Lawrence and Robert E. Lee, +(From the play Inherit the Wind by Jerome Lawrence and Robert E. Lee, filmed in 1960 with Spencer Tracy as Drummond and Fredric March as Brady, and several other times. Thanks to Mark Brader.) </li> @@ -454,7 +451,7 @@ Brady, and several other times. Thanks to Mark Brader.) "Good news." "What did they do? Extend Daylight Saving Time year round?" (Professional tanner George Hamilton, in dialog from a -May, 1999 episode of the syndicated television series "Baywatch") +May, 1999 episode of the syndicated television series Baywatch) </li> <li> "A fundamental belief held by Americans is that if you are on land, you @@ -470,32 +467,35 @@ when you turn the clocks ahead." </li> <li> "Would it impress you if I told you I invented Daylight Savings Time?" -("Sahjhan" to "Lilah" in dialog from the "Loyalty" episode of "Angel," +("Sahjhan" to "Lilah" in dialog from the "Loyalty" episode of Angel, originally aired 2002-02-25) </li> <li> "I thought you said Tulsa was a three-hour flight." "Well, you're forgetting about the time difference." -("Joey" and "Chandler" in dialog from the episode of "Friends" +("Joey" and "Chandler" in dialog from the episode of Friends entitled "The One With Rachel's Phone Number," originally aired 2002-12-05) </li> <li> "Is that a pertinent fact, or are you just trying to dazzle me with your command of time zones?" -(Kelsey Grammer as "Frasier Crane" to "Roz" from the episode of "Frasier" +(Kelsey Grammer as "Frasier Crane" to "Roz" from the episode of Frasier entitled "The Kid," originally aired 1997-11-04) </li> <li> -"Don't worry about the world coming to an end today. -It is already tomorrow in Australia." -(Charles M. Schulz, provided by Steve Summit) +Peppermint Patty: "What if the world comes to an end tonight, Marcie?" + +Marcie: "I promise there'll be a tomorrow, sir ... in fact, +it's already tomorrow in Australia!" + +(Charles M. Schultz, Peanuts, 1980-06-13) </li> <li> "I put myself and my staff through this crazy, huge ordeal, all because I refused to go on at midnight, okay? And so I work, you know, and then I get this job at eleven, supposed to be a big deal. Then yesterday daylight [saving] time ended. Right now it's basically -midnight." (Conan O'Brien on the 2010-11-08 premiere of "Conan.") +midnight." (Conan O'Brien on the 2010-11-08 premiere of Conan.) </li> </ul> </body> -- 1.9.1

1 2

DST ended 14 hours early for one British clock in fall 1916
by Paul Eggert Aug. 27, 2014

Aug. 27, 2014

The online Wall Street Journal has a World War I Centenary series, and its Daylight-Saving Time page has a photo captioned "A notice informs the British public of a change in time as clocks go back an hour in the first year of daylight saving on Oct. 1, 1916. Topical Press Agency/Getty Images". The interesting thing about the notice is that its transition is off by 14 hours compared to our data. The notice is under a large outdoor hanging clock and says "CHANGE OF TIME. AT 1 P.M. SEPT 30th THIS CLOCK WILL BE SET BACK ONE HOUR TO GREENWICH TIME". Perhaps the clock's operator didn't want to bother changing the clock at the official transition time of 3 A.M. the next day. Fidler S. Daylight-saving time. Wall Street Journal. http://online.wsj.com/ww1/daylight-saving-time

1 0

[PROPOSED PATCH] * backzone: Spelling and accent fixes.
by Paul Eggert Aug. 26, 2014

Aug. 26, 2014

--- backzone | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backzone b/backzone index 66d3e27..d9183cd 100644 --- a/backzone +++ b/backzone @@ -81,7 +81,7 @@ Zone Africa/Douala 0:38:48 - LMT 1912 # The following table is from Shanks & Pottenger, but it can't be right. # Whitman gives Mar 31 - Aug 31 for 1931 on. # The International Hydrographic Bulletin, 1932-33, p 63 says that -# Sierra Leone would advance its clocks by 20 monutes on 1933-10-01. +# Sierra Leone would advance its clocks by 20 minutes on 1933-10-01. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule SL 1935 1942 - Jun 1 0:00 0:40 SLST Rule SL 1935 1942 - Oct 1 0:00 0 WAT @@ -210,7 +210,7 @@ Zone America/Grenada -4:07:00 - LMT 1911 Jul # St George's -4:00 - AST # Guadeloupe -Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe a Pitre +Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe-à-Pitre -4:00 - AST # Montserrat @@ -223,7 +223,7 @@ Zone America/Montserrat -4:08:52 - LMT 1911 Jul 1 0:01 # Cork Hill # Argentina # This entry was intended for the following areas, but has been superseded by # more detailed zones. -# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC), +# Santa Fe (SF), Entre Ríos (ER), Corrientes (CN), Misiones (MN), Chaco (CC), # Formosa (FM), La Pampa (LP), Chubut (CH) Zone America/Rosario -4:02:40 - LMT 1894 Nov -4:16:44 - CMT 1920 May @@ -349,9 +349,9 @@ Zone Europe/Guernsey -0:09:19 - LMT 1913 Jun 18 # <http://www.legislation.gov.im>, starting with the original Statutory # Time Act in 1883 and including additional confirmation of some of # the dates of the 'Summer Time' orders originating at -# Westminster. There is a little uncertinity as to the starting date +# Westminster. There is a little uncertainty as to the starting date # of the first summer time in 1916 which may have be announced a -# couple of days late. There is still a substatial number of +# couple of days late. There is still a substantial number of # documents to work through, but it is thought that every GB change # was also implemented on the island. # -- 1.9.1

1 0

Typo fix
by Tim Parenti Aug. 26, 2014

Aug. 26, 2014

The attached patch fixes a typo in NEWS which I introduced a while back. -- Tim Parenti

1 0

[PROPOSED PATCH] localtime.c: two minor 'bool' cleanups
by Paul Eggert Aug. 26, 2014

Aug. 26, 2014

These don't fix any bugs, but make the recently-introduced 'bool' code easier to follow. * localtime.c (gmtcheck): Move gmt_is_set's definition here, since it's used only here. (localtime_r): Explicitly convert integer to boolean rather than relying on C99 semantics. --- localtime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/localtime.c b/localtime.c index d5fd508..aee343e 100644 --- a/localtime.c +++ b/localtime.c @@ -177,7 +177,6 @@ static struct state gmtmem; static char lcl_TZname[TZ_STRLEN_MAX + 1]; static int VOLATILE lcl_is_set; -static bool VOLATILE gmt_is_set; char * tzname[2] = { (char *) wildabbr, @@ -1262,6 +1261,7 @@ tzset(void) static void gmtcheck(void) { + static bool VOLATILE gmt_is_set; if (gmt_is_set) return; if (lock() != 0) @@ -1415,7 +1415,7 @@ localtime(const time_t *const timep) struct tm * localtime_r(const time_t *const timep, struct tm *tmp) { - return localtime_tzset(timep, tmp, lcl_is_set); + return localtime_tzset(timep, tmp, lcl_is_set != 0); } /* -- 1.9.1

1 0

2014g soon
by Paul Eggert Aug. 26, 2014

Aug. 26, 2014

It's time for a new tz release: we have one change to near-future data (for the Turks & Caicos) that should go out sooner rather than later, and there've been several changes to the code as well. To help simplify reviewing I've pushed an integrated version of the proposed changes to <https://github.com/eggert/tz>, and you can read the news here: https://github.com/eggert/tz/blob/master/NEWS

1 0

[PROPOSED PATCH] * NEWS: Coalesce discussions of zdump, localtime_rz, and localtime_r.
by Paul Eggert Aug. 26, 2014

Aug. 26, 2014

--- NEWS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 8302547..b031a32 100644 --- a/NEWS +++ b/NEWS @@ -52,10 +52,6 @@ Unreleased, experimental changes Although not needed for tz's own applications, which are single-threaded, this supports POSIX better if the tz library is used in multithreaded apps. - zdump now uses localtime_r and tzset if available, as this is a - bit cleaner and faster than plain localtime. Compile with - -DHAVE_LOCALTIME_R=0 and/or -DHAVE_TZSET=0 if your system lacks them. - Unless NETBSD_INSPIRED is defined to 0, the tz library now supplies functions that let callers create and use objects representing time zones. This is intended for applications that need to deal with many time @@ -89,7 +85,11 @@ Unreleased, experimental changes zdump now uses localtime_rz if available, as it's significantly faster. Define HAVE_LOCALTIME_RZ to 0 to suppress this. HAVE_LOCALTIME_TZ - defaults to 1 if NETBSD_INSPIRED && USE_LTZ. + defaults to 1 if NETBSD_INSPIRED && USE_LTZ. When localtime_rz is + not available, zdump now uses localtime_r and tzset if available, + as this is a bit cleaner and faster than plain localtime. Compile + with -DHAVE_LOCALTIME_R=0 and/or -DHAVE_TZSET=0 if your system + lacks these two functions. tzselect -c now uses a hybrid distance measure that works better in Africa. (Thanks to Alan Barrett for noting the problem.) -- 1.9.1

1 0

[PROPOSED PATCH] * Makefile, NEWS: Say that backzone's contents are not all low-quality
by Paul Eggert Aug. 26, 2014

Aug. 26, 2014

and give credit to Lester Caine for some of its high-quality entries. --- Makefile | 4 ++-- NEWS | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2354a3f..8ccbaf4 100644 --- a/Makefile +++ b/Makefile @@ -84,8 +84,8 @@ LIBDIR= $(TOPDIR)/lib # below. If you want both sets of data available, with leap seconds counted # normally, use # REDO= right_posix -# below. If you want just POSIX-compatible time values, but with extra -# lower-quality data from the file 'backzone', use +# below. If you want just POSIX-compatible time values, but with +# out-of-scope and often-wrong data from the file 'backzone', use # REDO= posix_packrat # POSIX mandates that leap seconds not be counted; for compatibility with it, # use "posix_only", "posix_right", or "posix_packrat". diff --git a/NEWS b/NEWS index 3c8b84b..8302547 100644 --- a/NEWS +++ b/NEWS @@ -26,10 +26,11 @@ Unreleased, experimental changes A new file 'backzone' contains data which may appeal to connoisseurs of old time stamps, although it is out of scope for - the tz database and is often poorly sourced. The new file is not - recommended for ordinary use and its entries are not installed by - default. (Thanks to Lester Caine for the Guernsey, Jersey, and - Isle of Man entries in 'backzone'.) + the tz database, is often poorly sourced, and contains some data + that is known to be incorrect. The new file is not recommended + for ordinary use and its entries are not installed by default. + (Thanks to Lester Caine for the high-quality Jersey, Guernsey, and + Isle of Man entries.) Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, -- 1.9.1

1 0

[PROPOSED PATCH] Port 'bool' usage to clang 3.4.
by Paul Eggert Aug. 26, 2014

Aug. 26, 2014

* date.c (convert, reset): Fix prototype to match function, as the C standard requires. --- date.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/date.c b/date.c index 3b44c94..b77de79 100644 --- a/date.c +++ b/date.c @@ -55,14 +55,14 @@ extern char * tzname[2]; static int retval = EXIT_SUCCESS; static void checkfinal(char const *, bool, time_t, time_t); -static time_t convert(const char *, int, time_t); +static time_t convert(const char *, bool, time_t); static void display(const char *, time_t); static void dogmt(void); static void errensure(void); static void iffy(time_t, time_t, const char *, const char *); static const char * nondigit(const char *); static void oops(const char *); -static void reset(time_t, int); +static void reset(time_t, bool); static void timeout(FILE *, const char *, const struct tm *); static void usage(void); static void wildinput(const char *, const char *, -- 1.9.1

1 0

[PROPOSED PATCH 1/3] Port 'make check_time_t_alternatives' to Solaris 10.
by Paul Eggert Aug. 26, 2014

Aug. 26, 2014

* Makefile (check_time_t_alternatives): Don't assume 'diff' has the -q option, since POSIX does not require -q. * NEWS: Document this. --- Makefile | 9 ++++++++- NEWS | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0fc8e2c..92fad4d 100644 --- a/Makefile +++ b/Makefile @@ -569,6 +569,11 @@ check_public: $(ENCHILADA) # Check that the code works under various alternative # implementations of time_t. check_time_t_alternatives: + if diff -q Makefile Makefile 2>/dev/null; then \ + quiet_option='-q'; \ + else \ + quiet_option=''; \ + fi && \ zones=`$(AWK) '/^[^#]/ { print $$3 }' <zone1970.tab` && \ for type in $(TIME_T_ALTERNATIVES); do \ mkdir -p tzpublic/$$type && \ @@ -577,7 +582,9 @@ check_time_t_alternatives: CFLAGS='$(CFLAGS) -Dtime_tz='"'$$type'" \ REDO='$(REDO)' \ install && \ - diff -qr tzpublic/int64_t/etc/zoneinfo tzpublic/$$type/etc/zoneinfo && \ + diff $$quiet_option -r \ + tzpublic/int64_t/etc/zoneinfo \ + tzpublic/$$type/etc/zoneinfo && \ case $$type in \ int32_t) range=-2147483648,2147483647;; \ uint32_t) range=0,4294967296;; \ diff --git a/NEWS b/NEWS index fb2f31b..a453ef6 100644 --- a/NEWS +++ b/NEWS @@ -112,6 +112,8 @@ Unreleased, experimental changes 'zdump' no longer links in ialloc.o, as it's not needed. + 'make check_time_t_alternatives' no longer assumes GNU diff. + Changes affecting distribution tarballs The files checktab.awk and zoneinfo2tdf.pl are now distributed in -- 1.9.1

1 2

[PROPOSED PATCH 1/3] date: port to Ubuntu 14.04 with -DHAVE_UTMPX_H=1
by Paul Eggert Aug. 25, 2014

Aug. 25, 2014

* date.c (WTMPX_FILE): Define to _PATH_WTMPX if not already defined and if _PATH_WTMPX is defined. (reset): Do not use WTMPX_FILE if it is not defined. * NEWS: Document this. --- NEWS | 5 +++++ date.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 2c8b474..a8218f1 100644 --- a/NEWS +++ b/NEWS @@ -39,6 +39,11 @@ Unreleased, experimental changes tzselect -c now uses a hybrid distance measure that works better in Africa. (Thanks to Alan Barrett for noting the problem.) + When HAVE_UTMPX_H is set the 'date' command now builds on systems + whose <utmpx.h> file does not define WTMPX_FILE, and when setting + the date it updates the wtmpx file if _PATH_WTMPX is defined. + This affects GNU/Linux and similar systems. + Changes affecting distribution tarballs The files checktab.awk and zoneinfo2tdf.pl are now distributed in diff --git a/date.c b/date.c index 9a0b84c..3d78914 100644 --- a/date.c +++ b/date.c @@ -31,6 +31,9 @@ #ifndef NTIME_MSG #define NTIME_MSG "new time" #endif +#if !defined WTMPX_FILE && defined _PATH_WTMPX +# define WTMPX_FILE _PATH_WTMPX +#endif /* ** The two things date knows about time are. . . @@ -378,7 +381,7 @@ reset(const time_t newt, const int nflag) sx.after.ut_type = NEW_TIME; sx.after.ut_tv.tv_sec = newt; (void) strcpy(sx.after.ut_line, NTIME_MSG); -#if !SUPPRESS_WTMPX_FILE_UPDATE +#if defined WTMPX_FILE && !SUPPRESS_WTMPX_FILE_UPDATE /* In Solaris 2.5 (and presumably other systems), 'date' does not update /var/adm/wtmpx. This must be a bug. If you'd like to reproduce the bug, @@ -390,7 +393,7 @@ reset(const time_t newt, const int nflag) oops(_("log file write")); if (close(fid) != 0) oops(_("log file close")); -#endif /* !SUPPRESS_WTMPX_FILE_UPDATE */ +# endif pututxline(&sx.before); pututxline(&sx.after); #endif /* HAVE_UTMPX_H */ -- 1.9.1

5 17

[PROPOSED PATCH] Make the library thread-safe if THREAD_SAFE is defined.
by Paul Eggert Aug. 25, 2014

Aug. 25, 2014

* localtime.c [THREAD_SAFE]: Include pthread.h. (VOLATILE): New macro. (locallock) [THREAD_SAFE]: New static var. (lock, unlock): New functions. (lcl_is_set, gmt_is_set): Now VOLATILE. (tzsetwall): Move cleaned-up guts to new function tzsetwall_unlocked, for which this is now merely a locking wrapper. (tzset): Similarly, for new function tzset_unlocked. (localtime_tzset): New function, which does proper locking. (localtime, localtime_r): Use it. (gmtsub): Do not worry about initializing gmtptr, as that's now the caller's responsibility. (gmtime): Reimplement in terms of gmtime_r. (timegm): Reimplement in terms of timeoff. (gmtime_r, offtime, mktime, timeoff, time2posix, posix2time): Lock at start and unlock at end. * Makefile, NEWS: Document this. --- Makefile | 3 + NEWS | 4 + localtime.c | 249 ++++++++++++++++++++++++++++++++++++++++-------------------- 3 files changed, 173 insertions(+), 83 deletions(-) diff --git a/Makefile b/Makefile index 5bbd7e7..3d24c2a 100644 --- a/Makefile +++ b/Makefile @@ -123,6 +123,9 @@ LDLIBS= # -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 +# -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires; +# not needed by the main-program tz code, which is single-threaded. +# Append other compiler flags as needed, e.g., -pthread on GNU/Linux. # -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t # -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; diff --git a/NEWS b/NEWS index 28974c9..1a78041 100644 --- a/NEWS +++ b/NEWS @@ -36,6 +36,10 @@ Unreleased, experimental changes Changes affecting code + The tz library is now thread-safe if compiled with THREAD_SAFE defined. + Although not needed for tz's own applications, which are single-threaded, + this supports POSIX better if the tz library is used in multithreaded apps. + tzselect -c now uses a hybrid distance measure that works better in Africa. (Thanks to Alan Barrett for noting the problem.) diff --git a/localtime.c b/localtime.c index 551b5a2..f499583 100644 --- a/localtime.c +++ b/localtime.c @@ -16,6 +16,18 @@ #include "tzfile.h" #include "fcntl.h" +#if THREAD_SAFE +# include <pthread.h> +# define VOLATILE volatile +static pthread_mutex_t locallock = PTHREAD_MUTEX_INITIALIZER; +static int lock(void) { return pthread_mutex_lock(&locallock); } +static void unlock(void) { pthread_mutex_unlock(&locallock); } +#else +# define VOLATILE +static int lock(void) { return 0; } +static void unlock(void) { } +#endif + #ifndef TZ_ABBR_MAX_LEN #define TZ_ABBR_MAX_LEN 16 #endif /* !defined TZ_ABBR_MAX_LEN */ @@ -154,8 +166,8 @@ static struct state gmtmem; #endif /* !defined TZ_STRLEN_MAX */ static char lcl_TZname[TZ_STRLEN_MAX + 1]; -static int lcl_is_set; -static int gmt_is_set; +static int VOLATILE lcl_is_set; +static int VOLATILE gmt_is_set; char * tzname[2] = { (char *) wildabbr, @@ -1139,6 +1151,21 @@ gmtload(struct state *const sp) (void) tzparse(gmt, sp, TRUE); } +static void +tzsetwall_unlocked(void) +{ + if (lcl_is_set < 0) + return; +#ifdef ALL_STATE + if (! lclptr) + lclptr = malloc(sizeof *lclptr); +#endif + if (lclptr && tzload(NULL, lclptr, TRUE) != 0) + gmtload(lclptr); + settzname(); + lcl_is_set = -1; +} + #ifndef STD_INSPIRED /* ** A non-static declaration of tzsetwall in a system header file @@ -1149,65 +1176,71 @@ static void tzsetwall(void) { - if (lcl_is_set < 0) - return; - lcl_is_set = -1; + if (lock() != 0) + return; + tzsetwall_unlocked(); + unlock(); +} +static void +tzset_unlocked(void) +{ + int shortname; + register char const *name = getenv("TZ"); + + if (!name) { + tzsetwall_unlocked(); + return; + } + shortname = strlen(name) < sizeof lcl_TZname; + if (0 < lcl_is_set && strcmp(lcl_TZname, name) == 0) + return; + if (shortname) + strcpy(lcl_TZname, name); #ifdef ALL_STATE - if (lclptr == NULL) { - lclptr = malloc(sizeof *lclptr); - if (lclptr == NULL) { - settzname(); /* all we can do */ - return; - } - } + if (! lclptr) + lclptr = malloc(sizeof *lclptr); #endif /* defined ALL_STATE */ - if (tzload(NULL, lclptr, TRUE) != 0) - gmtload(lclptr); - settzname(); + if (lclptr) { + if (*name == '\0') { + /* + ** User wants it fast rather than right. + */ + lclptr->leapcnt = 0; /* so, we're off a little */ + lclptr->timecnt = 0; + lclptr->typecnt = 0; + lclptr->ttis[0].tt_isdst = 0; + lclptr->ttis[0].tt_gmtoff = 0; + lclptr->ttis[0].tt_abbrind = 0; + strcpy(lclptr->chars, gmt); + } else if (tzload(name, lclptr, TRUE) != 0) + if (name[0] == ':' || tzparse(name, lclptr, FALSE) != 0) + gmtload(lclptr); + } + settzname(); + lcl_is_set = shortname; } void tzset(void) { - register const char * name; - - name = getenv("TZ"); - if (name == NULL) { - tzsetwall(); - return; - } - - if (lcl_is_set > 0 && strcmp(lcl_TZname, name) == 0) - return; - lcl_is_set = strlen(name) < sizeof lcl_TZname; - if (lcl_is_set) - (void) strcpy(lcl_TZname, name); + if (lock() != 0) + return; + tzset_unlocked(); + unlock(); +} +static void +gmtcheck(void) +{ + if (gmt_is_set) + return; #ifdef ALL_STATE - if (lclptr == NULL) { - lclptr = malloc(sizeof *lclptr); - if (lclptr == NULL) { - settzname(); /* all we can do */ - return; - } - } -#endif /* defined ALL_STATE */ - if (*name == '\0') { - /* - ** User wants it fast rather than right. - */ - lclptr->leapcnt = 0; /* so, we're off a little */ - lclptr->timecnt = 0; - lclptr->typecnt = 0; - lclptr->ttis[0].tt_isdst = 0; - lclptr->ttis[0].tt_gmtoff = 0; - lclptr->ttis[0].tt_abbrind = 0; - (void) strcpy(lclptr->chars, gmt); - } else if (tzload(name, lclptr, TRUE) != 0) - if (name[0] == ':' || tzparse(name, lclptr, FALSE) != 0) - (void) gmtload(lclptr); - settzname(); + gmtptr = malloc(sizeof *gmtptr); +#endif + if (gmtptr) + gmtload(gmtptr); + gmt_is_set = TRUE; } /* @@ -1296,11 +1329,25 @@ localsub(const time_t *const timep, const int_fast32_t offset, return result; } +static struct tm * +localtime_tzset(time_t const *timep, struct tm *tmp, int skip_tzset) +{ + int err = lock(); + if (err) { + errno = err; + return NULL; + } + if (!skip_tzset) + tzset_unlocked(); + tmp = localsub(timep, 0, tmp); + unlock(); + return tmp; +} + struct tm * localtime(const time_t *const timep) { - tzset(); - return localsub(timep, 0L, &tm); + return localtime_tzset(timep, &tm, 0); } /* @@ -1310,7 +1357,7 @@ localtime(const time_t *const timep) struct tm * localtime_r(const time_t *const timep, struct tm *tmp) { - return localsub(timep, 0L, tmp); + return localtime_tzset(timep, tmp, lcl_is_set); } /* @@ -1323,16 +1370,6 @@ gmtsub(const time_t *const timep, const int_fast32_t offset, { register struct tm * result; - if (!gmt_is_set) { -#ifdef ALL_STATE - gmtptr = malloc(sizeof *gmtptr); - gmt_is_set = gmtptr != NULL; -#else - gmt_is_set = TRUE; -#endif /* defined ALL_STATE */ - if (gmt_is_set) - gmtload(gmtptr); - } result = timesub(timep, offset, gmtptr, tmp); #ifdef TM_ZONE /* @@ -1348,7 +1385,7 @@ gmtsub(const time_t *const timep, const int_fast32_t offset, struct tm * gmtime(const time_t *const timep) { - return gmtsub(timep, 0L, &tm); + return gmtime_r(timep, &tm); } /* @@ -1358,7 +1395,15 @@ gmtime(const time_t *const timep) struct tm * gmtime_r(const time_t *const timep, struct tm *tmp) { - return gmtsub(timep, 0L, tmp); + int err = lock(); + if (err) { + errno = err; + return NULL; + } + gmtcheck(); + tmp = gmtsub(timep, 0, tmp); + unlock(); + return tmp; } #ifdef STD_INSPIRED @@ -1366,7 +1411,16 @@ gmtime_r(const time_t *const timep, struct tm *tmp) struct tm * offtime(const time_t *const timep, const long offset) { - return gmtsub(timep, offset, &tm); + struct tm *tmp; + int err = lock(); + if (err) { + errno = err; + return NULL; + } + gmtcheck(); + tmp = gmtsub(timep, offset, &tm); + unlock(); + return tmp; } #endif /* defined STD_INSPIRED */ @@ -1901,8 +1955,16 @@ time1(struct tm *const tmp, time_t mktime(struct tm *const tmp) { - tzset(); - return time1(tmp, localsub, 0L); + time_t t; + int err = lock(); + if (err) { + errno = err; + return -1; + } + tzset_unlocked(); + t = time1(tmp, localsub, 0); + unlock(); + return t; } #ifdef STD_INSPIRED @@ -1918,17 +1980,25 @@ timelocal(struct tm *const tmp) time_t timegm(struct tm *const tmp) { - if (tmp != NULL) - tmp->tm_isdst = 0; - return time1(tmp, gmtsub, 0L); + return timeoff(tmp, 0); } time_t timeoff(struct tm *const tmp, const long offset) { - if (tmp != NULL) - tmp->tm_isdst = 0; - return time1(tmp, gmtsub, offset); + time_t t; + int err; + if (tmp) + tmp->tm_isdst = 0; + err = lock(); + if (err) { + errno = err; + return -1; + } + gmtcheck(); + t = time1(tmp, gmtsub, offset); + unlock(); + return t; } #endif /* defined STD_INSPIRED */ @@ -1986,8 +2056,17 @@ leapcorr(time_t *timep) time_t time2posix(time_t t) { - tzset(); - return t - leapcorr(&t); + time_t p; + int err = lock(); + if (err) { + errno = err; + return -1; + } + if (!lcl_is_set) + tzset_unlocked(); + p = t - leapcorr(&t); + unlock(); + return p; } time_t @@ -1995,8 +2074,13 @@ posix2time(time_t t) { time_t x; time_t y; - - tzset(); + int err = lock(); + if (err) { + errno = err; + return -1; + } + if (!lcl_is_set) + tzset_unlocked(); /* ** For a positive leap second hit, the result ** is not unique. For a negative leap second @@ -2010,16 +2094,15 @@ posix2time(time_t t) x++; y = x - leapcorr(&x); } while (y < t); - if (t != y) - return x - 1; + x -= y != t; } else if (y > t) { do { --x; y = x - leapcorr(&x); } while (y > t); - if (t != y) - return x + 1; + x += y != t; } + unlock(); return x; } -- 1.9.1

2 6

[PROPOSED PATCH 1/4] Fix unlikely buffer overrun when setting date across network.
by Paul Eggert Aug. 23, 2014

Aug. 23, 2014

* date.c (netsettime) [TSP_SETDATE]: Don't assume gethostname returns a null-terminated string. --- date.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/date.c b/date.c index c8fab75..3b44c94 100644 --- a/date.c +++ b/date.c @@ -819,7 +819,6 @@ netsettime(struct timeval ntv) { int s, length, port, timed_ack, found, err, waittime; fd_set ready; - char hostname[MAXHOSTNAMELEN]; struct timeval tout; struct servent *sp; struct tsp msg; @@ -858,11 +857,15 @@ netsettime(struct timeval ntv) } msg.tsp_type = TSP_SETDATE; msg.tsp_vers = TSPVERSION; - if (gethostname(hostname, sizeof (hostname))) { + msg.tsp_name[sizeof msg.tsp_name - 1] = '\0'; + if (gethostname(msg.tsp_name, sizeof msg.tsp_name) != 0) { perror("gethostname"); goto bad; } - strncpy(msg.tsp_name, hostname, sizeof (hostname)); + if (msg.tsp_name[sizeof msg.tsp_name - 1]) { + fprintf(stderr, "hostname too long\n"); + goto bad; + } msg.tsp_seq = htons(0); msg.tsp_time.tv_sec = htonl(ntv.tv_sec); msg.tsp_time.tv_usec = htonl(ntv.tv_usec); -- 1.9.1

1 5

[PATCH] * asia (Asia/Kolkata): Add comment about 19th-century Madras time.
by Paul Eggert Aug. 23, 2014

Aug. 23, 2014

--- asia | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/asia b/asia index b3afc5d..00e0df3 100644 --- a/asia +++ b/asia @@ -880,6 +880,14 @@ Zone Asia/Dili 8:22:20 - LMT 1912 Jan 1 # India +# From Paul Eggert (2014-08-21): +# In tomorrow's The Hindu, Nitya Menon reports that India had two civil time +# zones starting in 1884, one in Bombay and one in Calcutta, and that railways +# used a third time zone based on Madras time (80 deg. 18'30" E). Also, +# in 1881 Bombay briefly switched to Madras Time, but switched back. See: +# http://www.thehindu.com/news/cities/chennai/madras-375-when-madras-clocked-… +# Ignore this as it predates our 1970 cutoff. + # From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne: # According to a Portuguese decree (1911-05-26) # http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf -- 1.9.1

2 4

[PROPOSED PATCH] Simplify configuration of TM_GMTOFF and TM_ZONE.
by Paul Eggert Aug. 23, 2014

Aug. 23, 2014

* private.h, zdump.c (_GNU_SOURCE): New macro. * private.h (TM_GMTOFF) [!NO_TM_GMTOFF]: (TM_ZONE) [!NO_TM_ZONE]: Guess definition if not already defined. * Makefile, NEWS: Document the above. --- Makefile | 23 +++++------------------ NEWS | 4 ++++ private.h | 16 ++++++++++++++++ zdump.c | 3 +++ 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 4703cba..fa110e2 100644 --- a/Makefile +++ b/Makefile @@ -161,25 +161,12 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ # (or if you decide to add such a field in your system's "time.h" file), # add the name to a define such as # -DTM_GMTOFF=tm_gmtoff -# or -# -DTM_GMTOFF=_tm_gmtoff -# to the end of the "CFLAGS=" line. -# Neither tm_gmtoff nor _tm_gmtoff is described in X3J11's work; -# in its work, use of "tm_gmtoff" is described as non-conforming. -# Both Linux and BSD have done the equivalent of defining TM_GMTOFF in -# their recent releases. -# -# If your system has a "zone abbreviation" field in its "struct tm"s -# (or if you decide to add such a field in your system's "time.h" file), -# add the name to a define such as +# to the end of the "CFLAGS=" line. If not defined, the code attempts to +# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this. +# Similarly, if your system has a "zone abbreviation" field, define # -DTM_ZONE=tm_zone -# or -# -DTM_ZONE=_tm_zone -# to the end of the "CFLAGS=" line. -# Neither tm_zone nor _tm_zone is described in X3J11's work; -# in its work, use of "tm_zone" is described as non-conforming. -# Both UCB and Sun have done the equivalent of defining TM_ZONE in -# their recent releases. +# and define NO_TM_ZONE to suppress any guessing. These two fields are not +# required by POSIX, but are widely available on GNU/Linux and BSD dystems. # # If you want functions that were inspired by early versions of X3J11's work, # add diff --git a/NEWS b/NEWS index 335a7cf..7bc8b05 100644 --- a/NEWS +++ b/NEWS @@ -51,6 +51,10 @@ Unreleased, experimental changes Although not needed for tz's own applications, which are single-threaded, this supports POSIX better if the tz library is used in multithreaded apps. + The tz code now attempts to infer TM_GMTOFF and TM_ZONE if not + already defined, to make it easier to configure on common platforms. + Define NO_TM_GMTOFF and NO_TM_ZONE to suppress this. + tzselect -c now uses a hybrid distance measure that works better in Africa. (Thanks to Alan Barrett for noting the problem.) diff --git a/private.h b/private.h index 9482790..2389e37 100644 --- a/private.h +++ b/private.h @@ -71,6 +71,9 @@ #define ctime_r _incompatible_ctime_r #endif /* HAVE_INCOMPATIBLE_CTIME_R */ +/* Enable tm_gmtoff and tm_zone on GNUish systems. */ +#define _GNU_SOURCE 1 + /* ** Nested includes */ @@ -337,6 +340,19 @@ time_t posix2time(time_t); # endif #endif +/* Infer TM_ZONE on systems where this information is known, but suppress + guessing if NO_TM_ZONE is defined. Similarly for TM_GMTOFF. */ +#if (defined __GLIBC__ \ + || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ \ + || (defined __APPLE__ && defined __MACH__)) +# if !defined TM_GMTOFF && !defined NO_TM_GMTOFF +# define TM_GMTOFF tm_gmtoff +# endif +# if !defined TM_ZONE && !defined NO_TM_ZONE +# define TM_ZONE tm_zone +# endif +#endif + /* ** Private function declarations. */ diff --git a/zdump.c b/zdump.c index e9a42fd..070ad3c 100644 --- a/zdump.c +++ b/zdump.c @@ -18,6 +18,9 @@ # include "private.h" #endif +/* Enable tm_gmtoff and tm_zone on GNUish systems. */ +#define _GNU_SOURCE 1 + #include "stdio.h" /* for stdout, stderr, perror */ #include "string.h" /* for strcpy */ #include "sys/types.h" /* for time_t */ -- 1.9.1

2 3