diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | timezone/README | 4 | ||||
| -rw-r--r-- | timezone/africa | 11 | ||||
| -rw-r--r-- | timezone/antarctica | 6 | ||||
| -rw-r--r-- | timezone/asia | 19 | ||||
| -rw-r--r-- | timezone/australasia | 82 | ||||
| -rw-r--r-- | timezone/europe | 56 | ||||
| -rw-r--r-- | timezone/leapseconds | 5 | ||||
| -rw-r--r-- | timezone/northamerica | 27 | ||||
| -rw-r--r-- | timezone/private.h | 17 | ||||
| -rw-r--r-- | timezone/southamerica | 171 | ||||
| -rw-r--r-- | timezone/zic.c | 14 |
12 files changed, 267 insertions, 157 deletions
diff --git a/ChangeLog b/ChangeLog index 7628ebfac9..6168c8ab54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 1999-08-17 Ulrich Drepper <drepper@cygnus.com> + * timezone/private.h: Update from tzcode1999e. + * timezone/zic.c: Likewise. + + * timezone/africa: Update from tzdata1999e. + * timezone/antarctica: Likewise. + * timezone/asia: Likewise. + * timezone/australasia: Likewise. + * timezone/europe: Likewise. + * timezone/leapseconds: Likewise. + * timezone/northamerica: Likewise. + * timezone/southamerica: Likewise. + * stdio-common/vfprintf.c (process_string_arg): Correct last patch and write correct number of bytes in case of %ls with precision. Reported by Shinya Hanataka <hanataka@abyss.rim.or.jp>. diff --git a/timezone/README b/timezone/README index a9490fa001..d5bf708074 100644 --- a/timezone/README +++ b/timezone/README @@ -1,14 +1,14 @@ The files zic.c zdump.c ialloc.c scheck.c tzfile.h private.h tzselect.ksh checktab.awk -come from the tzcode1999c package by Arthur David Olson et.al. +come from the tzcode1999e package by Arthur David Olson et.al. The files africa antarctica asia australasia europe northamerica southamerica pacificnew etcetera factory backward systemv solar87 solar88 solar89 iso3166.tab zone.tab leapseconds yearistype -come from the tzdata1999c package by Arthur David Olson et.al. +come from the tzdata1999e package by Arthur David Olson et.al. These packages may be found at ftp://elsie.nci.nih.gov/pub/. Commentary should be addressed to tz@elsie.nci.nih.gov. diff --git a/timezone/africa b/timezone/africa index f0cf017fd2..c728eceb0f 100644 --- a/timezone/africa +++ b/timezone/africa @@ -1,4 +1,4 @@ -# @(#)africa 7.28 +# @(#)africa 7.30 # 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 @@ -24,7 +24,7 @@ # I found in the UCLA library. # # A reliable and entertaining source about time zones is -# Derek Howse, Greenwich time and longitude, Antique Collectors Club (1997). +# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # # Previous editions of this database used WAT, CAT, SAT, and EAT # for +0:00 through +3:00, respectively, @@ -442,10 +442,9 @@ Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis # # Scattered Islands (Iles Eparses) administered from Reunion are as follows. # The following information about them is taken from -# <a href="http://www.outre-mer.gouv.fr/domtom/ile.htm"> -# Iles Eparses -# </a> -# (1997-07-22, in French). We have no info about their time zone histories. +# Iles Eparses (www.outre-mer.gouv.fr/domtom/ile.htm, 1997-07-22, in French; +# no longer available as of 1999-08-17). +# We have no info about their time zone histories. # # Bassas da India - uninhabited # Europa Island - inhabited from 1905 to 1910 by two families diff --git a/timezone/antarctica b/timezone/antarctica index feee35033f..82d8299d24 100644 --- a/timezone/antarctica +++ b/timezone/antarctica @@ -1,4 +1,4 @@ -# @(#)antarctica 7.15 +# @(#)antarctica 7.16 # From Paul Eggert (1999-03-22): # To keep things manageable, we list only locations occupied year-round; see @@ -141,8 +141,8 @@ Zone Antarctica/DumontDUrville 0 - ___ 1947 Zone Antarctica/Syowa 0 - ___ 1957 Jan 29 3:00 - SYOT # Syowa Time # See: -# <a href="http://www.nipr.ac.jp/english/jare.html"> -# Japanese Antarctic Research Expedition (JARE) (1998-04-09) +# <a href="http://www.nipr.ac.jp/english/ara01.html"> +# NIPR Antarctic Research Activities (1999-08-17) # </a> # S Korea - year-round base diff --git a/timezone/asia b/timezone/asia index 23047d5229..dc09affd2d 100644 --- a/timezone/asia +++ b/timezone/asia @@ -25,7 +25,7 @@ # I found in the UCLA library. # # A reliable and entertaining source about time zones is -# Derek Howse, Greenwich time and longitude, Antique Collectors Club (1997). +# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # # I invented the abbreviations marked `*' in the following table; # the rest are from earlier versions of this file, or from other sources. @@ -648,6 +648,11 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u # Since 1938, all Japanese possessions have been like Asia/Tokyo. # Jordan +# From Steffen Thorsen (1999-05-08): +# Jordan do not have DST this year. It also seems that they are not going +# to use it the next years either. "We do not need it" was the answer I got +# from the Jordan National Information Centre (http://www.nic.gov.jo). +# # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S Rule Jordan 1973 1975 - Oct 1 0:00 0 - @@ -666,9 +671,9 @@ Rule Jordan 1991 only - Apr 17 0:00 1:00 S Rule Jordan 1991 only - Sep 27 0:00 0 - Rule Jordan 1992 only - Apr 10 0:00 1:00 S Rule Jordan 1992 1993 - Oct Fri>=1 0:00 0 - -Rule Jordan 1993 max - Apr Fri>=1 0:00 1:00 S +Rule Jordan 1993 1998 - Apr Fri>=1 0:00 1:00 S Rule Jordan 1994 only - Sep Fri>=15 0:00 0 - -Rule Jordan 1995 max - Sep Fri>=15 0:00s 0 - +Rule Jordan 1995 1998 - Sep Fri>=15 0:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Amman 2:23:44 - LMT 1931 2:00 Jordan EE%sT @@ -948,7 +953,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct # no information # Philippines -# Howse writes that until 1844 the Philippines kept American date. +# Howse writes (p 153) that until 1844 the Philippines kept American date. # The rest of this data is from Shanks. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Phil 1936 only - Nov 1 0:00 1:00 S @@ -992,9 +997,9 @@ Zone Asia/Singapore 6:55:24 - LMT 1880 # Sri Lanka # From Paul Eggert (1996-09-03): -# <a href="http://www.virtual-pc.com/lankaweb/news/items/240596-2.html"> -# Sri Lanka advances clock by an hour to avoid blackout (1996-05-24) -# </a> +# "Sri Lanka advances clock by an hour to avoid blackout" +# (www.virtual-pc.com/lankaweb/news/items/240596-2.html, 1996-05-24, +# no longer available as of 1999-08-17) # reported ``the country's standard time will be put forward by one hour at # midnight Friday (1830 GMT) `in the light of the present power crisis'.'' # Transitions before 1996 are from Shanks (1995). diff --git a/timezone/australasia b/timezone/australasia index c5b018e952..e75edd5053 100644 --- a/timezone/australasia +++ b/timezone/australasia @@ -1,4 +1,4 @@ -# @(#)australasia 7.46 +# @(#)australasia 7.48 # This file also includes Pacific islands. # Notes are at the end of this file @@ -68,13 +68,15 @@ Zone Australia/Lindeman 9:55:56 - LMT 1895 # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule AS 1971 1985 - Oct lastSun 2:00s 1:00 - Rule AS 1986 only - Oct 19 2:00s 1:00 - -Rule AS 1987 max - Oct lastSun 2:00s 1:00 - +Rule AS 1987 1999 - Oct lastSun 2:00s 1:00 - Rule AS 1972 only - Feb 27 2:00s 0 - Rule AS 1973 1985 - Mar Sun>=1 2:00s 0 - Rule AS 1986 1989 - Mar Sun>=15 2:00s 0 - Rule AS 1990 1994 even Mar Sun>=18 2:00s 0 - Rule AS 1990 1994 odd Mar Sun>=1 2:00s 0 - Rule AS 1995 max - Mar lastSun 2:00s 0 - +Rule AS 2000 only - Aug lastSun 2:00s 1:00 - +Rule AS 2001 max - Oct lastSun 2:00s 1:00 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Australia/Adelaide 9:14:20 - LMT 1895 Feb 9:00 - CST 1899 May @@ -113,7 +115,7 @@ Rule AV 1986 only - Oct 19 2:00s 1:00 - Rule AV 1987 1999 - Oct lastSun 2:00s 1:00 - Rule AV 1991 1994 - Mar Sun>=1 2:00s 0 - Rule AV 1995 max - Mar lastSun 2:00s 0 - -Rule AV 2000 only - Aug 26 2:00s 1:00 - +Rule AV 2000 only - Aug lastSun 2:00s 1:00 - Rule AV 2001 max - Oct lastSun 2:00s 1:00 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Australia/Melbourne 9:39:52 - LMT 1895 Feb @@ -133,7 +135,7 @@ Rule AN 1986 only - Oct 19 2:00s 1:00 - Rule AN 1987 1999 - Oct lastSun 2:00s 1:00 - Rule AN 1990 1995 - Mar Sun>=1 2:00s 0 - Rule AN 1996 max - Mar lastSun 2:00s 0 - -Rule AN 2000 only - Aug 26 2:00s 1:00 - +Rule AN 2000 only - Aug lastSun 2:00s 1:00 - Rule AN 2001 max - Oct lastSun 2:00s 1:00 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Australia/Sydney 10:04:52 - LMT 1895 Feb @@ -388,7 +390,7 @@ Zone Pacific/Fakaofo -11:24:56 - LMT 1901 # Tonga # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Tongatapu 12:19:20 - LMT 1901 - 12:20 - TOT 1968 Oct # Tonga Time + 12:20 - TOT 1941 # Tonga Time 13:00 - TOT # Tuvalu @@ -473,7 +475,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # I found in the UCLA library. # # A reliable and entertaining source about time zones is -# Derek Howse, Greenwich time and longitude, Antique Collectors Club (1997). +# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # # I invented the abbreviations marked `*' in the following table; # the rest are from earlier versions of this file, or from other sources. @@ -541,7 +543,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # Standard Time Act 1987 (updated 1995-04-04) # </a> # ACT -# <a href="http://www.austlii.edu.au/au/legis/act/consol_act/consol_act/stasta1972279/index.html"> +# <a href="http://www.austlii.edu.au/au/legis/act/consol_act/stasta1972279/index.html"> # Standard Time and Summer Time Act 1972 # </a> # SA @@ -806,15 +808,23 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # Prem Bob Carr announced NSW will fall into line with other E states # and SA and continue daylight savings to the last Sun in Mar. -# From Eric Ulevik <eau@ozemail.com.au> (1997-06-12): -# The NSW state government in Australia is talking about bringing the start -# of daylight savings time forward in the year 2000 to cater for the Olympics. -# This is going to take some time to be negotiated, because the plan is to do -# this in multiple states due to soccer games (which are not just in Sydney). +# From Eric Ulevik <eau@ozemail.com.au> (1999-05-26): +# DST will start in NSW on the last Sunday of August, rather than the usual +# October in 2000. Victoria and South Australia are expected to adopt this +# change, Queensland is unlikely. [See: Matthew Moore, +# <a href="http://www.smh.com.au/news/9905/26/pageone/pageone4.html"> +# Two months more daylight saving +# </a> +# Sydney Morning Herald (1999-05-26).] + +# Also see the following official NSW source: +# <a href="http://dir.gis.nsw.gov.au/cgi-bin/genobject/document/other/daylightsaving/tigGmZ"> +# Daylight Saving in New South Wales. +# </a> # IATA SSIM (1998-09) says that the spring 2000 change for Australian # Capital Territory, New South Wales except Lord Howe Island and Broken -# Hill, and Victoria will be August 26, presumably due to the Sydney Olympics. +# Hill, and Victoria will be August 27, presumably due to the Sydney Olympics. # Yancowinna @@ -897,9 +907,9 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # Fiji -# Howse writes that in 1879 the British governor of Fiji -# enacted an ordinance standardizing the islands on +12:00. -# Perhaps it didn't take. We go with Shanks's more precise date in 1915. +# Howse writes (p 153) that in 1879 the British governor of Fiji +# enacted an ordinance standardizing the islands on Antipodean Time +# instead of the American system (which was one day behind). # From Rives McDow (1998-10-08): # Fiji will introduce DST effective 0200 local time, 1998-11-01 @@ -934,7 +944,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # N Mariana Is, Guam -# Howse writes ``The Spaniards, on the other hand, reached the +# Howse writes (p 153) ``The Spaniards, on the other hand, reached the # Philippines and the Ladrones from America,'' and implies that the Ladrones # (now called the Marianas) kept American date for quite some time. # Ignore this for now, as we have no hard data. See also Asia/Manila. @@ -950,7 +960,8 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # Samoa -# Howse writes that in 1879 the King of Samoa decided to change +# Howse writes (p 153, citing p 10 of the 1883-11-18 New York Herald) +# that in 1879 the King of Samoa decided to change # ``the date in his kingdom from the Antipodean to the American system, # ordaining -- by a masterpiece of diplomatic flattery -- that # the Fourth of July should be celebrated twice in that year.'' @@ -961,3 +972,38 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # Today's _Wall Street Journal_ (p 1) reports that ``Tonga has been plotting # to sneak ahead of [New Zealanders] by introducing daylight-saving time.'' # Since Kiribati has moved the Date Line it's not clear what Tonga will do. + +# Don Mundell writes in the 1997-02-20 Tonga Chronicle +# <a href="http://www.tongatapu.net.to/tonga/homeland/timebegins.htm"> +# How Tonga became `The Land where Time Begins' +# </a>: + +# Until 1941 Tonga maintained a standard time 50 minutes ahead of NZST +# 12 hours and 20 minutes ahead of GMT. When New Zealand adjusted its +# standard time in 1940s, Tonga had the choice of subtracting from its +# local time to come on the same standard time as New Zealand or of +# advancing its time to maintain the differential of 13 degrees +# (approximately 50 minutes ahead of New Zealand time). +# +# Because His Majesty King Taufa'ahau Tupou IV, then Crown Prince +# Tungi, preferred to ensure Tonga's title as the land where time +# begins, the Legislative Assembly approved the latter change. +# +# But some of the older, more conservative members from the outer +# islands objected. "If at midnight on Dec. 31, we move ahead 40 +# minutes, as your Royal Highness wishes, what becomes of th 40 +# minutes we have lost?" +# +# The Crown Prince, presented an unanswerable argument: "Remember that +# on the World Day of Prayer, you would be the first people on Earth +# to say your prayers in the morning." + +# From Paul Eggert (1999-08-12): +# Shanks says the transition was on 1968-10-01; go with Mundell. + +# From Eric Ulevik (1999-05-03): +# Tonga's director of tourism, who is also secretary of the National Millenium +# Committee, has a plan to get Tonga back in front. +# He has proposed a one-off move to tropical daylight saving for Tonga from +# October to March, which has won approval in principle from the Tongan +# Government. diff --git a/timezone/europe b/timezone/europe index 3053e5078e..50440e5cc4 100644 --- a/timezone/europe +++ b/timezone/europe @@ -1,4 +1,4 @@ -# @(#)europe 7.60 +# @(#)europe 7.62 # 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 @@ -46,7 +46,7 @@ # 3:00 MSK MSD Moscow # # A reliable and entertaining source about time zones, especially in Britain, -# Derek Howse, Greenwich time and longitude, Antique Collectors Club (1997). +# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # From Peter Ilieve <peter@memex.co.uk> (1994-12-04), # The original six [EU members]: Belgium, France, (West) Germany, Italy, @@ -100,31 +100,32 @@ # Howse writes that Britain was the first country to use standard time. # The railways cared most about the inconsistencies of local mean time, # and it was they who forced a uniform time on the country. -# The original idea was credited to Dr. William Hyde Wollaston (1766-1828); -# it was popularized in 1840 by Capt. Basil Hall, RN (1788-1844), -# famed explorer and former Commissioner for Longitude. +# The original idea was credited to Dr. William Hyde Wollaston (1766-1828) +# and was popularized by Abraham Follett Osler (1808-1903). # The first railway to adopt London time was the Great Western Railway # in November 1840; other railways followed suit, and by 1847 most -# (though not all) railways used London time. On 1847 Sep 22 the +# (though not all) railways used London time. On 1847-09-22 the # Railway Clearing House, an industry standards body, recommended that GMT be -# adopted at all stations; the January 1848 Bradshaw's lists most major +# adopted at all stations as soon as the General Post Office permitted it. +# The transition occurred on 12-01 for the L&NW, the Caledonian, +# and presumably other railways; the January 1848 Bradshaw's lists many # railways as using GMT. By 1855 the vast majority of public -# clocks in Britain were set to GMT (though some, like the Great Clock -# in Tom Tower at Christ Church, Oxford, were fitted with two minute hands, +# clocks in Britain were set to GMT (though some, like the great clock +# on Tom Tower at Christ Church, Oxford, were fitted with two minute hands, # one for local time and one for GMT). The last major holdout was the legal # system, which stubbornly stuck to local time for many years, leading # to oddities like polls opening at 08:13 and closing at 16:13. # The legal system finally switched to GMT when the Statutes (Definition -# of Time) Act took effect; it received the Royal Assent on 1880 Aug 2. +# of Time) Act took effect; it received the Royal Assent on 1880-08-02. # # In the tables below, we condense this complicated story into a single -# transition date for London, namely 1847 Sep 22. We don't know as much -# about Dublin, so we use 1880 Aug 2, the legal transition time. +# transition date for London, namely 1847-12-01. We don't know as much +# about Dublin, so we use 1880-08-02, the legal transition time. # From Paul Eggert (1999-01-30): # Summer Time was first seriously proposed by William Willett (1857-1915), # a London builder and member of the Royal Astronomical Society -# who circulated a pamphlet ``Waste of Daylight'' (1907) +# who circulated a pamphlet ``The Waste of Daylight'' (1907) # that proposed advancing clocks 20 minutes on each of four Sundays in April, # and retarding them by the same amount on four Sundays in September. # A bill was drafted in 1909 and introduced in Parliament several times, @@ -154,6 +155,8 @@ # time of sunrise and sunset in The Times, when BDST was in effect, and # if you find a zone reference it will say, "All times B.D.S.T." +# Howse writes (p 157) `DBST'; let's assume this is a typo. + # From Peter Ilieve <peter@aldie.co.uk> (1998-04-19): # The following list attempts to show the complete history of Summer Time # legislation in the United Kingdom, and has quite a bit to say about @@ -749,17 +752,17 @@ # From Paul Eggert (1999-03-28): # Clive Feather (<news:859845706.26043.0@office.demon.net>, 1997-03-31) -# reports that Cheriton Shuttle Terminal uses Concession Time (CT), -# equivalent to French civil time. +# reports that Folkestone (Cheriton) Shuttle Terminal uses Concession Time +# (CT), equivalent to French civil time. # Julian Hill (<news:36118128.5A14@virgin.net>, 1998-09-30) reports that -# trains between Dollands Moor (the freight facility just outside Cheriton) +# trains between Dollands Moor (the freight facility next door) # and Frethun run in CT. # My admittedly uninformed guess is that the terminal has two authorities, # the French concession operators and the British civil authorities, # and that the time depends on who you're talking to. # If, say, the British police were called to the station for some reason, # I would expect the official police report to use GMT/BST and not CET/CEST. -# This is a borderline case, but for now let's stick to GMT/BST for Cheriton. +# This is a borderline case, but for now let's stick to GMT/BST. # From an anonymous contributor (1996-06-02): # The law governing time in Ireland is under Statutory Instrument SI 395/94, @@ -880,7 +883,7 @@ Rule GB-Eire 1990 1995 - Oct Sun>=22 1:00u 0 GMT # See EU for rules starting in 1996. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Europe/London -0:01:15 - LMT 1847 Sep 22 +Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00 GB-Eire %s 1968 Oct 27 1:00 - BST 1971 Oct 31 2:00u 0:00 GB-Eire %s 1996 @@ -1875,13 +1878,24 @@ Zone Europe/Warsaw 1:24:00 - LMT 1880 1:00 Poland CE%sT 1940 Jun 23 2:00 1:00 C-Eur CE%sT 1944 Oct 1:00 Poland CE%sT 1977 Apr 3 1:00 - 1:00 W-Eur CE%sT + 1:00 W-Eur CE%sT 1999 # IATA SSIM (1991/1996) gives EU rules, but the _The Warsaw Voice_ -# <a href="http://www.contact.waw.pl/voice/v361/NewsInBrief.shtml"> -# http://www.contact.waw.pl/voice/v361/NewsInBrief.shtml (1995-09-24) +# <a href="http://www.warsawvoice.com.pl/v361/NewsInBrief.shtml"> +# http://www.warsawvoice.com/pl/v361/NewsInBrief.shtml (1995-09-24) # </a> # says the autumn 1995 switch was at 02:00. # Stick with W-Eur for now. +# +# From Marcin.Kasperski@softax.com.pl (1999-06-10): +# According to my colleagues someone recently decided, that Poland would +# follow European Union regulations, so - I think - the matter is not +# worth further discussion. +# +# From Paul Eggert (1999-06-10): +# Kasperski also writes that the government futzed with the rules in 1997 +# or 1998 but he doesn't remember the details. Assume they switched to +# EU rules in 1999. + 1:00 EU CE%sT # Portugal # diff --git a/timezone/leapseconds b/timezone/leapseconds index 1cd114b91f..82a8ddf3f1 100644 --- a/timezone/leapseconds +++ b/timezone/leapseconds @@ -1,9 +1,10 @@ -# @(#)leapseconds 7.11 +# @(#)leapseconds 7.12 # Allowance for leapseconds added to each timezone file. # The International Earth Rotation Service periodically uses leap seconds -# to keep UTC to within 0.9 s of TAI (atomic time); see +# to keep UTC to within 0.9 s of UT1 +# (which measures the true angular orientation of the earth in space); see # Terry J Quinn, The BIPM and the accurate measure of time, # Proc IEEE 79, 7 (July 1991), 894-905. # There were no leap seconds before 1972, because the official mechanism diff --git a/timezone/northamerica b/timezone/northamerica index 8743f4b49e..c545344647 100644 --- a/timezone/northamerica +++ b/timezone/northamerica @@ -1,4 +1,4 @@ -# @(#)northamerica 7.44 +# @(#)northamerica 7.45 # also includes Central America and the Caribbean # This data is by no means authoritative; if you think you know better, @@ -7,12 +7,23 @@ # From Paul Eggert <eggert@twinsun.com> (1999-03-22): # A reliable and entertaining source about time zones is -# Derek Howse, Greenwich time and longitude, Antique Collectors Club (1997). +# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). ############################################################################### # United States +# From Paul Eggert (1999-03-31): +# Howse writes (pp 121-125) that time zones were invented by +# Professor Charles Ferdinand Dowd (1825-1904), +# Principal of Temple Grove Ladies' Seminary (Saratoga Springs, NY). +# His pamphlet ``A System of National Time for Railroads'' (1870) +# was the result of his proposals at the Convention of Railroad Trunk Lines +# in New York City (1869-10). His 1870 proposal was based on Washington, DC, +# but in 1872-05 he moved the proposed origin to Greenwich. +# His proposal was adopted by the railroads on 1883-11-18 at 12:00, +# and the most of the country soon followed suit. + # From Paul Eggert <eggert@twinsun.com> (1995-12-19): # A good source for time zone historical data in the US is # Thomas G. Shanks, The American Atlas (5th edition), @@ -293,6 +304,11 @@ Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:00 # Indiana # +# For a map of Indiana's time zone regions, see: +# <a href="http://www.mccsc.edu/time.html"> +# What time is it in Indiana? +# </a> (1999-04-06) +# # From Paul Eggert (1995-12-19): # Indiana generally observes either EST all year, or CST/CDT, # but areas near Cincinnati and Louisville use those cities' timekeeping @@ -398,9 +414,10 @@ Zone America/Louisville -5:43:02 - LMT 1883 Nov 18 12:00 # From Bob Devine (1988-01-28): # Michigan didn't observe DST from 1968 to 1973. # -# From Paul Eggert (1995-12-19): -# Shanks writes that Michigan started using standard time on 1885 Sep 18, -# but Howse writes that Detroit kept +# From Paul Eggert (1999-03-31): +# Shanks writes that Michigan started using standard time on 1885-09-18, +# but Howse writes (pp 124-125, referring to Popular Astronomy, 1901-01) +# that Detroit kept # # local time until 1900 when the City Council decreed that clocks should # be put back twenty-eight minutes to Central Standard Time. Half the diff --git a/timezone/private.h b/timezone/private.h index f2c0558a16..75b3cb1831 100644 --- a/timezone/private.h +++ b/timezone/private.h @@ -21,7 +21,7 @@ #ifndef lint #ifndef NOID -static char privatehid[] = "@(#)private.h 7.48"; +static char privatehid[] = "@(#)private.h 7.49"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -50,6 +50,10 @@ static char privatehid[] = "@(#)private.h 7.48"; #define HAVE_SYMLINK 1 #endif /* !defined HAVE_SYMLINK */ +#ifndef HAVE_SYS_WAIT_H +#define HAVE_SYS_WAIT_H 1 +#endif /* !defined HAVE_SYS_WAIT_H */ + #ifndef HAVE_UNISTD_H #define HAVE_UNISTD_H 1 #endif /* !defined HAVE_UNISTD_H */ @@ -78,6 +82,17 @@ static char privatehid[] = "@(#)private.h 7.48"; #include "libintl.h" #endif /* HAVE_GETTEXT - 0 */ +#if HAVE_SYS_WAIT_H - 0 +#include <sys/wait.h> /* for WIFEXITED and WEXITSTATUS */ +#endif /* HAVE_SYS_WAIT_H - 0 */ + +#ifndef WIFEXITED +#define WIFEXITED(status) (((status) & 0xff) == 0) +#endif /* !defined WIFEXITED */ +#ifndef WEXITSTATUS +#define WEXITSTATUS(status) (((status) >> 8) & 0xff) +#endif /* !defined WEXITSTATUS */ + #if HAVE_UNISTD_H - 0 #include "unistd.h" /* for F_OK and R_OK */ #endif /* HAVE_UNISTD_H - 0 */ diff --git a/timezone/southamerica b/timezone/southamerica index 35678b9027..bb3ae36dd1 100644 --- a/timezone/southamerica +++ b/timezone/southamerica @@ -1,10 +1,10 @@ -# @(#)southamerica 7.27 +# @(#)southamerica 7.28 # 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@elsie.nci.nih.gov for general use in the future). -# From Paul Eggert <eggert@twinsun.com> (1996-11-22): +# From Paul Eggert <eggert@twinsun.com> (1999-07-07): # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks, The International Atlas (4th edition), # San Diego: ACS Publications, Inc. (1995). @@ -18,16 +18,6 @@ # Except where otherwise noted, Shanks is the source for entries through 1990, # and IATA SSIM is the source for entries after 1990. # -# The following abbreviations are used in this file. -# Corrections are welcome! -# std dst -# LMT Local Mean Time -# -2:00 FST FDT Fernando de Noronha -# -3:00 EST EDT Eastern Brazil -# -4:00 WST WDT Western Brazil -# -4:00 AST ADT Atlantic -# -5:00 AST ADT Acre -# # Earlier editions of these tables used the North American style (e.g. ARST and # ARDT for Argentine Standard and Daylight Time), but the following quote # suggests that it's better to use European style (e.g. ART and ARST). @@ -36,15 +26,24 @@ # in Europe and South America. # -- E O Cutler, _New York Times_ (1937-02-14), quoted in # H L Mencken, _The American Language: Supplement I_ (1960), p 466 - - -# From Guy Harris: -# From Official Airline Guide - Worldwide Edition (1987). Countries not -# listed here do not observe DST, according to the OAG. Time zone names -# are pure inventions, and none are supplied for countries not observing -# DST; updates from natives would be appreciated. The times that DST -# starts and ends are based on the assumption that they switch a 2AM just -# as everybody else does. +# +# Earlier editions of these tables also used the North American style +# for time zones in Brazil, but this was incorrect, as Brazilians say +# "summer time". Reinaldo Goulart, a Sao Paulo businessman active in +# the railroad sector, writes (1999-07-06): +# The subject of time zones is currently a matter of discussion/debate in +# Brazil. Let's say that "the Brasilia time" is considered the +# "official time" because Brasilia is the capital city. +# The other three time zones are called "Brasilia time "minus one" or +# "plus one" or "plus two". As far as I know there is no such +# name/designation as "Eastern Time" or "Central Time". +# So I invented the following (English-language) abbreviations for now. +# Corrections are welcome! +# std dst +# -2:00 FNT FNST Fernando de Noronha +# -3:00 BRT BRST Brasilia +# -4:00 AMT AMST Amazon +# -5:00 ACT ACST Acre ############################################################################### @@ -253,18 +252,18 @@ Zone America/La_Paz -4:32:36 - LMT 1890 # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01) # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10) -Rule Brazil 1931 only - Oct 3 11:00 1:00 D -Rule Brazil 1932 1933 - Apr 1 0:00 0 S -Rule Brazil 1932 only - Oct 3 0:00 1:00 D +Rule Brazil 1931 only - Oct 3 11:00 1:00 S +Rule Brazil 1932 1933 - Apr 1 0:00 0 - +Rule Brazil 1932 only - Oct 3 0:00 1:00 S # Decree <a href="http://pcdsh01.on.br/HV23195.htm">23,195</a> (1933-10-10) # revoked DST. # Decree <a href="http://pcdsh01.on.br/HV27496.htm">27,496</a> (1949-11-24) # Decree <a href="http://pcdsh01.on.br/HV27998.htm">27,998</a> (1950-04-13) -Rule Brazil 1949 1952 - Dec 1 0:00 1:00 D -Rule Brazil 1950 only - Apr 16 1:00 0 S -Rule Brazil 1951 1952 - Apr 1 0:00 0 S +Rule Brazil 1949 1952 - Dec 1 0:00 1:00 S +Rule Brazil 1950 only - Apr 16 1:00 0 - +Rule Brazil 1951 1952 - Apr 1 0:00 0 - # Decree <a href="http://pcdsh01.on.br/HV32308.htm">32,308</a> (1953-02-24) -Rule Brazil 1953 only - Mar 1 0:00 0 S +Rule Brazil 1953 only - Mar 1 0:00 0 - # Decree <a href="http://pcdsh01.on.br/HV34724.htm">34,724</a> (1953-11-30) # revoked DST. # Decree <a href="http://pcdsh01.on.br/HV52700.htm">52,700</a> (1963-10-18) @@ -272,52 +271,52 @@ Rule Brazil 1953 only - Mar 1 0:00 0 S # in SP, RJ, GB, MG, ES, due to the prolongation of the drought. # Decree <a href="http://pcdsh01.on.br/HV53071.htm">53,071</a> (1963-12-03) # extended the above decree to all of the national territory on 12-09. -Rule Brazil 1963 only - Dec 9 0:00 1:00 D +Rule Brazil 1963 only - Dec 9 0:00 1:00 S # Decree <a href="http://pcdsh01.on.br/HV53604.htm">53,604</a> (1964-02-25) # extended summer time by one day to 1964-03-01 00:00 (start of school). -Rule Brazil 1964 only - Mar 1 0:00 0 S +Rule Brazil 1964 only - Mar 1 0:00 0 - # Decree <a href="http://pcdsh01.on.br/HV55639.htm">55,639</a> (1965-01-27) -Rule Brazil 1965 only - Jan 31 0:00 1:00 D -Rule Brazil 1965 only - Mar 31 0:00 0 S +Rule Brazil 1965 only - Jan 31 0:00 1:00 S +Rule Brazil 1965 only - Mar 31 0:00 0 - # Decree <a href="http://pcdsh01.on.br/HV57303.htm">57,303</a> (1965-11-22) -Rule Brazil 1965 only - Dec 1 0:00 1:00 D +Rule Brazil 1965 only - Dec 1 0:00 1:00 S # Decree <a href="http://pcdsh01.on.br/HV57843.htm">57,843</a> (1966-02-18) -Rule Brazil 1966 1968 - Mar 1 0:00 0 S -Rule Brazil 1966 1967 - Nov 1 0:00 1:00 D +Rule Brazil 1966 1968 - Mar 1 0:00 0 - +Rule Brazil 1966 1967 - Nov 1 0:00 1:00 S # Decree <a href="http://pcdsh01.on.br/HV63429.htm">63,429</a> (1968-10-15) # revoked DST. # Decree <a href="http://pcdsh01.on.br/HV91698.htm">91,698</a> (1985-09-27) -Rule Brazil 1985 only - Nov 2 0:00 1:00 D +Rule Brazil 1985 only - Nov 2 0:00 1:00 S # Decree 92,310 (1986-01-21) # Decree 92,463 (1986-03-13) -Rule Brazil 1986 only - Mar 15 0:00 0 S +Rule Brazil 1986 only - Mar 15 0:00 0 - # Decree 93,316 (1986-10-01) -Rule Brazil 1986 only - Oct 25 0:00 1:00 D -Rule Brazil 1987 only - Feb 14 0:00 0 S +Rule Brazil 1986 only - Oct 25 0:00 1:00 S +Rule Brazil 1987 only - Feb 14 0:00 0 - # Decree <a href="http://pcdsh01.on.br/HV94922.htm">94,922</a> (1987-09-22) -Rule Brazil 1987 only - Oct 25 0:00 1:00 D -Rule Brazil 1988 only - Feb 7 0:00 0 S +Rule Brazil 1987 only - Oct 25 0:00 1:00 S +Rule Brazil 1988 only - Feb 7 0:00 0 - # Decree <a href="http://pcdsh01.on.br/HV96676.htm">96,676</a> (1988-09-12) # except for the states of AC, AM, PA, RR, RO, and AP (then a territory) -Rule Brazil 1988 only - Oct 16 0:00 1:00 D -Rule Brazil 1989 only - Jan 29 0:00 0 S +Rule Brazil 1988 only - Oct 16 0:00 1:00 S +Rule Brazil 1989 only - Jan 29 0:00 0 - # Decree <a href="http://pcdsh01.on.br/HV98077.htm">98,077</a> (1989-08-21) # with the same exceptions -Rule Brazil 1989 only - Oct 15 0:00 1:00 D -Rule Brazil 1990 only - Feb 11 0:00 0 S +Rule Brazil 1989 only - Oct 15 0:00 1:00 S +Rule Brazil 1990 only - Feb 11 0:00 0 - # Decree <a href="http://pcdsh01.on.br/HV99530.htm">99,530</a> (1990-09-17) # adopted by RS, SC, PR, SP, RJ, ES, MG, GO, MS, DF. # Decree 99,629 (1990-10-19) adds BA, MT. -Rule Brazil 1990 only - Oct 21 0:00 1:00 D -Rule Brazil 1991 only - Feb 17 0:00 0 S +Rule Brazil 1990 only - Oct 21 0:00 1:00 S +Rule Brazil 1991 only - Feb 17 0:00 0 - # <a href="http://pcdsh01.on.br/HV1991.htm">Unnumbered decree</a> (1991-09-25) # adopted by RS, SC, PR, SP, RJ, ES, MG, BA, GO, MT, MS, DF. -Rule Brazil 1991 only - Oct 20 0:00 1:00 D -Rule Brazil 1992 only - Feb 9 0:00 0 S +Rule Brazil 1991 only - Oct 20 0:00 1:00 S +Rule Brazil 1992 only - Feb 9 0:00 0 - # <a href="http://pcdsh01.on.br/HV1992.htm">Unnumbered decree</a> (1992-10-16) # adopted by same states. -Rule Brazil 1992 only - Oct 25 0:00 1:00 D -Rule Brazil 1993 only - Jan 31 0:00 0 S +Rule Brazil 1992 only - Oct 25 0:00 1:00 S +Rule Brazil 1993 only - Jan 31 0:00 0 - # Decree <a href="http://pcdsh01.on.br/HV942.htm">942</a> (1993-09-28) # adopted by same states, plus AM. # Decree <a href="http://pcdsh01.on.br/HV1252.htm">1,252</a> (1994-09-22) @@ -326,13 +325,13 @@ Rule Brazil 1993 only - Jan 31 0:00 0 S # adopted by same states, plus TO. # Decree <a href="http://pcdsh01.on.br/HV1674.htm">1,674</a> (1995-10-13) # adds AL, SE. -Rule Brazil 1993 1995 - Oct Sun>=11 0:00 1:00 D -Rule Brazil 1994 1995 - Feb Sun>=15 0:00 0 S -Rule Brazil 1996 only - Feb 11 0:00 0 S +Rule Brazil 1993 1995 - Oct Sun>=11 0:00 1:00 S +Rule Brazil 1994 1995 - Feb Sun>=15 0:00 0 - +Rule Brazil 1996 only - Feb 11 0:00 0 - # Decree <a href="http://pcdsh01.on.br/HV2000.htm">2,000</a> (1996-09-04) # adopted by same states, minus AL, SE. -Rule Brazil 1996 only - Oct 6 0:00 1:00 D -Rule Brazil 1997 only - Feb 16 0:00 0 S +Rule Brazil 1996 only - Oct 6 0:00 1:00 S +Rule Brazil 1997 only - Feb 16 0:00 0 - # From Daniel C. Sobral <dcs@gns.com.br> (1998-02-12): # In 1997, the DS began on October 6. The stated reason was that # because international television networks ignored Brazil's policy on DS, @@ -347,79 +346,79 @@ Rule Brazil 1997 only - Feb 16 0:00 0 S # Church Net UK (1997-10-02). # # Decree 2,317 (1997-09-04), adopted by same states. -Rule Brazil 1997 only - Oct 6 0:00 1:00 D +Rule Brazil 1997 only - Oct 6 0:00 1:00 S # Decree <a href="http://pcdsh01.on.br/figuras/HV2495.JPG">2,495</a> # (1998-02-10) -Rule Brazil 1998 only - Mar 1 0:00 0 S +Rule Brazil 1998 only - Mar 1 0:00 0 - # Decree <a href="http://pcdsh01.on.br/figuras/Hv98.jpg">2,780</a> (1998-09-11) # adopted by the same states as before, # specifies only the 1998-10-11 and 1999-02-21 transitions; # after that, these rules are guesses and are quite possibly wrong, # but they are more likely than no DST at all. -Rule Brazil 1998 max - Oct Sun>=8 0:00 1:00 D -Rule Brazil 1999 max - Feb Sun>=15 0:00 0 S +Rule Brazil 1998 max - Oct Sun>=8 0:00 1:00 S +Rule Brazil 1999 max - Feb Sun>=15 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] # # Fernando de Noronha Zone America/Noronha -2:09:40 - LMT 1914 - -2:00 Brazil F%sT 1990 Jul - -2:00 - FST + -2:00 Brazil FN%sT 1990 Jul + -2:00 - FNT # # Amapa, east Para Zone America/Belem -3:13:56 - LMT 1914 - -3:00 Brazil E%sT 1988 Jul - -3:00 - EST + -3:00 Brazil BR%sT 1988 Jul + -3:00 - BRT # # Maranhao, Piaui, Ceara, Rio Grande do Norte, Paraiba, # Pernambuco (except Fernando de Noronha) Zone America/Fortaleza -2:34:00 - LMT 1914 - -3:00 Brazil E%sT 1990 Jul - -3:00 - EST + -3:00 Brazil BR%sT 1990 Jul + -3:00 - BRT # # Tocantins Zone America/Araguaina -3:12:48 - LMT 1914 - -3:00 Brazil E%sT 1990 Jul - -3:00 - EST 1995 Jul - -3:00 Brazil E%sT + -3:00 Brazil BR%sT 1990 Jul + -3:00 - BRT 1995 Jul + -3:00 Brazil BR%sT # # Alagoas, Sergipe Zone America/Maceio -2:22:52 - LMT 1914 - -3:00 Brazil E%sT 1990 Jul - -3:00 - EST 1995 Jul - -3:00 Brazil E%sT 1996 Jul - -3:00 - EST + -3:00 Brazil BR%sT 1990 Jul + -3:00 - BRT 1995 Jul + -3:00 Brazil BR%sT 1996 Jul + -3:00 - BRT # # Bahia, Goias, Distrito Federal, Minas Gerais, Espirito Santo, Rio de Janeiro, # Sao Paulo, Parana, Santa Catarina, Rio Grande do Sul Zone America/Sao_Paulo -3:06:28 - LMT 1914 - -3:00 Brazil E%sT 1963 Oct 23 00:00 - -3:00 - EDT 1964 - -3:00 Brazil E%sT + -3:00 Brazil BR%sT 1963 Oct 23 00:00 + -3:00 - BRST 1964 + -3:00 Brazil BR%sT # # Mato Grosso, Mato Grosso do Sul Zone America/Cuiaba -3:44:20 - LMT 1914 - -4:00 Brazil W%sT 1990 Jul - -4:00 - WST + -4:00 Brazil AM%sT 1990 Jul + -4:00 - AMT # # Roraima, west Para, Rondonia Zone America/Porto_Velho -4:15:36 - LMT 1914 - -4:00 Brazil W%sT 1988 Jul - -4:00 - WST + -4:00 Brazil AM%sT 1988 Jul + -4:00 - AMT # # Amazonas Zone America/Manaus -4:00:04 - LMT 1914 - -4:00 Brazil W%sT 1988 Jul - -4:00 - WST 1993 Jul - -4:00 Brazil W%sT 1994 Jul - -4:00 - WST + -4:00 Brazil AM%sT 1988 Jul + -4:00 - AMT 1993 Jul + -4:00 Brazil AM%sT 1994 Jul + -4:00 - AMT # # Acre # Rio_Branco is too ambiguous, since there's a Rio Branco in Uruguay too. Zone America/Porto_Acre -4:31:12 - LMT 1914 - -5:00 Brazil A%sT 1988 Jul - -5:00 - AST + -5:00 Brazil AC%sT 1988 Jul + -5:00 - ACT # # Martin Vaz and Trinidade are like America/Noronha. diff --git a/timezone/zic.c b/timezone/zic.c index de706e8316..ddf155f279 100644 --- a/timezone/zic.c +++ b/timezone/zic.c @@ -1,6 +1,6 @@ #ifndef lint #ifndef NOID -static char elsieid[] = "@(#)zic.c 7.99"; +static char elsieid[] = "@(#)zic.c 7.100"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -617,7 +617,7 @@ const char * const tofile; result = link(fromname, toname); #if (HAVE_SYMLINK - 0) if (result != 0) { - char *s = (char *) tofile; + const char *s = tofile; register char *symlinkcontents = NULL; while ((s = strchr(s+1, '/')) != NULL) symlinkcontents = ecatalloc(symlinkcontents, "../"); @@ -1918,10 +1918,12 @@ const char * const type; buf = erealloc(buf, (int) (132 + strlen(yitcommand) + strlen(type))); (void) sprintf(buf, "%s %d %s", yitcommand, year, type); result = system(buf); - if (result == 0) - return TRUE; - if (result == (1 << 8)) - return FALSE; + if (WIFEXITED(result)) switch (WEXITSTATUS(result)) { + case 0: + return TRUE; + case 1: + return FALSE; + } error(_("Wild result from command execution")); (void) fprintf(stderr, _("%s: command was '%s', result was %d\n"), progname, buf, result); |