From b883dd18d13e644ee237d62e3740f79e2c1b468c Mon Sep 17 00:00:00 2001 From: kleink Date: Tue, 12 Dec 2000 15:25:41 +0000 Subject: [PATCH] Merge tzcode2000g. --- lib/libc/time/Arts.htm | 201 ---------------------------------------- lib/libc/time/Theory | 15 ++- lib/libc/time/WWW.htm | 104 --------------------- lib/libc/time/private.h | 20 +++- lib/libc/time/zic.c | 8 +- 5 files changed, 33 insertions(+), 315 deletions(-) delete mode 100644 lib/libc/time/Arts.htm delete mode 100644 lib/libc/time/WWW.htm diff --git a/lib/libc/time/Arts.htm b/lib/libc/time/Arts.htm deleted file mode 100644 index f8390296423a..000000000000 --- a/lib/libc/time/Arts.htm +++ /dev/null @@ -1,201 +0,0 @@ - - - - -Time and the Arts - - -

Time and the Arts

-

-

-@(#)Arts.htm 7.27 -
-

-
-"Is that a pertinent fact, or are you trying to dazzle me with your command
-of time zones?"
-	"Frasier Crane"
-==========================================================================
-Data on recordings of "Save That Time," Russ Long, Serrob Publishing, BMI:
---------------------------------------------------------------------------
-Artist:		Karrin Allyson
-CD:		I Didn't Know About You
-Copyright Date:	1993
-Label:		Concord Jazz, Inc.
-ID:		CCD-4543
-Track Time:	3:44
-Personnel:	Karrin Allyson, vocal
-		Russ Long, piano
-		Gerald Spaits, bass
-		Todd Strait, drums
-Notes:		CD notes "additional lyric by Karrin Allyson;
-		arranged by Russ Long and Karrin Allyson"
-ADO Rating:	1 star
-AMG Rating:	4 stars
-Penguin Rating:	3.5 stars
---------------------------------------------------------------------------
-Artist:		Kevin Mahogany
-CD:		Double Rainbow
-Copyright Date:	1993
-Label:		Enja Records
-ID:		ENJ-7097 2
-Track Time:	6:27
-Personnel:	Kevin Mahogany, vocal
-		Kenny Barron, piano
-		Ray Drummond, bss
-		Ralph Moore, tenor saxophone
-		Lewis Nash, drums
-ADO Rating:	1.5 stars
-AMG Rating:	3 stars
-Penguin Rating:	3 stars
---------------------------------------------------------------------------
-Artist:		Joe Williams
-CD:		Here's to Life
-Copyright Date:	1994
-Label:		Telarc International Corporation
-ID:		CD-83357
-Track Time:	3:58
-Personnel:	Joe Williams, vocal
-		The Robert Farnon [39 piece] Orchestra
-Notes:		This CD is also available as part of a 3-CD package from
-		Telarc, "Triple Play" (CD-83461)
-ADO Rating:	black dot
-AMG Rating:	2 stars
-Penguin Rating:	3 stars
---------------------------------------------------------------------------
-Artist:		Charles Fambrough
-CD:		Keeper of the Spirit
-Copyright Date:	1995
-Label:		AudioQuest Music
-ID:		AQ-CD1033
-Track Time:	7:07
-Personnel:	Charles Fambrough, bass
-		Joel Levine, tenor recorder
-		Edward Simon, piano
-		Lenny White, drums
-		Marion Simon, percussion
-Notes:		On-line information and samples available at
-		http://wwmusic.com/~music/audioq/rel/1033.html
-ADO Rating:	2 stars
-AMG Rating:	unrated
-Penguin Rating:	3 stars
-==========================================================================
-Also of note:
---------------------------------------------------------------------------
-Artist:		Holly Cole Trio
-CD:		Blame It On My Youth
-Copyright Date:	1992
-Label:		Manhattan
-ID:		CDP 7 97349 2
-Total Time:	37:45
-Personnel:	Holly Cole, voice
-		Aaron Davis, piano
-		David Piltch, string bass
-Notes:		Lyrical reference to "Eastern Standard Time" in
-			Tom Waits' "Purple Avenue"
-ADO Rating:	2.5 stars
-AMG Rating:	3 stars
-Penguin Rating:	unrated
---------------------------------------------------------------------------
-Artist:		Milt Hinton
-CD:		Old Man Time
-Copyright Date:	1990
-Label:		Chiaroscuro
-ID:		CR(D) 310
-Total Time:	149:38 (two CDs)
-Personnel:	Milt Hinton, bass
-		Doc Cheatham, Dizzy Gillespie, Clark Terry, trumpet
-		Al Grey, trombone
-		Eddie Barefield, Joe Camel (Flip Phillips), Buddy Tate,
-			clarinet and saxophone
-		John Bunch, Red Richards, Norman Simmons, Derek Smith,
-			Ralph Sutton, piano
-		Danny Barker, Al Casey, guitar
-		Gus Johnson, Gerryck King, Bob Rosengarden, Jackie Williams,
-			drums
-		Lionel Hampton, vibraphone
-		Cab Calloway, Joe Williams, vocal
-		Buck Clayton, arrangements
-Notes:		tunes include Old Man Time, Time After Time,
-			Sometimes I'm Happy,
-			A Hot Time in the Old Town Tonight,
-			Four or Five Times, Now's the Time,
-			Time on My Hands, This Time It's Us,
-			and Good Time Charlie
-		On-line samples available at
-		http://www.globalmusic.com/labels/chiaroscuro/chiaro_cd_gallery.html
-ADO Rating:	3 stars
-AMG Rating:	4.5 stars
-Penguin Rating:	3 stars
---------------------------------------------------------------------------
-Artist:		Paul Broadbent
-CD:		Pacific Standard Time
-Copyright Date:	1995
-Label:		Concord Jazz, Inc.
-ID:		CCD-4664
-Total Time:	62:42
-Personnel:	Paul Broadbent, piano
-		Putter Smith, Bass
-		Frank Gibson, Jr., drums
-Notes:		The CD cover features an analemma for equation-of-time fans
-ADO Rating:	1 star
-AMG Rating:	4 stars
-Penguin Rating:	3.5 stars
---------------------------------------------------------------------------
-Artist:		Anthony Braxton/Richard Teitelbaum
-CD:		Silence/Time Zones
-Copyright Date:	1996
-Label:		Black Lion
-ID:		BLCD 760221
-Total Time:	72:58
-Personnel:	Anthony Braxton, sporanino and alto saxophones,
-			contrebasse clarinet, miscellaneous instruments
-		Leo Smith, trumpet and miscellaneous instruments
-		Leroy Jenkins, violin and miscellaneous instruments
-		Richard Teitelbaum, modular moog and micromoog synthesizer
-ADO Rating:	black dot
-AMG Rating:	unrated
---------------------------------------------------------------------------
-Artist:		Jules Verne
-Book:		Le Tour du Monde en Quatre-Vingts Jours
-		(Around the World in Eighty Days)
-Notes:		Wall-clock time plays a central role in the plot.
-		European readers of the 1870s clearly held the U.S. press in
-		deep contempt; the protagonists cross the U.S. without once
-		reading a paper.
-		An on-line French-language version of the book
-		"with illustrations from the original 1873 French-language edition"
-		is available at
-		http://fourmilab.ch/etexts/www/tdm80j
-		An on-line English-language translation of the book is available at
-		http://www.literature.org/Works/Jules-Verne/eighty
---------------------------------------------------------------------------
-Film:		Bell Science - About Time
-Notes:		The Frank Baxter/Richard Deacon extravaganza
-		Information on ordering is available at
-		http://www.videoflicks.com/VF/38/038332.htm
---------------------------------------------------------------------------
-An episode of "The Adventures of Superman" entitled "The Mysterious
-Cube," first aired 1958-02-24, had Superman convincing the controllers
-of WWV to broadcast time signals five minutes ahead of actual time;
-doing so got a crook trying to beat the statute of limitations to
-emerge a bit too early from the titular enclosure.
---------------------------------------------------------------------------
-The 1960s ITC television series "The Prisoner" included an episode
-entitled "The Chimes of Big Ben" in which our protagonist tumbled to
-the fraudulent nature of a Poland-to-England escape upon hearing "Big
-Ben" chiming on Polish local time.
---------------------------------------------------------------------------
-The syndicated comic strip "Dilbert" featured an all-too-rare example of
-time zone humor on 1998-03-14.
---------------------------------------------------------------------------
-Surrealist artist Guy Billout's work "Date Line" appeared on page 103
-of the November, 1999 Atlantic Monthly.
-==========================================================================
-"Good news."
-"What did they do? Extend Daylight Saving Time year round?"
-	Professional tanner George Hamilton, in dialog from a
-	May, 1999 episode of the syndicated television series "Baywatch"
-
- - diff --git a/lib/libc/time/Theory b/lib/libc/time/Theory index 76b33824d9a3..75ef6ffcb965 100644 --- a/lib/libc/time/Theory +++ b/lib/libc/time/Theory @@ -1,5 +1,5 @@ -# $NetBSD: Theory,v 1.4 1999/11/10 20:32:31 kleink Exp $ -@(#)Theory 7.9 +# $NetBSD: Theory,v 1.5 2000/12/12 15:25:41 kleink Exp $ +@(#)Theory 7.11 ----- Outline ----- @@ -199,7 +199,8 @@ in decreasing order of importance: `-' and `_'. Do not exceed 14 characters or start with `-'. E.g. prefer `Brunei' to `Bandar_Seri_Begawan'. Include at least one location per time zone rule set per country. - One such location is enough. + One such location is enough. Use ISO 3166 (see the file + iso3166.tab) to help decide whether something is a country. If all the clocks in a country's region have agreed since 1970, don't bother to include more than one location even if subregions' clocks disagreed before 1970. @@ -227,13 +228,19 @@ in decreasing order of importance: Use `_' to represent a space. Omit `.' from abbreviations in names, e.g. prefer `St_Helena' to `St._Helena'. + Do not change established names if they only marginally + violate the above rules. For example, don't change + the existing name `Rome' to `Milan' merely because + Milan's population has grown to be somewhat greater + than Rome's. + If a name is changed, put its old spelling in the `backward' file. The file `zone.tab' lists the geographical locations used to name time zone rule files. Older versions of this package used a different naming scheme, and these older names are still supported. -See the file `backwards' for most of these older names +See the file `backward' for most of these older names (e.g. `US/Eastern' instead of `America/New_York'). The other old-fashioned names still supported are `WET', `CET', `MET', `EET' (see the file `europe'), diff --git a/lib/libc/time/WWW.htm b/lib/libc/time/WWW.htm deleted file mode 100644 index 83a67bb5ca4b..000000000000 --- a/lib/libc/time/WWW.htm +++ /dev/null @@ -1,104 +0,0 @@ - - - - -Sources for Time Zone and Daylight Saving Time Data - - -

Sources for Time Zone and Daylight Saving Time Data

-

-

-@(#)WWW.htm 7.19 -
-

Paul Eggert writes:

-The public-domain tz database contains code and data -that represent the history of local time -for many representative locations around the globe. -It is updated periodically to reflect changes made by political bodies -to UTC offsets and daylight-saving rules. -This database (often called zoneinfo) -is used by several implementations, -including BSD, DJGPP, GNU/Linux, HP-UX, IRIX, Solaris, and UnixWare. -In the tz database's -FTP distribution, -the code is in the file tzcodeC.tar.gz, -where C is the code's version; -similarly, the data are in tzdataD.tar.gz, -where D is the data's version. -

-The GNU C Library -has an independent, thread-safe implementation of -a time zone file reader that is compatible with zoneinfo. -This library is freely available under the GNU Library General Public License, -and is widely used in GNU/Linux systems. -

-The Web has several other sources for time zone and daylight saving time data. -Here are some recent links that may be of interest. -

-

--- eggert@twinsun.com -(1999-03-22) -

-

Arthur David Olson writes:

-A good source of information about -ISO 8601 seems to be -International -Standard Date and Time Notation -maintained by Markus Kuhn. -

--- arthur_david_olson@nih.gov -(1996-01-04) -

- - diff --git a/lib/libc/time/private.h b/lib/libc/time/private.h index d0e17abf78ae..8218c14a4f25 100644 --- a/lib/libc/time/private.h +++ b/lib/libc/time/private.h @@ -1,4 +1,4 @@ -/* $NetBSD: private.h,v 1.16 2000/12/10 03:56:31 christos Exp $ */ +/* $NetBSD: private.h,v 1.17 2000/12/12 15:25:41 kleink Exp $ */ #ifndef PRIVATE_H #define PRIVATE_H @@ -29,7 +29,7 @@ #ifndef lint #ifndef NOID #if 0 -static char privatehid[] = "@(#)private.h 7.49"; +static char privatehid[] = "@(#)private.h 7.51"; #endif #endif /* !defined NOID */ #endif /* !defined lint */ @@ -47,6 +47,10 @@ static char privatehid[] = "@(#)private.h 7.49"; #define HAVE_GETTEXT 0 #endif /* !defined HAVE_GETTEXT */ +#ifndef HAVE_INCOMPATIBLE_CTIME_R +#define HAVE_INCOMPATIBLE_CTIME_R 0 +#endif /* !defined INCOMPATIBLE_CTIME_R */ + #ifndef HAVE_SETTIMEOFDAY #define HAVE_SETTIMEOFDAY 3 #endif /* !defined HAVE_SETTIMEOFDAY */ @@ -75,6 +79,11 @@ static char privatehid[] = "@(#)private.h 7.49"; #define LOCALE_HOME "/usr/lib/locale" #endif /* !defined LOCALE_HOME */ +#if HAVE_INCOMPATIBLE_CTIME_R +#define asctime_r _incompatible_asctime_r +#define ctime_r _incompatible_ctime_r +#endif /* HAVE_INCOMPATIBLE_CTIME_R */ + /* ** Nested includes */ @@ -289,6 +298,13 @@ char * scheck P((const char *string, const char *format)) #define TZ_DOMAIN "tz" #endif /* !defined TZ_DOMAIN */ +#if HAVE_INCOMPATIBLE_CTIME_R +#undef asctime_r +#undef ctime_r +char *asctime_r P((struct tm const *, char *)); +char *ctime_r P((time_t const *, char *)); +#endif /* HAVE_INCOMPATIBLE_CTIME_R */ + /* ** UNIX was a registered trademark of UNIX System Laboratories in 1993. */ diff --git a/lib/libc/time/zic.c b/lib/libc/time/zic.c index 51f031310ddd..3b72689d17ea 100644 --- a/lib/libc/time/zic.c +++ b/lib/libc/time/zic.c @@ -1,12 +1,12 @@ -/* $NetBSD: zic.c,v 1.17 2000/08/02 15:17:20 hubertf Exp $ */ +/* $NetBSD: zic.c,v 1.18 2000/12/12 15:25:41 kleink Exp $ */ #include #ifndef lint #ifndef NOID #if 0 -static char elsieid[] = "@(#)zic.c 7.100"; +static char elsieid[] = "@(#)zic.c 7.101"; #else -__RCSID("$NetBSD: zic.c,v 1.17 2000/08/02 15:17:20 hubertf Exp $"); +__RCSID("$NetBSD: zic.c,v 1.18 2000/12/12 15:25:41 kleink Exp $"); #endif #endif /* !defined NOID */ #endif /* !defined lint */ @@ -449,7 +449,7 @@ const char * const string; static void usage P((void)) { - (void) fprintf(stderr, _("%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ]\n\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"), + (void) fprintf(stderr, _("%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"), progname, progname); (void) exit(EXIT_FAILURE); }