This commit was generated by cvs2svn to compensate for changes in r17211,

which included commits to RCS files with non-trunk default branches.

5 files changed, 173 insertions, 27 deletions

diff --git a/usr.sbin/zic/Music b/usr.sbin/zic/Music
new file mode 100644
index 0000000..9fb0cec
--- /dev/null
+++ b/usr.sbin/zic/Music
@@ -0,0 +1,81 @@
+@(#)Music	7.4
+
+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"
+Rating:		1 star
+--------------------------------------------------------------------------
+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
+Rating:		1.5 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
+Rating:		black dot
+--------------------------------------------------------------------------
+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
+Rating:		2 stars
+==========================================================================
+Also of note:
+Artist:		Milt Hinton
+CD:		Old Man Time
+Date:		1993
+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
+		Eddier 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
+Rating:		3 stars
diff --git a/usr.sbin/zic/README b/usr.sbin/zic/README
index 5eea1a2..3ca53ca 100644
--- a/usr.sbin/zic/README
+++ b/usr.sbin/zic/README
@@ -1,4 +1,4 @@
-@(#)README	7.5
+@(#)README	7.8
 
 "What time is it?" -- Richard Deacon as The King
 "Any time you want it to be." -- Frank Baxter as The Scientist
@@ -22,13 +22,6 @@ and as "part of the application" in others, there's no good way to name
 functions, such as timegm, that are not part of the proposed ANSI C standard;
 such functions have kept their old, underscore-free names in this update.)
 
-Support for the tz_abbr variable has been eliminated from this version
-(to forestall "kitchen sink" complaints from certain quarters :-).
-
-Support for Turbo C compilation has also been eliminated; it was present to
-allow checking in an ANSI-style environment, and such checking is now done with
-gcc.
-
 And the "dysize" function has disappeared; it was present to allow compilation
 of the "date" command on old BSD systems, and a version of "date" is now
 provided in the package.  The "date" command is not created when you "make all"
@@ -64,9 +57,10 @@ Thanks to these Timezone Caballeros who've made major contributions to the
 time conversion package:  Keith Bostic; Bob Devine; Paul Eggert; Robert Elz;
 Guy Harris; Mark Horton; John Mackin; and Bradley White.  Thanks also to
 Michael Bloom, Art Neilson, Stephen Prince, John Sovereign, and Frank Wales
-for testing work.  None of them are responsible for remaining errors.
+for testing work, and to Gwillim Law for checking local mean time data.
+None of them are responsible for remaining errors.
 
-Look in the ~ftp/pub directory of elsie.nci.nih.gov (128.231.16.1)
+Look in the ~ftp/pub directory of elsie.nci.nih.gov
 for updated versions of these files.
 
-Please send comments or information to ado@elsie.nci.nih.gov.
+Please send comments or information to tz@elsie.nci.nih.gov.
diff --git a/usr.sbin/zic/Theory b/usr.sbin/zic/Theory
index 93a07c0..2e34663 100644
--- a/usr.sbin/zic/Theory
+++ b/usr.sbin/zic/Theory
@@ -1,4 +1,4 @@
-@(#)Theory	7.2
+@(#)Theory	7.4
 
 These time and date functions are much like the System V Release 2.0 (SVR2)
 time and date functions; there are a few additions and changes to extend
@@ -47,7 +47,7 @@ These are the changes that have been made to the SVR2 functions:
 	abbreviations are used.
 
 	It was recognized that allowing the "TZ" environment variable to
-	take on values such as "US/Eastern" might cause "old" programs
+	take on values such as "America/New_York" might cause "old" programs
 	(that expect "TZ" to have a certain form) to operate incorrectly;
 	consideration was given to using some other environment variable
 	(for example, "TIMEZONE") to hold the string used to generate the
@@ -79,8 +79,8 @@ These are the changes that have been made to the SVR2 functions:
 	best approximation to local wall clock time to be delivered by
 	subsequent calls to "localtime."  Source code for portable
 	applications that "must" run on local wall clock time should call
-	"tzsetwall();" if such code is moved to "old" systems that don't provide
-	tzsetwall, you won't be able to generate an executable program.
+	"tzsetwall();" if such code is moved to "old" systems that don't
+	provide tzsetwall, you won't be able to generate an executable program.
 	(These time zone functions also arrange for local wall clock time to be
 	used if tzset is called--directly or indirectly--and there's no "TZ"
 	environment variable; portable applications should not, however, rely
@@ -94,8 +94,8 @@ Points of interest to folks with Version 7 or BSD systems:
 	time zone abbreviation, and we refuse to guess.
 	Programs that in the past used the timezone function may now examine
 	tzname[localtime(&clock)->tm_isdst] to learn the correct time
-	zone abbreviation to use.  Alternatively, use localtime(&clock)->tm_zone
-	if this has been enabled.
+	zone abbreviation to use.  Alternatively, use
+	localtime(&clock)->tm_zone if this has been enabled.
 
 *	The BSD gettimeofday function is not used in this package;
 	this lets users control the time zone used in doing time conversions.
@@ -104,10 +104,10 @@ Points of interest to folks with Version 7 or BSD systems:
 	file "/etc/zoneinfo/localtime"; see the time zone compiler writeup for
 	information on how to initialize this file.
 
-The functions that are conditionally compiled if STD_INSPIRED is defined should,
-at this point, be looked on primarily as food for thought.  They are not in
-any sense "standard compatible"--some are not, in fact, specified in *any*
-standard.  They do, however, represent responses of various authors to
+The functions that are conditionally compiled if STD_INSPIRED is defined
+should, at this point, be looked on primarily as food for thought.  They are
+not in any sense "standard compatible"--some are not, in fact, specified in
+*any* standard.  They do, however, represent responses of various authors to
 standardization proposals.
 
 Other time conversion proposals, in particular the one developed by folks at
diff --git a/usr.sbin/zic/WWW b/usr.sbin/zic/WWW
new file mode 100644
index 0000000..d2fd684
--- /dev/null
+++ b/usr.sbin/zic/WWW
@@ -0,0 +1,71 @@
+# '@(#)WWW	7.3'
+
+# From Paul Eggert <eggert@twinsun.com> (1995-11-03)
+#
+# The Web has several other sources for time zone and daylight savings data.
+# Here are some recent links that may be of interest.
+#
+# Date and Time Gateway
+#	http://www.bsdi.com/date
+# A text-based source for tables of current time throughout the world.
+# Its point-and-click interface accesses a recent version of the tz data.
+#
+# Local Times Around the World
+#	http://www.hilink.com.au/times/
+# This text-based system contains links to local time servers
+# throughout the world, and though the coverage is limited,
+# the live data provide a nice way to check one's tables.
+#
+# World Time Zones
+#	http://tycho.usno.navy.mil/tzones.html
+# US Naval Observatory data, used as the source for `usno1995'.
+#
+# Standard Time Zones of the World
+#	http://www.odci.gov/cia/publications/95fact/802389.gif	[54 kB]
+#	http://www.odci.gov/cia/publications/95fact/802389h.gif	[1317 kB]
+# A static time zone map, available in both low-resolution and
+# high-resolution versions. The quality is good, but the map does not
+# indicate summer time, and parts of the data are a few years out of date.
+#
+# VIBE's World Map
+#	http://pathfinder.com/vibe/vibeworld
+# An active time zone map. You can point to the map and find out what
+# time it is at that location. The map and data are not as good as
+# other sources.
+
+###############################################################################
+
+# From Manavendra Thakur <Manavendra_Thakur@NeXT.COM> (1995-11-06)
+# 
+# To Paul's list of time zone information on the web, I would add the
+# following URL:
+#	http://www.dhl.com/dhl/dhlinfo/1bb.html
+# or more simply:
+#	http://www.dhl.com/
+# 
+# This is run by DHL (the courier company), and it presents a list of the  
+# countries served by that company.  If you then click on a particular  
+# country, here's an example of what you'll see (graphics stripped out):
+# 
+# United Kingdom
+# 
+# HOLIDAYS: Jan 1, 2, Apr 14, 17, May 1, 29, Aug 28, Dec 25, 26
+# 
+# INTERNATIONAL DIALING CODE: +44
+# 
+# CURRENT LOCAL TIME: 09:41 Monday 6 November 1995
+# 
+# I find this rather handy, and given that DHL covers 217 countries and  
+# territories, it's pretty comprehensive coverage.
+# 
+# (I have no idea what system DHL is using to calculate the local time, but  
+# it's been accurate so far.)
+
+###############################################################################
+
+
+# From Arthur David Olson <arthur_david_olson@nih.gov> (1996-01-04)
+#
+# A good source of information about ISO 8601 seems to be
+#	http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html
+# maintained by Markus Kuhn.
diff --git a/usr.sbin/zic/scheck.c b/usr.sbin/zic/scheck.c
index 4d9616d..64f2507 100644
--- a/usr.sbin/zic/scheck.c
+++ b/usr.sbin/zic/scheck.c
@@ -1,6 +1,6 @@
 #ifndef lint
 #ifndef NOID
-static char	elsieid[] = "@(#)scheck.c	8.11";
+static char	elsieid[] = "@(#)scheck.c	8.13";
 #endif /* !defined lint */
 #endif /* !defined NOID */
 
@@ -14,7 +14,7 @@ extern void	ifree P((char * p));
 char *
 scheck(string, format)
 const char * const	string;
-const char * const	format;
+char * const		format;
 {
 	register char *		fbuf;
 	register const char *	fp;
@@ -22,12 +22,12 @@ const char * const	format;
 	register int		c;
 	register char *		result;
 	char			dummy;
-	static char		nada[1];
+	static char		nada;
 
-	result = nada;
+	result = &nada;
 	if (string == NULL || format == NULL)
 		return result;
-	fbuf = imalloc(2 * strlen(format) + 4);
+	fbuf = imalloc((int) (2 * strlen(format) + 4));
 	if (fbuf == NULL)
 		return result;
 	fp = format;
@@ -42,7 +42,7 @@ const char * const	format;
 		*tp++ = '*';
 		if (*fp == '*')
 			++fp;
-		while (isascii(*fp) && isdigit(*fp))
+		while (is_digit(*fp))
 			*tp++ = *fp++;
 		if (*fp == 'l' || *fp == 'h')
 			*tp++ = *fp++;