diff options
| author | Michael P | 2011-07-05 03:16:11 +0000 |
|---|---|---|
| committer | Michael P | 2011-07-06 03:40:35 +0000 |
| commit | 0bbfc1e6338b5d98d6cb83fa75f2c38f527d4d4b (patch) | |
| tree | 46fa412a31d08ea6e53d488ae7bc231df0b273da /src/timezone | |
| parent | 091b0e828cf0fd5bbd1f9ae58ab96fc983e55d77 (diff) | |
| parent | a4bebdd92624e018108c2610fc3f2c1584b6c687 (diff) | |
Merge commit 'a4bebdd92624e018108c2610fc3f2c1584b6c687' into master
This is the commit merge of Postgres-XC with the intersection of
PostgreSQL REL9_1_STABLE and master branches.
Conflicts:
COPYRIGHT
contrib/pgbench/pgbench.c
src/Makefile
src/backend/access/transam/recovery.conf.sample
src/backend/access/transam/varsup.c
src/backend/access/transam/xlog.c
src/backend/catalog/Makefile
src/backend/catalog/dependency.c
src/backend/catalog/system_views.sql
src/backend/commands/copy.c
src/backend/commands/explain.c
src/backend/commands/sequence.c
src/backend/commands/tablecmds.c
src/backend/commands/vacuum.c
src/backend/executor/nodeAgg.c
src/backend/nodes/copyfuncs.c
src/backend/nodes/equalfuncs.c
src/backend/nodes/outfuncs.c
src/backend/nodes/readfuncs.c
src/backend/optimizer/path/allpaths.c
src/backend/optimizer/plan/createplan.c
src/backend/optimizer/plan/setrefs.c
src/backend/parser/gram.y
src/backend/parser/parse_utilcmd.c
src/backend/postmaster/postmaster.c
src/backend/rewrite/rewriteHandler.c
src/backend/storage/lmgr/proc.c
src/backend/tcop/postgres.c
src/backend/utils/adt/ruleutils.c
src/backend/utils/init/postinit.c
src/backend/utils/misc/guc.c
src/backend/utils/misc/postgresql.conf.sample
src/backend/utils/sort/tuplesort.c
src/bin/initdb/initdb.c
src/bin/pg_ctl/pg_ctl.c
src/bin/pg_dump/pg_dump.c
src/include/access/xlog.h
src/include/catalog/catversion.h
src/include/catalog/indexing.h
src/include/catalog/pg_aggregate.h
src/include/catalog/pg_proc.h
src/include/commands/copy.h
src/include/nodes/parsenodes.h
src/include/nodes/primnodes.h
src/include/optimizer/pathnode.h
src/include/parser/kwlist.h
src/include/storage/procarray.h
src/test/regress/expected/.gitignore
src/test/regress/expected/aggregates.out
src/test/regress/expected/alter_table.out
src/test/regress/expected/bit.out
src/test/regress/expected/box.out
src/test/regress/expected/delete.out
src/test/regress/expected/float4.out
src/test/regress/expected/float8.out
src/test/regress/expected/int2.out
src/test/regress/expected/int8.out
src/test/regress/expected/interval.out
src/test/regress/expected/numeric.out
src/test/regress/expected/point.out
src/test/regress/expected/polygon.out
src/test/regress/expected/sequence.out
src/test/regress/expected/timestamp.out
src/test/regress/expected/timestamptz.out
src/test/regress/expected/transactions.out
src/test/regress/expected/window.out
src/test/regress/input/misc.source
src/test/regress/output/create_misc_1.source
src/test/regress/output/misc.source
src/test/regress/sql/aggregates.sql
src/test/regress/sql/alter_table.sql
src/test/regress/sql/bit.sql
src/test/regress/sql/box.sql
src/test/regress/sql/delete.sql
src/test/regress/sql/domain.sql
src/test/regress/sql/float4.sql
src/test/regress/sql/float8.sql
src/test/regress/sql/int2.sql
src/test/regress/sql/int8.sql
src/test/regress/sql/interval.sql
src/test/regress/sql/lseg.sql
src/test/regress/sql/numeric.sql
src/test/regress/sql/path.sql
src/test/regress/sql/point.sql
src/test/regress/sql/polygon.sql
src/test/regress/sql/portals.sql
src/test/regress/sql/sequence.sql
src/test/regress/sql/timestamp.sql
src/test/regress/sql/timestamptz.sql
src/test/regress/sql/transactions.sql
src/test/regress/sql/window.sql
src/test/regress/sql/with.sql
Diffstat (limited to 'src/timezone')
37 files changed, 565 insertions, 136 deletions
diff --git a/src/timezone/.gitignore b/src/timezone/.gitignore new file mode 100644 index 0000000000..f844c9fcf1 --- /dev/null +++ b/src/timezone/.gitignore @@ -0,0 +1 @@ +/zic diff --git a/src/timezone/Makefile b/src/timezone/Makefile index ddf07ad3da..2cecaec5e6 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -4,7 +4,7 @@ # Makefile for the timezone library # IDENTIFICATION -# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.33 2010/07/05 18:54:38 tgl Exp $ +# src/timezone/Makefile # #------------------------------------------------------------------------- @@ -35,7 +35,7 @@ endif include $(top_srcdir)/src/backend/common.mk ifeq (,$(with_system_tzdata)) -all: submake-libpgport zic +all: zic endif # We could do this test in the action section: @@ -46,7 +46,7 @@ ifeq (,$(ZIC)) ZIC= ./zic endif -zic: $(ZICOBJS) +zic: $(ZICOBJS) | submake-libpgport $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs diff --git a/src/timezone/README b/src/timezone/README index 4372ce542b..4db3148e0c 100644 --- a/src/timezone/README +++ b/src/timezone/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/timezone/README,v 1.9 2010/04/15 11:00:45 mha Exp $ +src/timezone/README Timezone ======== diff --git a/src/timezone/data/africa b/src/timezone/data/africa index 8cae7a682b..13c7470ecc 100644 --- a/src/timezone/data/africa +++ b/src/timezone/data/africa @@ -1,5 +1,5 @@ # <pre> -# @(#)africa 8.26 +# @(#)africa 8.30 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -294,8 +294,25 @@ Rule Egypt 2007 only - Sep Thu>=1 23:00s 0 - # and can be found by searching for "winter" in their search engine # (at least today). +# From Alexander Krivenyshev (2010-07-20): +# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has +# decided that Daylight Saving Time will not be used in Egypt during +# Ramadan. +# +# Arabic translation: +# "Clocks to go back during Ramadan--and then forward again" +# <a href="http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again"> +# http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again +# </a> +# or +# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt02.html"> +# http://www.worldtimezone.com/dst_news/dst_news_egypt02.html +# </a> + Rule Egypt 2008 only - Aug lastThu 23:00s 0 - Rule Egypt 2009 only - Aug 20 23:00s 0 - +Rule Egypt 2010 only - Aug 11 0:00 0 - +Rule Egypt 2010 only - Sep 10 0:00 1:00 S Rule Egypt 2010 max - Sep lastThu 23:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -695,6 +712,48 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html # </a> +# From Dan Abitol (2011-03-30): +# ...Rules for Africa/Casablanca are the following (24h format) +# The 3rd april 2011 at 00:00:00, [it] will be 3rd april 1:00:00 +# The 31th july 2011 at 00:59:59, [it] will be 31th July 00:00:00 +# ...Official links of change in morocco +# The change was broadcast on the FM Radio +# I ve called ANRT (telecom regulations in Morocco) at +# +212.537.71.84.00 +# <a href="http://www.anrt.net.ma/fr/"> +# http://www.anrt.net.ma/fr/ +# </a> +# They said that +# <a href="http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view"> +# http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view +# </a> +# is the official publication to look at. +# They said that the decision was already taken. +# +# More articles in the press +# <a href="http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev"> +# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev +# </a> +# e.html +# <a href="http://www.lematin.ma/Actualite/Express/Article.asp?id=148923"> +# http://www.lematin.ma/Actualite/Express/Article.asp?id=148923 +# </a> +# <a href="http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim"> +# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim +# anche-prochain-5538.html +# </a> + +# From Petr Machata (2011-03-30): +# They have it written in English here: +# <a href="http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view"> +# http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view +# </a> +# +# It says there that "Morocco will resume its standard time on July 31, +# 2011 at midnight." Now they don't say whether they mean midnight of +# wall clock time (i.e. 11pm UTC), but that's what I would assume. It has +# also been like that in the past. + # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Morocco 1939 only - Sep 12 0:00 1:00 S @@ -718,6 +777,8 @@ Rule Morocco 2009 only - Jun 1 0:00 1:00 S Rule Morocco 2009 only - Aug 21 0:00 0 - Rule Morocco 2010 only - May 2 0:00 1:00 S Rule Morocco 2010 only - Aug 8 0:00 0 - +Rule Morocco 2011 only - Apr 3 0:00 1:00 S +Rule Morocco 2011 only - Jul 31 0 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 0:00 Morocco WE%sT 1984 Mar 16 diff --git a/src/timezone/data/asia b/src/timezone/data/asia index 78ff2ffedc..d415ba801c 100644 --- a/src/timezone/data/asia +++ b/src/timezone/data/asia @@ -1,4 +1,4 @@ -# @(#)asia 8.60 +# @(#)asia 8.64 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -547,8 +547,8 @@ Rule HK 1953 only - Nov 1 3:30 0 - Rule HK 1954 1964 - Mar Sun>=18 3:30 1:00 S Rule HK 1954 only - Oct 31 3:30 0 - Rule HK 1955 1964 - Nov Sun>=1 3:30 0 - -Rule HK 1965 1977 - Apr Sun>=16 3:30 1:00 S -Rule HK 1965 1977 - Oct Sun>=16 3:30 0 - +Rule HK 1965 1976 - Apr Sun>=16 3:30 1:00 S +Rule HK 1965 1976 - Oct Sun>=16 3:30 0 - Rule HK 1973 only - Dec 30 3:30 1:00 S Rule HK 1979 only - May Sun>=8 3:30 1:00 S Rule HK 1979 only - Oct Sun>=16 3:30 0 - @@ -2178,6 +2178,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # "At 12:01am Friday, clocks in Israel and the West Bank will change to # 1:01am, while Gaza clocks will change at 12:01am Saturday morning." +# From Steffen Thorsen (2010-08-11): +# According to several sources, including +# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=306795"> +# http://www.maannews.net/eng/ViewDetails.aspx?ID=306795 +# </a> +# the clocks were set back one hour at 2010-08-11 00:00:00 local time in +# Gaza and the West Bank. +# Some more background info: +# <a href="http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html"> +# http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html +# </a> + # The rules for Egypt are stolen from the `africa' file. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S @@ -2198,6 +2210,7 @@ Rule Palestine 2008 only - Aug lastFri 2:00 0 - Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S Rule Palestine 2010 max - Mar lastSat 0:01 1:00 S Rule Palestine 2009 max - Sep Fri>=1 2:00 0 - +Rule Palestine 2010 only - Aug 11 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct diff --git a/src/timezone/data/australasia b/src/timezone/data/australasia index 9884b6750a..6949172dc3 100644 --- a/src/timezone/data/australasia +++ b/src/timezone/data/australasia @@ -1,5 +1,5 @@ # <pre> -# @(#)australasia 8.17 +# @(#)australasia 8.23 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -84,14 +84,13 @@ Rule AS 1986 only - Oct 19 2:00s 1:00 - Rule AS 1987 2007 - 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 only - Mar Sun>=18 2:00s 0 - -Rule AS 1991 only - Mar Sun>=1 2:00s 0 - -Rule AS 1992 only - Mar Sun>=18 2:00s 0 - -Rule AS 1993 only - Mar Sun>=1 2:00s 0 - -Rule AS 1994 only - Mar Sun>=18 2:00s 0 - +Rule AS 1986 1990 - Mar Sun>=15 2:00s 0 - +Rule AS 1991 only - Mar 3 2:00s 0 - +Rule AS 1992 only - Mar 22 2:00s 0 - +Rule AS 1993 only - Mar 7 2:00s 0 - +Rule AS 1994 only - Mar 20 2:00s 0 - Rule AS 1995 2005 - Mar lastSun 2:00s 0 - -Rule AS 2006 only - Apr Sun>=1 2:00s 0 - +Rule AS 2006 only - Apr 2 2:00s 0 - Rule AS 2007 only - Mar lastSun 2:00s 0 - Rule AS 2008 max - Apr Sun>=1 2:00s 0 - Rule AS 2008 max - Oct Sun>=1 2:00s 1:00 - @@ -284,13 +283,26 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # http://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html # </a> +# From Alexander Krivenyshev (2010-10-24): +# According to Radio Fiji and Fiji Times online, Fiji will end DST 3 +# weeks earlier than expected - on March 6, 2011, not March 27, 2011... +# Here is confirmation from Government of the Republic of the Fiji Islands, +# Ministry of Information (fiji.gov.fj) web site: +# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=2608:daylight-savings&catid=71:press-releases&Itemid=155"> +# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=2608:daylight-savings&catid=71:press-releases&Itemid=155 +# </a> +# or +# <a href="http://www.worldtimezone.com/dst_news/dst_news_fiji04.html"> +# http://www.worldtimezone.com/dst_news/dst_news_fiji04.html +# </a> + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - Rule Fiji 2009 only - Nov 29 2:00 1:00 S Rule Fiji 2010 only - Mar lastSun 3:00 0 - Rule Fiji 2010 only - Oct 24 2:00 1:00 S -Rule Fiji 2011 only - Mar lastSun 3:00 0 - +Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva 12:00 Fiji FJ%sT # Fiji Time @@ -346,10 +358,10 @@ Zone Pacific/Kwajalein 11:09:20 - LMT 1901 # Micronesia # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Pacific/Truk 10:07:08 - LMT 1901 - 10:00 - TRUT # Truk Time -Zone Pacific/Ponape 10:32:52 - LMT 1901 # Kolonia - 11:00 - PONT # Ponape Time +Zone Pacific/Chuuk 10:07:08 - LMT 1901 + 10:00 - CHUT # Chuuk Time +Zone Pacific/Pohnpei 10:32:52 - LMT 1901 # Kolonia + 11:00 - PONT # Pohnpei Time Zone Pacific/Kosrae 10:51:56 - LMT 1901 11:00 - KOST 1969 Oct # Kosrae Time 12:00 - KOST 1999 @@ -487,11 +499,41 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5 # http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf # </a> +# From Raymond Hughes (2010-10-07): +# Please see +# <a href="http://www.mcil.gov.ws"> +# http://www.mcil.gov.ws +# </a>, +# the Ministry of Commerce, Industry and Labour (sideframe) "Last Sunday +# September 2010 (26/09/10) - adjust clocks forward from 12:00 midnight +# to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks +# backwards from 1:00am to 12:00am" + +# From Raymond Hughes (2011-03-07) +# I believe this will be posted shortly on the website +# <a href="http://www.mcil.gov.ws"> +# www.mcil.gov.ws +# </a> +# +# PUBLIC NOTICE ON DAYLIGHT SAVING TIME +# +# Pursuant to the Daylight Saving Act 2009 and Cabinets decision, +# businesses and the general public are hereby advised that daylight +# saving time is on the first Saturday of April 2011 (02/04/11). +# +# The public is therefore advised that when the standard time strikes +# the hour of four oclock (4.00am or 0400 Hours) on the 2nd April 2011, +# then all instruments used to measure standard time are to be +# adjusted/changed to three oclock (3:00am or 0300Hrs). +# +# Margaret Fruean ACTING CHIEF EXECUTIVE OFFICER MINISTRY OF COMMERCE, +# INDUSTRY AND LABOUR 28th February 2011 + Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time -11:00 - WST 2010 Sep 26 - -11:00 1:00 WSDT 2011 Apr 3 + -11:00 1:00 WSDT 2011 Apr 2 4:00 -11:00 - WST # Solomon Is diff --git a/src/timezone/data/backward b/src/timezone/data/backward index c896968c9a..f1f95a8941 100644 --- a/src/timezone/data/backward +++ b/src/timezone/data/backward @@ -1,5 +1,5 @@ # <pre> -# @(#)backward 8.8 +# @(#)backward 8.9 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -90,7 +90,9 @@ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo Link Asia/Shanghai PRC Link Pacific/Pago_Pago Pacific/Samoa -Link Pacific/Truk Pacific/Yap +Link Pacific/Chuuk Pacific/Yap +Link Pacific/Chuuk Pacific/Truk +Link Pacific/Pohnpei Pacific/Ponape Link Europe/Warsaw Poland Link Europe/Lisbon Portugal Link Asia/Taipei ROC diff --git a/src/timezone/data/etcetera b/src/timezone/data/etcetera index 5c93682985..f8eb4b58e6 100644 --- a/src/timezone/data/etcetera +++ b/src/timezone/data/etcetera @@ -1,5 +1,5 @@ # <pre> -# @(#)etcetera 8.2 +# @(#)etcetera 8.3 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -36,8 +36,7 @@ Link Etc/GMT Etc/GMT0 # (i.e. west of Greenwich) even though many people would expect it to # mean 4 hours ahead of UTC (i.e. east of Greenwich). # -# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation -# (which is not yet supported by the tz code) allows for +# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for # TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to # ISO 8601 you can use TZ='<-0400>+4'. Thus the commonly-expected # offset is kept within the angle bracket (and is used for display) diff --git a/src/timezone/data/europe b/src/timezone/data/europe index aca3a0bd3a..221b8504ad 100644 --- a/src/timezone/data/europe +++ b/src/timezone/data/europe @@ -1,5 +1,5 @@ # <pre> -# @(#)europe 8.26 +# @(#)europe 8.31 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1013,22 +1013,47 @@ Zone Europe/Tallinn 1:39:00 - LMT 1880 2:00 EU EE%sT # Finland -# + # From Hannu Strang (1994-09-25 06:03:37 UTC): # Well, here in Helsinki we're just changing from summer time to regular one, # and it's supposed to change at 4am... + +# From Janne Snabb (2010-0715): # -# From Paul Eggert (2006-03-22): -# Shanks & Pottenger say Finland has switched at 02:00 standard time -# since 1981. Go with Strang instead. +# I noticed that the Finland data is not accurate for years 1981 and 1982. +# During these two first trial years the DST adjustment was made one hour +# earlier than in forthcoming years. Starting 1983 the adjustment was made +# according to the central European standards. +# +# This is documented in Heikki Oja: Aikakirja 2007, published by The Almanac +# Office of University of Helsinki, ISBN 952-10-3221-9, available online (in +# Finnish) at +# +# <a href="http://almanakka.helsinki.fi/aikakirja/Aikakirja2007kokonaan.pdf"> +# http://almanakka.helsinki.fi/aikakirja/Aikakirja2007kokonaan.pdf +# </a> +# +# Page 105 (56 in PDF version) has a handy table of all past daylight savings +# transitions. It is easy enough to interpret without Finnish skills. # +# This is also confirmed by Finnish Broadcasting Company's archive at: +# +# <a href="http://www.yle.fi/elavaarkisto/?s=s&g=1&ag=5&t=&a=3401"> +# http://www.yle.fi/elavaarkisto/?s=s&g=1&ag=5&t=&a=3401 +# </a> +# +# The news clip from 1981 says that "the time between 2 and 3 o'clock does not +# exist tonight." + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Finland 1942 only - Apr 3 0:00 1:00 S Rule Finland 1942 only - Oct 3 0:00 0 - +Rule Finland 1981 1982 - Mar lastSun 2:00 1:00 S +Rule Finland 1981 1982 - Sep lastSun 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Helsinki 1:39:52 - LMT 1878 May 31 1:39:52 - HMT 1921 May # Helsinki Mean Time - 2:00 Finland EE%sT 1981 Mar 29 2:00 + 2:00 Finland EE%sT 1983 2:00 EU EE%sT # Aaland Is @@ -2458,25 +2483,18 @@ Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12 # (on a non-government server though) describing dates between 2002 and 2006: # http://www.alomaliye.com/bkk_2002_3769.htm -# From Sue Williams (2008-08-11): -# I spotted this news article about a potential change in Turkey. -# -# <a href="http://www.hurriyet.com.tr/english/domestic/9626174.asp?scr=1"> -# http://www.hurriyet.com.tr/english/domestic/9626174.asp?scr=1 +# From Gökdeniz Karadağ (2011-03-10): +# +# According to the articles linked below, Turkey will change into summer +# time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27. +# This change is due to a nationwide exam on 27th. +# +# <a href="http://www.worldbulletin.net/?aType=haber&ArticleID=70872"> +# http://www.worldbulletin.net/?aType=haber&ArticleID=70872 # </a> - -# From Sue Williams (2008-08-20): -# This article says that around the end of March 2011, Turkey wants to -# adjust the clocks forward by 1/2 hour and stay that way permanently. -# The article indicates that this is a change in timezone offset in addition -# to stopping observance of DST. -# This proposal has not yet been approved. -# -# Read more here... -# -# Turkey to abandon daylight saving time in 2011 -# <a href="http://www.turkishdailynews.com.tr/article.php?enewsid=112989"> -# http://www.turkishdailynews.com.tr/article.php?enewsid=112989 +# Turkish: +# <a href="http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373"> +# http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373 # </a> # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -2544,6 +2562,8 @@ Zone Europe/Istanbul 1:55:52 - LMT 1880 2:00 Turkey EE%sT 1978 Oct 15 3:00 Turkey TR%sT 1985 Apr 20 # Turkey Time 2:00 Turkey EE%sT 2007 + 2:00 EU EE%sT 2011 Mar 27 1:00u + 2:00 - EET 2011 Mar 28 1:00u 2:00 EU EE%sT Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. diff --git a/src/timezone/data/leapseconds b/src/timezone/data/leapseconds index a3c95efb1c..dd08290196 100644 --- a/src/timezone/data/leapseconds +++ b/src/timezone/data/leapseconds @@ -1,5 +1,5 @@ # <pre> -# @(#)leapseconds 8.9 +# @(#)leapseconds 8.11 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -56,13 +56,13 @@ Leap 2008 Dec 31 23:59:60 + S # SERVICE DE LA ROTATION TERRESTRE # OBSERVATOIRE DE PARIS # 61, Av. de l'Observatoire 75014 PARIS (France) -# Tel. : 33 (0) 1 40 51 22 26 +# Tel. : 33 (0) 1 40 51 22 29 # FAX : 33 (0) 1 40 51 22 91 # Internet : services.iers@obspm.fr # -# Paris, 4 July 2009 +# Paris, 2 February 2011 # -# Bulletin C 38 +# Bulletin C 41 # # To authorities responsible # for the measurement and @@ -70,7 +70,7 @@ Leap 2008 Dec 31 23:59:60 + S # # INFORMATION ON UTC - TAI # -# NO positive leap second will be introduced at the end of December 2009. +# NO positive leap second will be introduced at the end of June 2011. # The difference between Coordinated Universal Time UTC and the # International Atomic Time TAI is : # @@ -82,6 +82,6 @@ Leap 2008 Dec 31 23:59:60 + S # will be no time step at the next possible date. # # Daniel GAMBIS -# Director -# Earth Orientation Center of IERS +# Head +# Earth Orientation Center of the IERS # Observatoire de Paris, France diff --git a/src/timezone/data/northamerica b/src/timezone/data/northamerica index ae9ca5746f..0dcdafb9d8 100644 --- a/src/timezone/data/northamerica +++ b/src/timezone/data/northamerica @@ -1,5 +1,5 @@ # <pre> -# @(#)northamerica 8.31 +# @(#)northamerica 8.42 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -346,6 +346,27 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21 -7:00 US M%sT 2003 Oct 26 02:00 -6:00 US C%sT +# From Josh Findley (2011-01-21): +# ...it appears that Mercer County, North Dakota, changed from the +# mountain time zone to the central time zone at the last transition from +# daylight-saving to standard time (on Nov. 7, 2010): +# <a href="http://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm"> +# http://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm +# </a> +# <a href="http://www.bismarcktribune.com/news/local/article_1eb1b588-c758-11df-b472-001cc4c03286.html"> +# http://www.bismarcktribune.com/news/local/article_1eb1b588-c758-11df-b472-001cc4c03286.html +# </a> + +# From Andy Lipscomb (2011-01-24): +# ...according to the Census Bureau, the largest city is Beulah (although +# it's commonly referred to as Beulah-Hazen, with Hazen being the next +# largest city in Mercer County). Google Maps places Beulah's city hall +# at 4715'51" north, 10146'40" west, which yields an offset of 6h47'07". + +Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53 + -7:00 US M%sT 2010 Nov 7 2:00 + -6:00 US C%sT + # US mountain time, represented by Denver # # Colorado, far western Kansas, Montana, western @@ -405,15 +426,74 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02 # were nearby inhabitants in some cases and for our purposes perhaps # it's best to simply use the official transition. # + +# From Steve Ferguson (2011-01-31): +# The author lives in Alaska and many of the references listed are only +# available to Alaskan residents. +# +# <a href="http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98"> +# http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98 +# </a> + +# From Arthur David Olson (2011-02-01): +# Here's database-relevant material from the 2001 "Alaska History" article: +# +# On September 20 [1979]...DOT...officials decreed that on April 27, +# 1980, Juneau and other nearby communities would move to Yukon Time. +# Sitka, Petersburg, Wrangell, and Ketchikan, however, would remain on +# Pacific Time. +# +# ...on September 22, 1980, DOT Secretary Neil E. Goldschmidt rescinded the +# Department's September 1979 decision. Juneau and other communities in +# northern Southeast reverted to Pacific Time on October 26. +# +# On October 28 [1983]...the Metlakatla Indian Community Council voted +# unanimously to keep the reservation on Pacific Time. +# +# According to DOT official Joanne Petrie, Indian reservations are not +# bound to follow time zones imposed by neighboring jurisdictions. +# +# (The last is consistent with how the database now handles the Navajo +# Nation.) + +# From Arthur David Olson (2011-02-09): +# I just spoke by phone with a staff member at the Metlakatla Indian +# Community office (using contact information available at +# <a href="http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla"> +# http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla +# </a>). +# It's shortly after 1:00 here on the east coast of the United States; +# the staffer said it was shortly after 10:00 there. When I asked whether +# that meant they were on Pacific time, they said no--they were on their +# own time. I asked about daylight saving; they said it wasn't used. I +# did not inquire about practices in the past. + # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Juneau 15:02:19 - LMT 1867 Oct 18 -8:57:41 - LMT 1900 Aug 20 12:00 -8:00 - PST 1942 -8:00 US P%sT 1946 -8:00 - PST 1969 + -8:00 US P%sT 1980 Apr 27 2:00 + -9:00 US Y%sT 1980 Oct 26 2:00 + -8:00 US P%sT 1983 Oct 30 2:00 + -9:00 US Y%sT 1983 Nov 30 + -9:00 US AK%sT +Zone America/Sitka -14:58:47 - LMT 1867 Oct 18 + -9:01:13 - LMT 1900 Aug 20 12:00 + -8:00 - PST 1942 + -8:00 US P%sT 1946 + -8:00 - PST 1969 -8:00 US P%sT 1983 Oct 30 2:00 -9:00 US Y%sT 1983 Nov 30 -9:00 US AK%sT +Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 18 + -8:46:18 - LMT 1900 Aug 20 12:00 + -8:00 - PST 1942 + -8:00 US P%sT 1946 + -8:00 - PST 1969 + -8:00 US P%sT 1983 Oct 30 2:00 + -8:00 US MeST Zone America/Yakutat 14:41:05 - LMT 1867 Oct 18 -9:18:55 - LMT 1900 Aug 20 12:00 -9:00 - YST 1942 @@ -471,20 +551,50 @@ Zone America/Adak 12:13:21 - LMT 1867 Oct 18 # three votes for and one against." # Hawaii -# -# From Arthur David Olson: -# And then there's Hawaii. -# DST was observed for one day in 1933; -# standard time was changed by half an hour in 1947; -# it's always standard as of 1986. -# -# From Paul Eggert: -# Shanks says the 1933 experiment lasted for three weeks. Go with Shanks. -# -Zone Pacific/Honolulu -10:31:26 - LMT 1900 Jan 1 12:00 - -10:30 - HST 1933 Apr 30 2:00 - -10:30 1:00 HDT 1933 May 21 2:00 - -10:30 US H%sT 1947 Jun 8 2:00 + +# From Arthur David Olson (2010-12-09): +# "Hawaiian Time" by Robert C. Schmitt and Doak C. Cox appears on pages 207-225 +# of volume 26 of The Hawaiian Journal of History (1992). As of 2010-12-09, +# the article is available at +# <a href="http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf"> +# http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf +# </a> +# and indicates that standard time was adopted effective noon, January +# 13, 1896 (page 218), that in "1933, the Legislature decreed daylight +# saving for the period between the last Sunday of each April and the +# last Sunday of each September, but less than a month later repealed the +# act," (page 220), that year-round daylight saving time was in effect +# from 1942-02-09 to 1945-09-30 (page 221, with no time of day given for +# when clocks changed) and that clocks were changed by 30 minutes +# effective the second Sunday of June, 1947 (page 219, with no time of +# day given for when clocks changed). A footnote for the 1933 changes +# cites Session Laws of Hawaii 1933, "Act. 90 (approved 26 Apr. 1933) +# and Act 163 (approved 21 May 1933)." + +# From Arthur David Olson (2011-01-19): +# The following is from "Laws of the Territory of Hawaii Passed by the +# Seventeenth Legislature: Regular Session 1933," available (as of +# 2011-01-19) at American University's Pence Law Library. Page 85: "Act +# 90...At 2 o'clock ante meridian of the last Sunday in April of each +# year, the standard time of this Territory shall be advanced one +# hour...This Act shall take effect upon its approval. Approved this 26th +# day of April, A. D. 1933. LAWRENCE M JUDD, Governor of the Territory of +# Hawaii." Page 172: "Act 163...Act 90 of the Session Laws of 1933 is +# hereby repealed...This Act shall take effect upon its approval, upon +# which date the standard time of this Territory shall be restored to +# that existing immediately prior to the taking effect of said Act 90. +# Approved this 21st day of May, A. D. 1933. LAWRENCE M. JUDD, Governor +# of the Territory of Hawaii." +# +# Note that 1933-05-21 was a Sunday. +# We're left to guess the time of day when Act 163 was approved; guess noon. + +Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00 #Schmitt&Cox + -10:30 - HST 1933 Apr 30 2:00 #Laws 1933 + -10:30 1:00 HDT 1933 May 21 12:00 #Laws 1933+12 + -10:30 - HST 1942 Feb 09 2:00 #Schmitt&Cox+2 + -10:30 1:00 HDT 1945 Sep 30 2:00 #Schmitt&Fox+2 + -10:30 US H%sT 1947 Jun 8 2:00 #Schmitt&Fox+2 -10:00 - HST # Now we turn to US areas that have diverged from the consensus since 1970. @@ -1324,6 +1434,83 @@ Zone America/Montreal -4:54:16 - LMT 1884 # entry since our cutoff date of 1970, so we can move # America/Coral_Harbour to the 'backward' file. +# From Mark Brader (2010-03-06): +# +# Currently the database has: +# +# # Ontario +# +# # From Paul Eggert (2006-07-09): +# # Shanks & Pottenger write that since 1970 most of Ontario has been like +# # Toronto. +# # Thunder Bay skipped DST in 1973. +# # Many smaller locales did not observe peacetime DST until 1974; +# # Nipigon (EST) and Rainy River (CST) are the largest that we know of. +# +# In the (Toronto) Globe and Mail for Saturday, 1955-09-24, in the bottom +# right corner of page 1, it says that Toronto will return to standard +# time at 2 am Sunday morning (which agrees with the database), and that: +# +# The one-hour setback will go into effect throughout most of Ontario, +# except in areas like Windsor which remains on standard time all year. +# +# Windsor is, of course, a lot larger than Nipigon. +# +# I only came across this incidentally. I don't know if Windsor began +# observing DST when Detroit did, or in 1974, or on some other date. +# +# By the way, the article continues by noting that: +# +# Some cities in the United States have pushed the deadline back +# three weeks and will change over from daylight saving in October. + +# From Arthur David Olson (2010-07-17): +# +# "Standard Time and Time Zones in Canada" appeared in +# The Journal of The Royal Astronomical Society of Canada, +# volume 26, number 2 (February 1932) and, as of 2010-07-17, +# was available at +# <a href="http://adsabs.harvard.edu/full/1932JRASC..26...49S"> +# http://adsabs.harvard.edu/full/1932JRASC..26...49S +# </a> +# +# It includes the text below (starting on page 57): +# +# A list of the places in Canada using daylight saving time would +# require yearly revision. From information kindly furnished by +# the provincial governments and by the postmasters in many cities +# and towns, it is found that the following places used daylight sav- +# ing in 1930. The information for the province of Quebec is definite, +# for the other provinces only approximate: +# +# Province Daylight saving time used +# Prince Edward Island Not used. +# Nova Scotia In Halifax only. +# New Brunswick In St. John only. +# Quebec In the following places: +# Montreal Lachine +# Quebec Mont-Royal +# Levis Iberville +# St. Lambert Cap de la Madeleine +# Verdun Loretteville +# Westmount Richmond +# Outremont St. Jerome +# Longueuil Greenfield Park +# Arvida Waterloo +# Chambly-Canton Beaulieu +# Melbourne La Tuque +# St. Theophile Buckingham +# Ontario Used generally in the cities and towns along +# the southerly part of the province. Not +# used in the northwesterlhy part. +# Manitoba Not used. +# Saskatchewan In Regina only. +# Alberta Not used. +# British Columbia Not used. +# +# With some exceptions, the use of daylight saving may be said to be limited +# to those cities and towns lying between Quebec city and Windsor, Ont. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Toronto 1919 only - Mar 30 23:30 1:00 D Rule Toronto 1919 only - Oct 26 0:00 0 S @@ -2147,7 +2334,7 @@ Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00 -6:00 - CST 1942 Apr 24 -7:00 - MST 1949 Jan 14 -8:00 - PST 1970 - -7:00 Mexico M%sT 2010 Apr 4 + -7:00 Mexico M%sT 2010 Apr 4 2:00 -6:00 Mexico C%sT # Baja California (near US border) @@ -2419,6 +2606,21 @@ Zone America/Costa_Rica -5:36:20 - LMT 1890 # San Jose # the time was announced as "diez cinco"--the same time as here, indicating # that has indeed switched to DST. Assume second Sunday from 2009 forward. +# From Steffen Thorsen (2011-03-08): +# Granma announced that Cuba is going to start DST on 2011-03-20 00:00:00 +# this year. Nothing about the end date known so far (if that has +# changed at all). +# +# Source: +# <a href="http://granma.co.cu/2011/03/08/nacional/artic01.html"> +# http://granma.co.cu/2011/03/08/nacional/artic01.html +# </a> +# +# Our info: +# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html"> +# http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html +# </a> + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D Rule Cuba 1928 only - Oct 10 0:00 0 S @@ -2452,7 +2654,9 @@ Rule Cuba 2000 2004 - Apr Sun>=1 0:00s 1:00 D Rule Cuba 2006 max - Oct lastSun 0:00s 0 S Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D -Rule Cuba 2009 max - Mar Sun>=8 0:00s 1:00 D +Rule Cuba 2009 2010 - Mar Sun>=8 0:00s 1:00 D +Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D +Rule Cuba 2012 max - Mar Sun>=8 0:00s 1:00 D # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Havana -5:29:28 - LMT 1890 diff --git a/src/timezone/data/southamerica b/src/timezone/data/southamerica index 7355022929..930381df7a 100644 --- a/src/timezone/data/southamerica +++ b/src/timezone/data/southamerica @@ -1,5 +1,5 @@ # <pre> -# @(#)southamerica 8.44 +# @(#)southamerica 8.48 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1154,6 +1154,36 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914 # From Arthur Daivd Olson (2010-03-06): # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch. +# From Glenn Eychaner (2011-03-02): [geychaner@mac.com] +# It appears that the Chilean government has decided to postpone the +# change from summer time to winter time again, by three weeks to April +# 2nd: +# <a href="http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651"> +# http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651 +# </a> +# +# This is not yet reflected in the offical "cambio de hora" site, but +# probably will be soon: +# <a href="http://www.horaoficial.cl/cambio.htm"> +# http://www.horaoficial.cl/cambio.htm +# </a> + +# From Arthur David Olson (2011-03-02): +# The emol.com article mentions a water shortage as the cause of the +# postponement, which may mean that it's not a permanent change. + +# From Glenn Eychaner (2011-03-28): +# The article: +# <a href="http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}"> +# http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E} +# </a> +# +# In English: +# Chile's clocks will go back an hour this year on the 7th of May instead +# of this Saturday. They will go forward again the 3rd Saturday in +# August, not in October as they have since 1968. This is a pilot plan +# which will be reevaluated in 2012. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Chile 1927 1932 - Sep 1 0:00 1:00 S Rule Chile 1928 1932 - Apr 1 0:00 0 - @@ -1183,14 +1213,17 @@ Rule Chile 1997 only - Mar 30 3:00u 0 - Rule Chile 1998 only - Mar Sun>=9 3:00u 0 - Rule Chile 1998 only - Sep 27 4:00u 1:00 S Rule Chile 1999 only - Apr 4 3:00u 0 - -Rule Chile 1999 max - Oct Sun>=9 4:00u 1:00 S +Rule Chile 1999 2010 - Oct Sun>=9 4:00u 1:00 S +Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S +Rule Chile 2012 max - Oct Sun>=9 4:00u 1:00 S Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - # N.B.: the end of March 29 in Chile is March 30 in Universal time, # which is used below in specifying the transition. Rule Chile 2008 only - Mar 30 3:00u 0 - Rule Chile 2009 only - Mar Sun>=9 3:00u 0 - -Rule Chile 2010 only - Apr 4 3:00u 0 - -Rule Chile 2011 max - Mar Sun>=9 3:00u 0 - +Rule Chile 2010 only - Apr Sun>=1 3:00u 0 - +Rule Chile 2011 only - May Sun>=2 3:00u 0 - +Rule Chile 2012 max - Mar Sun>=9 3:00u 0 - # IATA SSIM anomalies: (1992-02) says 1992-03-14; # (1996-09) says 1998-03-08. Ignore these. # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1310,6 +1343,24 @@ Zone Pacific/Galapagos -5:58:24 - LMT 1931 # Puerto Baquerizo Moreno # For now, we'll just record the time in Stanley, since we have no # better info. +# From Steffen Thorsen (2011-04-01): +# The Falkland Islands will not turn back clocks this winter, but stay on +# daylight saving time. +# +# One source: +# <a href="http://www.falklandnews.com/public/story.cfm?get=5914&source=3"> +# http://www.falklandnews.com/public/story.cfm?get=5914&source=3 +# </a> +# +# We have gotten this confirmed by a clerk of the legislative assembly: +# Normally the clocks revert to Local Mean Time (UTC/GMT -4 hours) on the +# third Sunday of April at 0200hrs and advance to Summer Time (UTC/GMT -3 +# hours) on the first Sunday of September at 0200hrs. +# +# IMPORTANT NOTE: During 2011, on a trial basis, the Falkland Islands +# will not revert to local mean time, but clocks will remain on Summer +# time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term +# change to local time following the trial period will be notified. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 S Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 - @@ -1321,7 +1372,8 @@ Rule Falk 1984 1985 - Apr lastSun 0:00 0 - Rule Falk 1984 only - Sep 16 0:00 1:00 S Rule Falk 1985 2000 - Sep Sun>=9 0:00 1:00 S Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 - -Rule Falk 2001 max - Apr Sun>=15 2:00 0 - +Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 - +Rule Falk 2012 max - Apr Sun>=15 2:00 0 - Rule Falk 2001 max - Sep Sun>=1 2:00 1:00 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Atlantic/Stanley -3:51:24 - LMT 1890 diff --git a/src/timezone/data/zone.tab b/src/timezone/data/zone.tab index 2e060862e7..b06ace4282 100644 --- a/src/timezone/data/zone.tab +++ b/src/timezone/data/zone.tab @@ -1,5 +1,5 @@ # <pre> -# @(#)zone.tab 8.36 +# @(#)zone.tab 8.43 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # @@ -41,7 +41,7 @@ AQ -6448-06406 Antarctica/Palmer Palmer Station, Anvers Island AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula -AQ -7824+10654 Antarctica/Vostok Vostok Station, S Magnetic Pole +AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I AQ -5430+15857 Antarctica/Macquarie Macquarie Island Station, Macquarie Island @@ -177,8 +177,8 @@ ET +0902+03842 Africa/Addis_Ababa FI +6010+02458 Europe/Helsinki FJ -1808+17825 Pacific/Fiji FK -5142-05751 Atlantic/Stanley -FM +0725+15147 Pacific/Truk Truk (Chuuk) and Yap -FM +0658+15813 Pacific/Ponape Ponape (Pohnpei) +FM +0725+15147 Pacific/Chuuk Chuuk (Truk) and Yap +FM +0658+15813 Pacific/Pohnpei Pohnpei (Ponape) FM +0519+16259 Pacific/Kosrae Kosrae FO +6201-00646 Atlantic/Faroe FR +4852+00220 Europe/Paris @@ -211,8 +211,8 @@ HT +1832-07220 America/Port-au-Prince HU +4730+01905 Europe/Budapest ID -0610+10648 Asia/Jakarta Java & Sumatra ID -0002+10920 Asia/Pontianak west & central Borneo -ID -0507+11924 Asia/Makassar east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor -ID -0232+14042 Asia/Jayapura Irian Jaya & the Moluccas +ID -0507+11924 Asia/Makassar east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor +ID -0232+14042 Asia/Jayapura west New Guinea (Irian Jaya) & Malukus (Moluccas) IE +5320-00615 Europe/Dublin IL +3146+03514 Asia/Jerusalem IM +5409-00428 Europe/Isle_of_Man @@ -404,6 +404,7 @@ US +411745-0863730 America/Indiana/Knox Central Time - Indiana - Starke County US +450628-0873651 America/Menominee Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota - Oliver County US +465042-1012439 America/North_Dakota/New_Salem Central Time - North Dakota - Morton County (except Mandan area) +US +471551-1014640 America/North_Dakota/Beulah Central Time - North Dakota - Mercer County US +394421-1045903 America/Denver Mountain Time US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon US +364708-1084111 America/Shiprock Mountain Time - Navajo @@ -411,9 +412,11 @@ US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona US +340308-1181434 America/Los_Angeles Pacific Time US +611305-1495401 America/Anchorage Alaska Time US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle +US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck US +643004-1652423 America/Nome Alaska Time - west Alaska US +515248-1763929 America/Adak Aleutian Islands +US +550737-1313435 America/Metlakatla Metlakatla Time - Annette Island US +211825-1575130 Pacific/Honolulu Hawaii UY -3453-05611 America/Montevideo UZ +3940+06648 Asia/Samarkand west Uzbekistan diff --git a/src/timezone/ialloc.c b/src/timezone/ialloc.c index 11fb1e66da..05faafe262 100644 --- a/src/timezone/ialloc.c +++ b/src/timezone/ialloc.c @@ -3,7 +3,7 @@ * 2006-07-17 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/ialloc.c,v 1.10 2008/02/16 21:16:04 tgl Exp $ + * src/timezone/ialloc.c */ #include "postgres_fe.h" diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c index da1646c25d..782b99adfb 100644 --- a/src/timezone/localtime.c +++ b/src/timezone/localtime.c @@ -3,7 +3,7 @@ * 1996-06-05 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/localtime.c,v 1.22 2010/03/11 18:43:24 tgl Exp $ + * src/timezone/localtime.c */ /* diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index b29a781cf8..ce6e7d1add 100644 --- a/src/timezone/pgtz.c +++ b/src/timezone/pgtz.c @@ -3,10 +3,10 @@ * pgtz.c * Timezone Library Integration Functions * - * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group + * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.74 2010/07/06 19:19:01 momjian Exp $ + * src/timezone/pgtz.c * *------------------------------------------------------------------------- */ @@ -1158,7 +1158,7 @@ identify_system_timezone(void) memset(zonename, 0, sizeof(zonename)); namesize = sizeof(zonename); - if ((r = RegQueryValueEx(key, "Std", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS) + if ((r = RegQueryValueEx(key, "Std", NULL, NULL, (unsigned char *) zonename, &namesize)) != ERROR_SUCCESS) { ereport(LOG, (errmsg_internal("could not query value for key \"std\" to identify system time zone \"%s\": %i", @@ -1175,7 +1175,7 @@ identify_system_timezone(void) } memset(zonename, 0, sizeof(zonename)); namesize = sizeof(zonename); - if ((r = RegQueryValueEx(key, "Dlt", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS) + if ((r = RegQueryValueEx(key, "Dlt", NULL, NULL, (unsigned char *) zonename, &namesize)) != ERROR_SUCCESS) { ereport(LOG, (errmsg_internal("could not query value for key \"dlt\" to identify system time zone \"%s\": %i", @@ -1438,34 +1438,63 @@ pg_timezone_pre_initialize(void) * This is called after initial loading of postgresql.conf. If no TimeZone * setting was found therein, we try to derive one from the environment. * Likewise for log_timezone. + * + * Note: this is also called from ProcessConfigFile, to re-establish valid + * GUC settings if the GUCs have been reset to default following their + * removal from postgresql.conf. */ void pg_timezone_initialize(void) { pg_tz *def_tz = NULL; - /* Do we need to try to figure the session timezone? */ - if (pg_strcasecmp(GetConfigOption("timezone", false), "UNKNOWN") == 0) + /* + * Make sure that session_timezone and log_timezone are set. + * (session_timezone could still be NULL even if a timezone value was set + * in postgresql.conf, if that setting was interval-based rather than + * timezone-based.) + */ + if (!session_timezone) { - /* Select setting */ def_tz = select_default_timezone(); session_timezone = def_tz; - /* Tell GUC about the value. Will redundantly call pg_tzset() */ - SetConfigOption("timezone", pg_get_timezone_name(def_tz), - PGC_POSTMASTER, PGC_S_ARGV); } - - /* What about the log timezone? */ - if (pg_strcasecmp(GetConfigOption("log_timezone", false), "UNKNOWN") == 0) + if (!log_timezone) { - /* Select setting, but don't duplicate work */ + /* Don't duplicate work */ if (!def_tz) def_tz = select_default_timezone(); log_timezone = def_tz; - /* Tell GUC about the value. Will redundantly call pg_tzset() */ - SetConfigOption("log_timezone", pg_get_timezone_name(def_tz), - PGC_POSTMASTER, PGC_S_ARGV); } + + /* + * Now, set the timezone and log_timezone GUCs if they're still default. + * (This will redundantly call pg_tzset().) + * + * We choose to label these values PGC_S_ENV_VAR, rather than + * PGC_S_DYNAMIC_DEFAULT which would be functionally equivalent, because + * they came either from getenv("TZ") or from libc behavior that's + * determined by process environment of some kind. + * + * Note: in the case where a setting has just been removed from + * postgresql.conf, this code will not do what you might expect, namely + * call select_default_timezone() and install that value as the setting. + * Rather, the previously active setting --- typically the one from + * postgresql.conf --- will be reinstalled, relabeled as PGC_S_ENV_VAR. If + * we did try to install the "correct" default value, the effect would be + * that each postmaster child would independently run an extremely + * expensive search of the timezone database, bringing the database to its + * knees for possibly multiple seconds. This is so unpleasant, and could + * so easily be triggered quite unintentionally, that it seems better to + * violate the principle of least astonishment. + */ + if (GetConfigOptionResetString("timezone") == NULL) + SetConfigOption("timezone", pg_get_timezone_name(session_timezone), + PGC_POSTMASTER, PGC_S_ENV_VAR); + + if (GetConfigOptionResetString("log_timezone") == NULL) + SetConfigOption("log_timezone", pg_get_timezone_name(log_timezone), + PGC_POSTMASTER, PGC_S_ENV_VAR); } diff --git a/src/timezone/pgtz.h b/src/timezone/pgtz.h index 863231139e..9d77492d1a 100644 --- a/src/timezone/pgtz.h +++ b/src/timezone/pgtz.h @@ -6,10 +6,10 @@ * Note: this file contains only definitions that are private to the * timezone library. Public definitions are in pgtime.h. * - * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group + * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/pgtz.h,v 1.25 2010/01/02 16:58:16 momjian Exp $ + * src/timezone/pgtz.h * *------------------------------------------------------------------------- */ diff --git a/src/timezone/private.h b/src/timezone/private.h index 8d6a411a39..b1ac9edfcf 100644 --- a/src/timezone/private.h +++ b/src/timezone/private.h @@ -6,7 +6,7 @@ * 1996-06-05 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/private.h,v 1.13 2009/06/11 14:49:15 momjian Exp $ + * src/timezone/private.h */ /* diff --git a/src/timezone/scheck.c b/src/timezone/scheck.c index acc4cb5bc8..67bf2bcd4f 100644 --- a/src/timezone/scheck.c +++ b/src/timezone/scheck.c @@ -3,7 +3,7 @@ * 2006-07-17 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/scheck.c,v 1.9 2008/02/16 21:16:04 tgl Exp $ + * src/timezone/scheck.c */ #include "postgres_fe.h" diff --git a/src/timezone/strftime.c b/src/timezone/strftime.c index 4400af53d0..bdc8dd3240 100644 --- a/src/timezone/strftime.c +++ b/src/timezone/strftime.c @@ -15,7 +15,7 @@ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/strftime.c,v 1.15 2010/03/11 18:43:24 tgl Exp $ + * src/timezone/strftime.c */ #include "postgres.h" diff --git a/src/timezone/tzfile.h b/src/timezone/tzfile.h index 46e380b608..065db9032e 100644 --- a/src/timezone/tzfile.h +++ b/src/timezone/tzfile.h @@ -6,7 +6,7 @@ * 1996-06-05 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/tzfile.h,v 1.8 2009/06/11 14:49:15 momjian Exp $ + * src/timezone/tzfile.h */ /* diff --git a/src/timezone/tznames/Africa.txt b/src/timezone/tznames/Africa.txt index b0360115ea..6b88f20fad 100644 --- a/src/timezone/tznames/Africa.txt +++ b/src/timezone/tznames/Africa.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Africa.txt,v 1.3 2009/09/06 15:25:23 tgl Exp $ +# src/timezone/tznames/Africa.txt # CAT 7200 # Central Africa Time diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt index e929c09238..b6104b85f3 100644 --- a/src/timezone/tznames/America.txt +++ b/src/timezone/tznames/America.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/America.txt,v 1.4 2008/03/02 00:10:22 tgl Exp $ +# src/timezone/tznames/America.txt # # Acre time is sometimes called Acre Standard Time (AST) which leads to a diff --git a/src/timezone/tznames/Antarctica.txt b/src/timezone/tznames/Antarctica.txt index 22b06f9098..e25b0ebf17 100644 --- a/src/timezone/tznames/Antarctica.txt +++ b/src/timezone/tznames/Antarctica.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Antarctica.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Antarctica.txt # CLST -10800 D # Chile Summer Time diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt index 1a6d9bd5d2..1c6f276d0f 100644 --- a/src/timezone/tznames/Asia.txt +++ b/src/timezone/tznames/Asia.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.5 2010/05/11 22:36:52 tgl Exp $ +# src/timezone/tznames/Asia.txt # # CONFLICT! ADT is not unique diff --git a/src/timezone/tznames/Atlantic.txt b/src/timezone/tznames/Atlantic.txt index a74c8e44de..b2085818bb 100644 --- a/src/timezone/tznames/Atlantic.txt +++ b/src/timezone/tznames/Atlantic.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Atlantic.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Atlantic.txt # # CONFLICT! ADT is not unique diff --git a/src/timezone/tznames/Australia b/src/timezone/tznames/Australia index a55f5088b4..320e94dcbc 100644 --- a/src/timezone/tznames/Australia +++ b/src/timezone/tznames/Australia @@ -4,7 +4,7 @@ # timezone_abbreviations to 'Australia'. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Australia,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Australia # include the default set diff --git a/src/timezone/tznames/Australia.txt b/src/timezone/tznames/Australia.txt index 2eb430992f..906c7fc43a 100644 --- a/src/timezone/tznames/Australia.txt +++ b/src/timezone/tznames/Australia.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Australia.txt,v 1.3 2009/09/06 15:25:23 tgl Exp $ +# src/timezone/tznames/Australia.txt # ACSST 37800 D # Central Australia (not in zic) diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default index c5df6afe7c..7a7a87e651 100644 --- a/src/timezone/tznames/Default +++ b/src/timezone/tznames/Default @@ -4,7 +4,7 @@ # timezone_abbreviations to 'Default'. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.9 2010/05/11 22:36:52 tgl Exp $ +# src/timezone/tznames/Default #################### AFRICA #################### @@ -661,6 +661,8 @@ CHADT 49500 D # Chatham Daylight Time (New Zealand) # (Pacific/Chatham) CHAST 45900 # Chatham Standard Time (New Zealand) # (Pacific/Chatham) +CHUT 36000 # Chuuk Time + # (Pacific/Chuuk) CKT 43200 # Cook Islands Time (not in zic) EASST -18000 D # Easter Island Summer Time (Chile) # (Pacific/Easter) @@ -712,7 +714,7 @@ TAHT -36000 # Tahiti Time (zic says "TAHT", other sources "THAT") TKT -36000 # Tokelau Time # (Pacific/Fakaofo) TOT 46800 # Tonga Time (not in zic) -TRUT 36000 # Truk Time (zic says "TRUT", other souces say "TRUK") +TRUT 36000 # Truk Time (zic used to say "TRUT", other sources say "TRUK") # (Pacific/Truk) TVT 43200 # Tuvalu Time # (Pacific/Funafuti) diff --git a/src/timezone/tznames/Etc.txt b/src/timezone/tznames/Etc.txt index 9d0481d49a..52bd834a4a 100644 --- a/src/timezone/tznames/Etc.txt +++ b/src/timezone/tznames/Etc.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Etc.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Etc.txt # GMT 0 # Greenwich Mean Time diff --git a/src/timezone/tznames/Europe.txt b/src/timezone/tznames/Europe.txt index 98998508a0..88abeccaab 100644 --- a/src/timezone/tznames/Europe.txt +++ b/src/timezone/tznames/Europe.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Europe.txt,v 1.3 2009/09/06 15:25:23 tgl Exp $ +# src/timezone/tznames/Europe.txt # BST 3600 D # British Summer Time diff --git a/src/timezone/tznames/India b/src/timezone/tznames/India index 05b404dae8..85830e9f89 100644 --- a/src/timezone/tznames/India +++ b/src/timezone/tznames/India @@ -4,7 +4,7 @@ # timezone_abbreviations to 'India'. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/India,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/India # include the default set diff --git a/src/timezone/tznames/Indian.txt b/src/timezone/tznames/Indian.txt index 342f897b45..c77c9919a1 100644 --- a/src/timezone/tznames/Indian.txt +++ b/src/timezone/tznames/Indian.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Indian.txt,v 1.3 2009/03/05 14:27:50 heikki Exp $ +# src/timezone/tznames/Indian.txt # CCT 23400 # Cocos Islands Time (Indian Ocean) diff --git a/src/timezone/tznames/Makefile b/src/timezone/tznames/Makefile index f52f1d8176..e80bf53964 100644 --- a/src/timezone/tznames/Makefile +++ b/src/timezone/tznames/Makefile @@ -4,7 +4,7 @@ # Makefile for the timezone names # IDENTIFICATION -# $PostgreSQL: pgsql/src/timezone/tznames/Makefile,v 1.3 2009/08/26 22:24:44 petere Exp $ +# src/timezone/tznames/Makefile # #------------------------------------------------------------------------- diff --git a/src/timezone/tznames/Pacific.txt b/src/timezone/tznames/Pacific.txt index dad2d483d1..91b9a5c089 100644 --- a/src/timezone/tznames/Pacific.txt +++ b/src/timezone/tznames/Pacific.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Pacific.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Pacific.txt # CHADT 49500 D # Chatham Daylight Time (New Zealand) @@ -14,6 +14,8 @@ CHAST 45900 # Chatham Standard Time (New Zealand) ChST 36000 # Chamorro Standard Time (lower case "h" is as in zic) # (Pacific/Guam) # (Pacific/Saipan) +CHUT 36000 # Chuuk Time + # (Pacific/Chuuk) CKT 43200 # Cook Islands Time (not in zic) EASST -18000 D # Easter Island Summer Time (Chile) # (Pacific/Easter) @@ -84,7 +86,7 @@ TAHT -36000 # Tahiti Time (zic says "TAHT", other sources "THAT") TKT -36000 # Tokelau Time # (Pacific/Fakaofo) TOT 46800 # Tonga Time (not in zic) -TRUT 36000 # Truk Time (zic says "TRUT", other souces say "TRUK") +TRUT 36000 # Truk Time (zic used to say "TRUT", other sources say "TRUK") # (Pacific/Truk) TVT 43200 # Tuvalu Time # (Pacific/Funafuti) @@ -99,4 +101,3 @@ WFT 43200 # Wallis and Futuna Time WST -39600 # West Samoa Time # (Pacific/Apia) YAPT 36000 # Yap Time (Micronesia) (not in zic) - diff --git a/src/timezone/tznames/README b/src/timezone/tznames/README index 88958c8cbf..6cb0ae88c9 100644 --- a/src/timezone/tznames/README +++ b/src/timezone/tznames/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/timezone/tznames/README,v 1.4 2009/09/06 15:25:23 tgl Exp $ +src/timezone/tznames/README tznames ======= diff --git a/src/timezone/zic.c b/src/timezone/zic.c index c401b00e65..8a95d6ac3f 100644 --- a/src/timezone/zic.c +++ b/src/timezone/zic.c @@ -3,7 +3,7 @@ * 2006-07-17 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/zic.c,v 1.26 2010/03/13 00:40:43 momjian Exp $ + * src/timezone/zic.c */ #include "postgres_fe.h" @@ -810,7 +810,7 @@ associate(void) * Note, though, that if there's no rule, a '%s' in the format is * a bad thing. */ - if (strchr(zp->z_format, '%') != 0) + if (strchr(zp->z_format, '%') != NULL) error(_("%s in ruleless zone")); } } @@ -1111,9 +1111,9 @@ inzsub(char **fields, int nfields, int iscont) z.z_filename = filename; z.z_linenum = linenum; z.z_gmtoff = gethms(fields[i_gmtoff], _("invalid UTC offset"), TRUE); - if ((cp = strchr(fields[i_format], '%')) != 0) + if ((cp = strchr(fields[i_format], '%')) != NULL) { - if (*++cp != 's' || strchr(cp, '%') != 0) + if (*++cp != 's' || strchr(cp, '%') != NULL) { error(_("invalid abbreviation format")); return FALSE; @@ -1438,9 +1438,9 @@ rulesub(struct rule * rp, const char *loyearp, const char *hiyearp, } else { - if ((ep = strchr(dp, '<')) != 0) + if ((ep = strchr(dp, '<')) != NULL) rp->r_dycode = DC_DOWLEQ; - else if ((ep = strchr(dp, '>')) != 0) + else if ((ep = strchr(dp, '>')) != NULL) rp->r_dycode = DC_DOWGEQ; else { @@ -2826,7 +2826,7 @@ mkdirs(char *argname) if (argname == NULL || *argname == '\0') return 0; cp = name = ecpyalloc(argname); - while ((cp = strchr(cp + 1, '/')) != 0) + while ((cp = strchr(cp + 1, '/')) != NULL) { *cp = '\0'; #ifdef WIN32 |