diff options
Diffstat (limited to 'time')
| -rw-r--r-- | time/Banner | 1 | ||||
| -rw-r--r-- | time/Makefile | 5 | ||||
| -rw-r--r-- | time/antarctica | 44 | ||||
| -rw-r--r-- | time/australasia | 3 | ||||
| -rw-r--r-- | time/zdump.c | 4 | ||||
| -rw-r--r-- | time/zic.c | 4 | ||||
| -rw-r--r-- | time/zone.tab | 2 |
7 files changed, 47 insertions, 16 deletions
diff --git a/time/Banner b/time/Banner new file mode 100644 index 0000000000..eb972db206 --- /dev/null +++ b/time/Banner @@ -0,0 +1 @@ +tzcode1997a and tzdata1997a by Arthur David Olson et. al. diff --git a/time/Makefile b/time/Makefile index af03fa2961..21ad62e071 100644 --- a/time/Makefile +++ b/time/Makefile @@ -23,7 +23,8 @@ subdir := time headers := time.h sys/time.h sys/timeb.h timebits.h distribute := tzfile.h private.h scheck.c ialloc.c yearistype \ - iso3166.tab zone.tab tzselect.ksh checktab.awk + iso3166.tab zone.tab tzselect.ksh checktab.awk \ + Banner extra-objs = scheck.o ialloc.o $(tzfiles:%=z.%) routines := offtime asctime clock ctime ctime_r difftime \ @@ -45,7 +46,7 @@ tzfiles := africa antarctica asia australasia europe northamerica \ solar87 solar88 solar89 # pacificnew doesn't compile; if it is to be used, it should be included in # northamerica. -distribute := $(distribute) $(tzfiles) leapseconds pacificnew simplebackw +distribute += $(tzfiles) leapseconds pacificnew simplebackw install-sbin := zic zdump diff --git a/time/antarctica b/time/antarctica index b4a7d397a3..1cff7552d1 100644 --- a/time/antarctica +++ b/time/antarctica @@ -1,10 +1,11 @@ -# @(#)antarctica 7.5 +# @(#)antarctica 7.6 -# From Paul Eggert (1996-09-03): +# From Paul Eggert (1997-01-20): # To keep things manageable, we list only locations occupied year-round; # see <URL:http://earth.agu.org/amen/nations.html> (1996-05-24). # Unless otherwise specified, we have no time zone information. # +# Except for the French entries, # I made up all time zone abbreviations mentioned here; corrections welcome! # FORMAT is `___' and GMTOFF is 0 for locations while uninhabited. @@ -56,16 +57,41 @@ Zone Antarctica/Mawson 0 - ___ 1954 Feb 13 # Finland - year-round base # Aboa, Queen Maud Land, since 1988 -# France +# France - year-round bases +# +# From Antoine Leca <Antoine.Leca@Renault.FR> (1997-01-20): +# Time data are from Nicole Pailleau at the IFRTP +# (French Institute for Polar Research and Technology). +# She confirms that French Southern Territories and Terre Adelie bases +# don't observe daylight saving time, even if Terre Adelie supplies came +# from Tasmania. # # French Southern Territories with year-round inhabitants -# Amsterdam Island -# Crozet Islands -# Kerguelen Islands -# St Paul Island # -# year-round base -# Dumont d'Urville, Adelie Land, since IGY +# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950 +# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964 +# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951 +# +# St Paul Island - near Amsterdam, uninhabited since 1927 +# +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Indian/Kerguelen 0 - ___ 1950 # Port-aux-Francais + 5:00 - TFT # ISO code TF Time +# +# year-round base in the main continent +# Dumont-d'Urville, Terre Adelie (Adelie Land), -6040+14001, since 1956-11 +# +# Another base at Port-Martin, 50km east, began operation in 1947. +# It was destroyed by fire on 1952-01-14. +# +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Antarctica/DumontDUrville 0 - ___ 1947 + 10:00 - PMT 1952 Jan 14 # Port-Martin Time + 0 - ___ 1956 Nov + 10:00 - DDUT # Dumont-d'Urville Time +# Reference: +# <URL:http://www.icair.iac.org.nz/science/reports/fr/IFRTP.html> (1996-09-10) + # Germany - year-round base # Georg von Neumayer diff --git a/time/australasia b/time/australasia index 811e569127..aa6387997e 100644 --- a/time/australasia +++ b/time/australasia @@ -1,4 +1,4 @@ -# @(#)australasia 7.31 +# @(#)australasia 7.32 # This file also includes Pacific islands. # Notes are at the end of this file @@ -22,6 +22,7 @@ Rule Aus 1943 only - Oct 3 2:00 1:00 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] # Northern Territory Zone Australia/Darwin 8:43:20 - LMT 1895 Feb + 9:00 - CST 1899 May 9:30 - CST 1917 Jan 1 0:01 9:30 Aus CST # Western Australia diff --git a/time/zdump.c b/time/zdump.c index 1058a840ef..e5ed82f104 100644 --- a/time/zdump.c +++ b/time/zdump.c @@ -1,6 +1,6 @@ #ifndef lint #ifndef NOID -static char elsieid[] = "@(#)zdump.c 7.24"; +static char elsieid[] = "@(#)zdump.c 7.25"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -159,7 +159,7 @@ char * argv[]; if (c == 'v') vflag = 1; else cutoff = optarg; - if (c != EOF || + if ((c != EOF && c != -1) || (optind == argc - 1 && strcmp(argv[optind], "=") == 0)) { (void) fprintf(stderr, _("%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"), diff --git a/time/zic.c b/time/zic.c index 5a0063ab4b..9ab3967e98 100644 --- a/time/zic.c +++ b/time/zic.c @@ -1,6 +1,6 @@ #ifndef lint #ifndef NOID -static char elsieid[] = "@(#)zic.c 7.80"; +static char elsieid[] = "@(#)zic.c 7.81"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -476,7 +476,7 @@ char * argv[]; (void) textdomain(TZ_DOMAIN); #endif /* HAVE_GETTEXT - 0 */ progname = argv[0]; - while ((c = getopt(argc, argv, "d:l:p:L:vsy:")) != EOF) + while ((c = getopt(argc, argv, "d:l:p:L:vsy:")) != EOF && c != -1) switch (c) { default: usage(); diff --git a/time/zone.tab b/time/zone.tab index 9d86110ca7..6d91b4ea6c 100644 --- a/time/zone.tab +++ b/time/zone.tab @@ -34,6 +34,7 @@ AQ -9000+00000 Antarctica/South_Pole Amundsen-Scott Station, South Pole AQ -6448-06406 Antarctica/Palmer Palmer Station, Anvers Island AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula +AQ -6040+14001 Antarctica/DumontDUrville Dumont-d'Urville Base, Terre Adelie AR -3436-05827 America/Buenos_Aires E Argentina (BA, DF, SC, TF) AR -3257-06040 America/Rosario NE Argentina (SF, ER, CN, MN, CC, FM, LP, CH) AR -3124-06411 America/Cordoba W Argentina (CB, SA, TM, LR, SJ, SL, NQ, RN) @@ -310,6 +311,7 @@ SY +3330+03618 Asia/Damascus SZ -2618+03106 Africa/Mbabane TC +2128-07108 America/Grand_Turk TD +1207+01503 Africa/Ndjamena +TF -492110+0701303 Indian/Kerguelen TG +0608+00113 Africa/Lome TH +1345+10031 Asia/Bangkok TJ +3835+06848 Asia/Dushanbe |