diff options
Diffstat (limited to 'time')
| -rw-r--r-- | time/README | 4 | ||||
| -rw-r--r-- | time/africa | 2 | ||||
| -rw-r--r-- | time/antarctica | 2 | ||||
| -rw-r--r-- | time/asia | 4 | ||||
| -rw-r--r-- | time/australasia | 4 | ||||
| -rw-r--r-- | time/backward | 2 | ||||
| -rw-r--r-- | time/etcetera | 2 | ||||
| -rw-r--r-- | time/europe | 4 | ||||
| -rw-r--r-- | time/factory | 2 | ||||
| -rw-r--r-- | time/northamerica | 4 | ||||
| -rw-r--r-- | time/pacificnew | 2 | ||||
| -rw-r--r-- | time/southamerica | 3 | ||||
| -rw-r--r-- | time/tzfile.h | 7 | ||||
| -rw-r--r-- | time/zic.c | 4 |
14 files changed, 21 insertions, 25 deletions
diff --git a/time/README b/time/README index 1c3160106e..7875a92922 100644 --- a/time/README +++ b/time/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 tzcode1997g package by Arthur David Olson et.al. +come from the tzcode1997h 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 tzdata1997i package by Arthur David Olson et.al. +come from the tzdata1997j 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/time/africa b/time/africa index f58719da5b..4b56816f40 100644 --- a/time/africa +++ b/time/africa @@ -1,4 +1,4 @@ -# @(#)africa 7.20 +# @(#)africa 7.22 # 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 diff --git a/time/antarctica b/time/antarctica index 83f0cfed76..75d2cf63e4 100644 --- a/time/antarctica +++ b/time/antarctica @@ -1,4 +1,4 @@ -# @(#)antarctica 7.8 +# @(#)antarctica 7.10 # From Paul Eggert (1997-03-28): # To keep things manageable, we list only locations occupied year-round; @@ -1,4 +1,4 @@ -# @(#)asia 7.30 +# @(#)asia 7.33 # 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 @@ -45,8 +45,6 @@ # 9:30 CST (Australian) Central Standard Time # # See the `europe' file for Russia and Turkey in Asia. -# -# See the `africa' file for time zone naming and abbreviation conventions. # From Guy Harris: # Incorporates data for Singapore from Robert Elz' asia 1.1, as well as diff --git a/time/australasia b/time/australasia index d981a6a916..2726a25d3d 100644 --- a/time/australasia +++ b/time/australasia @@ -1,4 +1,4 @@ -# @(#)australasia 7.34 +# @(#)australasia 7.37 # This file also includes Pacific islands. # Notes are at the end of this file @@ -472,8 +472,6 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # # See the `northamerica' file for Hawaii. # See the `southamerica' file for Easter I and the Galapagos Is. -# -# See the `africa' file for time zone naming and abbreviation conventions. ############################################################################### diff --git a/time/backward b/time/backward index 59fcffcdff..4c7a19d2cf 100644 --- a/time/backward +++ b/time/backward @@ -1,4 +1,4 @@ -# @(#)backward 7.13 +# @(#)backward 7.14 # This file provides links between current names for time zones # and their old names. Many names changed in late 1993. diff --git a/time/etcetera b/time/etcetera index c47fae7a68..a6a65db40a 100644 --- a/time/etcetera +++ b/time/etcetera @@ -1,4 +1,4 @@ -# @(#)etcetera 7.6 +# @(#)etcetera 7.8 # These entries are mostly present for historical reasons, so that # people in areas not otherwise covered by the tz files could "zic -l" diff --git a/time/europe b/time/europe index 2948ba1caf..4e30ab4934 100644 --- a/time/europe +++ b/time/europe @@ -1,4 +1,4 @@ -# @(#)europe 7.46 +# @(#)europe 7.49 # 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 @@ -37,8 +37,6 @@ # 2:00 EET EEST Eastern Europe # 3:00 MSK MSD Moscow # -# See the `africa' file for time zone naming and abbreviation conventions. -# # A reliable and entertaining source about time zones, especially in Britain, # is Derek Howse, Greenwich time and the discovery of the longitude, # Oxford University Press (1980). diff --git a/time/factory b/time/factory index d95df23c1d..ba27c63269 100644 --- a/time/factory +++ b/time/factory @@ -1,4 +1,4 @@ -# @(#)factory 7.1 +# @(#)factory 7.3 # For companies who don't want to put time zone specification in # their installation procedures. When users run date, they'll get the message. diff --git a/time/northamerica b/time/northamerica index 635c4ef180..a978333503 100644 --- a/time/northamerica +++ b/time/northamerica @@ -1,4 +1,4 @@ -# @(#)northamerica 7.32 +# @(#)northamerica 7.35 # also includes Central America and the Caribbean # This data is by no means authoritative; if you think you know better, @@ -481,8 +481,6 @@ Link Pacific/Honolulu HST # I found in the UCLA library. # # See the `europe' file for Greenland. -# -# See the `africa' file for time zone naming and abbreviation conventions. # Canada diff --git a/time/pacificnew b/time/pacificnew index 883ccdca69..86dd688341 100644 --- a/time/pacificnew +++ b/time/pacificnew @@ -1,4 +1,4 @@ -# @(#)pacificnew 7.9 +# @(#)pacificnew 7.10 # From Arthur David Olson (1989-04-05): # On 1989-04-05, the U. S. House of Representatives passed (238-154) a bill diff --git a/time/southamerica b/time/southamerica index 09e0aa6d28..4f8cb906d9 100644 --- a/time/southamerica +++ b/time/southamerica @@ -1,4 +1,4 @@ -# @(#)southamerica 7.18 +# @(#)southamerica 7.21 # 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 @@ -28,7 +28,6 @@ # -4:00 AST ADT Atlantic # -5:00 AST ADT Acre # -# See the `africa' file for time zone naming and abbreviation conventions. # 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). diff --git a/time/tzfile.h b/time/tzfile.h index a26fbbeefc..90441cbbc3 100644 --- a/time/tzfile.h +++ b/time/tzfile.h @@ -21,7 +21,7 @@ #ifndef lint #ifndef NOID -static char tzfilehid[] = "@(#)tzfile.h 7.9"; +static char tzfilehid[] = "@(#)tzfile.h 7.13"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -45,8 +45,11 @@ static char tzfilehid[] = "@(#)tzfile.h 7.9"; ** Each file begins with. . . */ +#define TZ_MAGIC "TZif" + struct tzhead { - char tzh_reserved[20]; /* reserved for future use */ + char tzh_magic[4]; /* TZ_MAGIC */ + char tzh_reserved[16]; /* reserved for future use */ char tzh_ttisgmtcnt[4]; /* coded number of trans. time flags */ char tzh_ttisstdcnt[4]; /* coded number of trans. time flags */ char tzh_leapcnt[4]; /* coded number of leap seconds */ diff --git a/time/zic.c b/time/zic.c index c95887c9b4..2780e4c996 100644 --- a/time/zic.c +++ b/time/zic.c @@ -1,6 +1,6 @@ #ifndef lint #ifndef NOID -static char elsieid[] = "@(#)zic.c 7.87"; +static char elsieid[] = "@(#)zic.c 7.91"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -1464,7 +1464,9 @@ const char * const name; convert(eitol(timecnt), tzh.tzh_timecnt); convert(eitol(typecnt), tzh.tzh_typecnt); convert(eitol(charcnt), tzh.tzh_charcnt); + (void) strncpy(tzh.tzh_magic, TZ_MAGIC, sizeof tzh.tzh_magic); #define DO(field) (void) fwrite((void *) tzh.field, (size_t) sizeof tzh.field, (size_t) 1, fp) + DO(tzh_magic); DO(tzh_reserved); DO(tzh_ttisgmtcnt); DO(tzh_ttisstdcnt); |