Update.
1998-10-01 Ulrich Drepper <drepper@cygnus.com> * timezone/zic.c: Update from tzcode1998h. * timezone/europe: Update from tzdata1998i. * timezone/southamerica: Likewise.
This commit is contained in:
Ulrich Drepper
parent
36ab45e15f
commit
e3e4e463cf
|
|
@ -1,3 +1,9 @@
|
|||
1998-10-01 Ulrich Drepper <drepper@cygnus.com>
|
||||
|
||||
* timezone/zic.c: Update from tzcode1998h.
|
||||
* timezone/europe: Update from tzdata1998i.
|
||||
* timezone/southamerica: Likewise.
|
||||
|
||||
1998-09-29 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
|
||||
|
||||
* string/bits/string2.h (__string2_1bptr_p): Don't use a statement
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# @(#)europe 7.56
|
||||
# @(#)europe 7.57
|
||||
|
||||
# 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
|
||||
|
|
@ -948,7 +948,7 @@ Rule Russia 1921 only - Feb 14 23:00 1:00 S
|
|||
# Shanks gives 1921 Mar 21 for the following transition.
|
||||
# From Andrey A. Chernov <ache@astral.msk.su> (1993-11-12):
|
||||
# My sources says, that it is Mar 20, not 21.
|
||||
Rule Russia 1921 only - Mar 20 23:00 2:00 DS
|
||||
Rule Russia 1921 only - Mar 20 23:00 2:00 M # Midsummer
|
||||
Rule Russia 1921 only - Sep 1 0:00 1:00 S
|
||||
Rule Russia 1921 only - Oct 1 0:00 0 -
|
||||
# Act No.925 of the Council of Ministers of the USSR (1980-10-24):
|
||||
|
|
@ -1313,19 +1313,19 @@ Rule France 1939 only - Nov 18 23:00s 0 -
|
|||
Rule France 1940 only - Feb 25 2:00 1:00 S
|
||||
# The French rules for 1941-1944 were not used in Paris,
|
||||
# but were used in other places (e.g. Monaco).
|
||||
Rule France 1941 only - May 5 0:00 2:00 DS
|
||||
Rule France 1941 only - May 5 0:00 2:00 M # Midsummer
|
||||
# Shanks says this transition occurred at Oct 6 1:00,
|
||||
# but go with Denis.Excoffier@ens.fr (1997-12-12),
|
||||
# who quotes the Ephemerides Astronomiques for 1998 from Bureau des Longitudes
|
||||
# as saying 5/10/41 22hUT.
|
||||
Rule France 1941 only - Oct 6 0:00 1:00 S
|
||||
Rule France 1942 only - Mar 9 0:00 2:00 DS
|
||||
Rule France 1942 only - Mar 9 0:00 2:00 M
|
||||
Rule France 1942 only - Nov 2 3:00 1:00 S
|
||||
Rule France 1943 only - Mar 29 2:00 2:00 DS
|
||||
Rule France 1943 only - Mar 29 2:00 2:00 M
|
||||
Rule France 1943 only - Oct 4 3:00 1:00 S
|
||||
Rule France 1944 only - Apr 3 2:00 2:00 DS
|
||||
Rule France 1944 only - Apr 3 2:00 2:00 M
|
||||
Rule France 1944 only - Oct 8 1:00 1:00 S
|
||||
Rule France 1945 only - Apr 2 2:00 2:00 DS
|
||||
Rule France 1945 only - Apr 2 2:00 2:00 M
|
||||
Rule France 1945 only - Sep 16 3:00 0 -
|
||||
# Shanks gives Mar 28 2:00 and Sep 26 3:00;
|
||||
# go with Excoffier's 28/3/76 0hUT and 25/9/76 23hUT.
|
||||
|
|
@ -1347,16 +1347,30 @@ Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
|
|||
|
||||
# Germany
|
||||
|
||||
# From Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> (1998-09-29):
|
||||
# The German time zone web site by the Physikalisch-Technische
|
||||
# Bundesanstalt contains DST information back to 1916.
|
||||
#
|
||||
# <a href="http://www.ptb.de/english/org/4/43/432/lega.htm">
|
||||
# Realisation of Legal Time in Germany
|
||||
# </a>
|
||||
|
||||
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
|
||||
Rule Germany 1945 only - Apr 2 2:00s 1:00 S
|
||||
Rule Germany 1945 only - May 24 2:00 2:00 DS
|
||||
Rule Germany 1945 only - Sep 24 3:00 1:00 S
|
||||
# Shanks says 05-24 2:00 to 09-24 3:00 for DDST; go with the PTB, who quotes
|
||||
# the Archiv fuer publizist. Arbeit (Munzinger-Archiv) 652 (Zeitsystem)
|
||||
# (1961-11-25), which gives dates only. Guess 3:00 transition times.
|
||||
Rule Germany 1945 only - May 31 3:00 2:00 M # Midsummer
|
||||
Rule Germany 1945 only - Sep 23 3:00 1:00 S
|
||||
Rule Germany 1945 only - Nov 18 2:00s 0 -
|
||||
Rule Germany 1946 only - Apr 14 2:00s 1:00 S
|
||||
# Whitman gives 1948 Oct 31; go with Shanks.
|
||||
Rule Germany 1946 1949 - Oct Sun>=1 2:00s 0 -
|
||||
# Shanks gives 1946-10-06; go with the PTB.
|
||||
Rule Germany 1946 only - Oct 7 2:00s 0 -
|
||||
Rule Germany 1947 1949 - Oct Sun>=1 2:00s 0 -
|
||||
Rule Germany 1947 only - Apr 6 2:00s 1:00 S
|
||||
Rule Germany 1947 only - May 11 2:00s 2:00 DS
|
||||
# The PTB gives 3:00 CET and 3:00 CEST for the midsummer transition times;
|
||||
# go with Shanks.
|
||||
Rule Germany 1947 only - May 11 2:00s 2:00 M
|
||||
Rule Germany 1947 only - Jun 29 3:00 1:00 S
|
||||
Rule Germany 1948 only - Apr 18 2:00s 1:00 S
|
||||
Rule Germany 1949 only - Apr 10 2:00s 1:00 S
|
||||
|
|
@ -1898,12 +1912,12 @@ Rule Port 1940 only - Feb 24 23:00s 1:00 S
|
|||
Rule Port 1940 1941 - Oct 5 23:00s 0 -
|
||||
Rule Port 1941 only - Apr 5 23:00s 1:00 S
|
||||
Rule Port 1942 1945 - Mar Sat>=8 23:00s 1:00 S
|
||||
Rule Port 1942 only - Apr 25 22:00s 2:00 DS
|
||||
Rule Port 1942 only - Apr 25 22:00s 2:00 M # Midsummer
|
||||
Rule Port 1942 only - Aug 15 22:00s 1:00 S
|
||||
Rule Port 1942 1945 - Oct Sat>=24 23:00s 0 -
|
||||
Rule Port 1943 only - Apr 17 22:00s 2:00 DS
|
||||
Rule Port 1943 only - Apr 17 22:00s 2:00 M
|
||||
Rule Port 1943 1945 - Aug Sat>=25 22:00s 1:00 S
|
||||
Rule Port 1944 1945 - Apr Sat>=21 22:00s 2:00 DS
|
||||
Rule Port 1944 1945 - Apr Sat>=21 22:00s 2:00 M
|
||||
Rule Port 1946 only - Apr Sat>=1 23:00s 1:00 S
|
||||
Rule Port 1946 only - Oct Sat>=1 23:00s 0 -
|
||||
Rule Port 1947 1949 - Apr Sun>=1 2:00s 1:00 S
|
||||
|
|
@ -2115,9 +2129,9 @@ Rule Spain 1938 only - Mar 22 23:00s 1:00 S
|
|||
Rule Spain 1939 only - Apr 15 23:00s 1:00 S
|
||||
Rule Spain 1940 only - Mar 16 23:00s 1:00 S
|
||||
# Whitman says no DST 1942-1945; go with Shanks.
|
||||
Rule Spain 1942 only - May 2 22:00s 2:00 DS
|
||||
Rule Spain 1942 only - May 2 22:00s 2:00 M # Midsummer
|
||||
Rule Spain 1942 only - Sep 1 22:00s 1:00 S
|
||||
Rule Spain 1943 1946 - Apr Sat>=13 22:00s 2:00 DS
|
||||
Rule Spain 1943 1946 - Apr Sat>=13 22:00s 2:00 M
|
||||
Rule Spain 1943 only - Oct 3 22:00s 1:00 S
|
||||
Rule Spain 1944 only - Oct 10 22:00s 1:00 S
|
||||
Rule Spain 1945 only - Sep 30 1:00 1:00 S
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# @(#)southamerica 7.24
|
||||
# @(#)southamerica 7.25
|
||||
|
||||
# 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
|
||||
|
|
@ -184,14 +184,6 @@ Zone America/La_Paz -4:32:36 - LMT 1890
|
|||
|
||||
# Brazil
|
||||
|
||||
# From Guy Harris:
|
||||
# The OAG lists 1987-10-25 and 1988-02-12 as the starting and
|
||||
# ending dates, giving them as "estimated date(s) based on previous year". We
|
||||
# infer a rule here from one example, always a dangerous practice.... Yes,
|
||||
# they really do switch on Saturday, according to the OAG.
|
||||
# "[America/Porto_Acre]" is for the [State] of Acre;
|
||||
# "[America/Noronha]" is for Fernando De Noronha.
|
||||
|
||||
# From Paul Eggert <eggert@twinsun.com> (1993-11-18):
|
||||
# The mayor of Rio recently attempted to change the time zone rules
|
||||
# just in his city, in order to leave more summer time for the tourist trade.
|
||||
|
|
@ -247,33 +239,78 @@ Zone America/La_Paz -4:32:36 - LMT 1890
|
|||
# error. Line 193 say "Territory of Acre". It is not a territory anymore
|
||||
# but a state.
|
||||
|
||||
# From Marcos Tadeu (1998-09-27):
|
||||
# <a href="http://pcdsh01.on.br/verao1.html">
|
||||
# Brazilian official page
|
||||
# </a>
|
||||
#
|
||||
# From Paul Eggert (1998-09-28):
|
||||
# The official decrees referenced below are taken from
|
||||
# <a href="http://pcdsh01.on.br/DecHV.html">
|
||||
# Decretos sobre o Horario de Verao no Brasil
|
||||
# </a> (1998-09-25, in Portuguese).
|
||||
# I don't read Portuguese, and haven't been able to verify them against
|
||||
# the Shanks and IATA data; there do seem to be minor discrepancies.
|
||||
|
||||
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
|
||||
# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20.466</a> (1931-01-10)
|
||||
# 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
|
||||
# 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)
|
||||
# Decree <a href="http://pcdsh01.on.br/HV32308.htm">32.308</a> (1953-02-24)
|
||||
Rule Brazil 1949 1952 - Dec 1 0:00 1:00 D
|
||||
Rule Brazil 1950 only - Apr 16 0:00 0 S
|
||||
Rule Brazil 1951 1953 - Apr 1 0:00 0 S
|
||||
# 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)
|
||||
# Decree <a href="http://pcdsh01.on.br/HV53071.htm">53.071</a> (1963-12-03)
|
||||
Rule Brazil 1963 only - Dec 9 0:00 1:00 D
|
||||
# Decree <a href="http://pcdsh01.on.br/HV53604.htm">53.604</a> (1964-02-25)
|
||||
Rule Brazil 1964 only - Mar 1 0:00 0 S
|
||||
# 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 - Apr 1 0:00 0 S
|
||||
# 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
|
||||
# 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
|
||||
# Decree <a href="http://pcdsh01.on.br/HV63429.htm">63.429</a> (1968-10-15)
|
||||
# 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
|
||||
# Decree 92.310 (1986-01-21)
|
||||
# Decree 92.463 (1986-03-13)
|
||||
Rule Brazil 1986 only - Mar 15 0:00 0 S
|
||||
# Decree 93.316 (1986-10-01)
|
||||
# Decree <a href="http://pcdsh01.on.br/HV94922.htm">94.922</a> (1987-09-22)
|
||||
Rule Brazil 1986 1987 - Oct Sat<=28 0:00 1:00 D
|
||||
Rule Brazil 1987 only - Feb 14 0:00 0 S
|
||||
Rule Brazil 1988 only - Feb 7 0:00 0 S
|
||||
# Decree <a href="http://pcdsh01.on.br/HV96676.htm">96.676</a> (1988-09-12)
|
||||
# Decree <a href="http://pcdsh01.on.br/HV98077.htm">98.077</a> (1989-08-21)
|
||||
# Decree <a href="http://pcdsh01.on.br/HV99530.htm">99.530</a> (1990-09-17)
|
||||
# Decree 99.629 (1990-10-19)
|
||||
# <a href="http://pcdsh01.on.br/HV1991.htm">Unnumbered decree</a> (1991-09-25):
|
||||
# <a href="http://pcdsh01.on.br/HV1992.htm">Unnumbered decree</a> (1992-10-16):
|
||||
Rule Brazil 1989 only - Jan 22 0:00 0 S
|
||||
Rule Brazil 1988 1989 - Oct Sun>=10 0:00 1:00 D
|
||||
Rule Brazil 1990 1991 - Feb Sun>=11 0:00 0 S
|
||||
Rule Brazil 1990 1992 - Oct Sun>=20 0:00 1:00 D
|
||||
Rule Brazil 1992 only - Feb 9 0:00 0 S
|
||||
# Decree <a href="http://pcdsh01.on.br/HV942.htm">942</a> (1993-09-28)
|
||||
# Decree <a href="http://pcdsh01.on.br/HV1252.htm">1.252</a> (1994-09-22)
|
||||
# Decree <a href="http://pcdsh01.on.br/HV1636.htm">1.636</a> (1995-09-14)
|
||||
# Decree <a href="http://pcdsh01.on.br/HV1674.htm">1.674</a> (1995-10-13)
|
||||
Rule Brazil 1993 1995 - Oct Sun>=11 0:00 1:00 D
|
||||
Rule Brazil 1993 only - Jan 31 0:00 0 S
|
||||
Rule Brazil 1994 1995 - Feb Sun>=15 0:00 0 S
|
||||
# Decree <a href="http://pcdsh01.on.br/HV2000.htm">2.000</a> (1996-09-04)
|
||||
Rule Brazil 1996 only - Feb Sun>=11 0:00 0 S
|
||||
Rule Brazil 1996 only - Oct Sun>=1 0:00 1:00 D
|
||||
# From Daniel C. Sobral <dcs@gns.com.br> (1998-02-12):
|
||||
|
|
@ -284,15 +321,23 @@ Rule Brazil 1996 only - Oct Sun>=1 0:00 1:00 D
|
|||
# to help dealing with the shortages of electric power.
|
||||
#
|
||||
# From Paul Eggert (1998-02-25):
|
||||
# Reference for 1997-10-06 change:
|
||||
# <a href="http://churchnet.ucsm.ac.uk/news/files2/news165.htm">
|
||||
# Brazil Prepares for Papal Visit
|
||||
# </a>,
|
||||
# Church Net UK (1997-10-02).
|
||||
#
|
||||
# Decree 2.317 (1997-09-04)
|
||||
Rule Brazil 1997 only - Oct 6 0:00 1:00 D
|
||||
# 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 max - Oct Sun>=1 0:00 1:00 D
|
||||
Rule Brazil 1999 max - Feb Sun>=11 0:00 0 S
|
||||
# Decree <a href="http://pcdsh01.on.br/figuras/Hv98.jpg">2.780</a> (1998-09-11)
|
||||
# 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>=11 0:00 1:00 D
|
||||
Rule Brazil 1999 max - Feb Sun>=15 0:00 0 S
|
||||
|
||||
|
||||
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
|
||||
#
|
||||
|
|
@ -349,14 +394,20 @@ Zone America/Porto_Acre -4:31:12 - LMT 1914
|
|||
# From Eduardo Krell (1995-10-19):
|
||||
# The law says to switch to DST at midnight [24:00] on the second SATURDAY
|
||||
# of October.... The law is the same for March and October.
|
||||
# (1998-09-29):
|
||||
# Because of the drought this year, the government decided to go into
|
||||
# DST earlier (saturday 9/26 at 24:00). This is a one-time change only ...
|
||||
# (unless there's another dry season next year, I guess).
|
||||
|
||||
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
|
||||
Rule Chile 1918 only - Sep 1 0:00 1:00 S
|
||||
Rule Chile 1919 only - Jul 2 0:00 0 -
|
||||
Rule Chile 1927 1931 - Sep 1 0:00 1:00 S
|
||||
Rule Chile 1928 1932 - Apr 1 0:00 0 -
|
||||
Rule Chile 1969 max - Oct Sun>=9 0:00 1:00 S
|
||||
Rule Chile 1969 1997 - Oct Sun>=9 0:00 1:00 S
|
||||
Rule Chile 1970 max - Mar Sun>=9 0:00 0 -
|
||||
Rule Chile 1998 only - Sep 27 0:00 1:00 S
|
||||
Rule Chile 1999 max - Oct Sun>=9 0:00 1:00 S
|
||||
# IATA SSIM anomalies: (1990-09) says 1990-09-16; (1992-02) says 1992-03-14;
|
||||
# (1996-09) says 1998-03-08. Ignore these for now.
|
||||
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#ifndef lint
|
||||
#ifndef NOID
|
||||
static char elsieid[] = "@(#)zic.c 7.94";
|
||||
static char elsieid[] = "@(#)zic.c 7.95";
|
||||
#endif /* !defined NOID */
|
||||
#endif /* !defined lint */
|
||||
|
||||
|
|
@ -901,9 +901,10 @@ const int signable;
|
|||
error(errstring);
|
||||
return 0;
|
||||
}
|
||||
if (hh < 0 || hh >= HOURSPERDAY ||
|
||||
if ((hh < 0 || hh >= HOURSPERDAY ||
|
||||
mm < 0 || mm >= MINSPERHOUR ||
|
||||
ss < 0 || ss > SECSPERMIN) {
|
||||
ss < 0 || ss > SECSPERMIN) &&
|
||||
!(hh == HOURSPERDAY && mm == 0 && ss == 0)) {
|
||||
error(errstring);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue