Merge tzcode1998f.

This commit is contained in:
kleink 1998-09-10 15:58:38 +00:00
parent b95116821c
commit 91e1adbe6e
8 changed files with 162 additions and 64 deletions

View File

@ -1,7 +1,17 @@
<!-- $NetBSD: Arts.htm,v 1.3 1998/01/22 07:17:18 jtc Exp $ -->
<pre>
@(#)Arts.htm 7.15
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<!-- $NetBSD: Arts.htm,v 1.4 1998/09/10 15:58:38 kleink Exp $ -->
<HTML>
<HEAD>
<TITLE>Time and the Arts</TITLE>
</HEAD>
<BODY>
<H1>Time and the Arts</H1>
<P>
<H6>
@(#)Arts.htm 7.18
</H6>
</P>
<PRE>
Data on recordings of "Save That Time," Russ Long, Serrob Publishing, BMI:
--------------------------------------------------------------------------
Artist: Karrin Allyson
@ -17,7 +27,7 @@ Personnel: Karrin Allyson, vocal
Notes: CD notes "additional lyric by Karrin Allyson;
arranged by Russ Long and Karrin Allyson"
ADO Rating: 1 star
<a href="http://205.186.189.2/cgi-win/amg.exe?sql=1A_IDR|||175928">AMG Rating: 3.5 stars</a>
<A HREF="http://205.186.189.2/cgi-win/amg.exe?sql=1A_IDR|||175928">AMG Rating: 3.5 stars</A>
Penguin Rating: 3.5 stars
--------------------------------------------------------------------------
Artist: Kevin Mahogany
@ -32,7 +42,7 @@ Personnel: Kevin Mahogany, vocal
Ralph Moore, tenor saxophone
Lewis Nash, drums
ADO Rating: 1.5 stars
<a href="http://205.186.189.2/cgi-win/amg.exe?sql=1A_IDR|||262654">AMG Rating: unrated</a>
<A HREF="http://205.186.189.2/cgi-win/amg.exe?sql=1A_IDR|||262654">AMG Rating: unrated</A>
Penguin Rating: 3 stars
--------------------------------------------------------------------------
Artist: Joe Williams
@ -44,9 +54,9 @@ Track Time: 3:58
Personnel: Joe Williams, vocal
The Robert Farnon [39 piece] Orchestra
Notes: On-line information and samples available at
<a href="http://telarc.dmn.com/telarc/release.req?ID=TEL-83357">http://telarc.dmn.com/telarc/release.req?ID=TEL-83357</a>
<A HREF="http://www.telarc.com/telarc/releases/release.req?ID=83357">http://telarc.dmn.com/telarc/releases/release.req?ID=83357</A>
ADO Rating: black dot
<a href="http://205.186.189.2/cgi-win/amg.exe?sql=1A_IDR|||194434">AMG Rating: 2 stars</a>
<A HREF="http://205.186.189.2/cgi-win/amg.exe?sql=1A_IDR|||194434">AMG Rating: 2 stars</A>
Penguin Rating: 3 stars
--------------------------------------------------------------------------
Artist: Charles Fambrough
@ -61,9 +71,9 @@ Personnel: Charles Fambrough, bass
Lenny White, drums
Marion Simon, percussion
Notes: On-line information and samples available at
<a href="http://wwmusic.com/~music/audioq/rel/1033.html">http://wwmusic.com/~music/audioq/rel/1033.html</a>
<A HREF="http://wwmusic.com/~music/audioq/rel/1033.html">http://wwmusic.com/~music/audioq/rel/1033.html</A>
ADO Rating: 2 stars
<a href="http://205.186.189.2/cgi-win/AMG.exe?sql=1A_IDR|||224430">AMG Rating: unrated</a>
<A HREF="http://205.186.189.2/cgi-win/AMG.exe?sql=1A_IDR|||224430">AMG Rating: unrated</A>
Penguin Rating: 3 stars
==========================================================================
Also of note:
@ -80,7 +90,7 @@ Personnel: Holly Cole, voice
Notes: Lyrical reference to "Eastern Standard Time" in
Tom Waits' "Purple Avenue"
ADO Rating: 2.5 stars
<a href="http://205.186.189.2/cgi-win/AMG.exe?sql=1A_IDR|||157959">AMG Rating: 2 stars</a>
<A HREF="http://205.186.189.2/cgi-win/AMG.exe?sql=1A_IDR|||157959">AMG Rating: 2 stars</A>
Penguin Rating: unrated
--------------------------------------------------------------------------
Artist: Milt Hinton
@ -109,9 +119,9 @@ Notes: tunes include Old Man Time, Time After Time,
Time on My Hands, This Time It's Us,
and Good Time Charlie
On-line samples available at
<a href="http://www.globalmusic.com/labels/chiaroscuro/chiaro_cd_gallery.html">http://www.globalmusic.com/labels/chiaroscuro/chiaro_cd_gallery.html</a>
<A HREF="http://www.globalmusic.com/labels/chiaroscuro/chiaro_cd_gallery.html">http://www.globalmusic.com/labels/chiaroscuro/chiaro_cd_gallery.html</A>
ADO Rating: 3 stars
<a href="http://205.186.189.2/cgi-win/AMG.exe?sql=1A_IDR|||162344">AMG Rating: 4 stars</a>
<A HREF="http://205.186.189.2/cgi-win/AMG.exe?sql=1A_IDR|||162344">AMG Rating: 4.5 stars</A>
Penguin Rating: 3 stars
--------------------------------------------------------------------------
Artist: Paul Broadbent
@ -125,9 +135,23 @@ Personnel: Paul Broadbent, piano
Frank Gibson, Jr., drums
Notes: The CD cover features an analemma for equation of time fans
ADO Rating: 1 star
<a href="http://205.186.189.2/cgi-win/AMG.exe?sql=1A_IDR|||223722">AMG Rating: unrated</a>
<A HREF="http://205.186.189.2/cgi-win/AMG.exe?sql=1A_IDR|||223722">AMG Rating: 3 stars</A>
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
<A HREF="http://205.186.189.2/cg/AMG_.exe?sql=A310757">AMG Rating: unrated</A>
--------------------------------------------------------------------------
Artist: Jules Verne
Book: Le Tour du Monde en Quatre-Vingts Jours
(Around the World in Eighty Days)
@ -138,12 +162,17 @@ Notes: Wall-clock time plays a central role in the plot.
An on-line French-language version of the book
"with illustrations from the original 1873 French-language edition"
is available at
<a href="http://fourmilab.ch/etexts/www/tdm80j">http://fourmilab.ch/etexts/www/tdm80j</a>
<A HREF="http://fourmilab.ch/etexts/www/tdm80j">http://fourmilab.ch/etexts/www/tdm80j</A>
An on-line English-language translation of the book is available at
<a href="http://www.literature.org/Works/Jules-Verne/eighty">http://www.literature.org/Works/Jules-Verne/eighty</a>
</pre>
<A HREF="http://www.literature.org/Works/Jules-Verne/eighty">http://www.literature.org/Works/Jules-Verne/eighty</A>
--------------------------------------------------------------------------
Film: Bell Science - About Time
Notes: The Frank Baxter/Richard Deacon extravaganza
Information on ordering is available at
<a href="http://www.videoflicks.com/VF/38/038332.htm">http://www.videoflicks.com/VF/38/038332.htm</a>
<A HREF="http://www.videoflicks.com/VF/38/038332.htm">http://www.videoflicks.com/VF/38/038332.htm</A>
--------------------------------------------------------------------------
The syndicated comic strip "Dilbert" featured an all-too-rare example of
time zone humor on 1998-03-14.
</PRE>
</BODY>
</HTML>

View File

@ -1,4 +1,4 @@
<!-- $NetBSD: WWW.htm,v 1.3 1998/01/22 07:06:57 jtc Exp $ -->
<!-- $NetBSD: WWW.htm,v 1.4 1998/09/10 15:58:39 kleink Exp $ -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<HTML>
<HEAD>
@ -7,9 +7,9 @@
<BODY>
<H1>Sources for Time Zone and Daylight Saving Time Data</H1>
<P>
<small>
@(#)WWW.htm 7.11
</small>
<H6>
@(#)WWW.htm 7.15
</H6>
</P>
<H2>Paul Eggert writes:</H2><P>
The public-domain tz database contains code and data
@ -50,16 +50,14 @@ the live data provide a nice way to check one's tables.
<LI><A HREF="http://tycho.usno.navy.mil/tzones.html">World Time Zones</A>
contains US Naval Observatory data, used as the source
for the <samp>usno*</samp> files.
<LI>The US Central Intelligence agency publishes a static
Standard Time Zones of the World map in multiple resolutions.
including
<A HREF="http://www.odci.gov/cia/publications/nsolo/rmap-gif/802483.gif">75
kB</A>,
<A HREF="http://www.odci.gov/cia/publications/nsolo/rmap-tif/802483.tif">1
MB</A>, and
<A HREF="http://www.odci.gov/cia/publications/nsolo/rmap-pdf/802483.pdf">3
MB</A> versions.
The pictorial quality is good, but the map does not indicate summer time,
<LI>The United States Central Intelligence agency publishes time zone maps;
the
<A HREF="http://www.lib.utexas.edu/Libs/PCL/Map_collection/world_maps.html">
Perry-Casta&ntilde;eda Library Map Collection</A>
of the University of Texas at Austin has on-line copies of
the 1995 and 1997 editions.
The pictorial quality is good,
but the maps do not indicate summer time,
and parts of the data are a few years out of date.
<LI><A HREF="http://pisolo.cstv.to.cnr.it/toi/uk/toi.html">The
Time of Internet</A>
@ -69,7 +67,7 @@ The time zone map is out of date, however.
<LI><A HREF="http://community.bellcore.com/mbr/gmt-explained.html">A Few Facts
Concerning GMT, UT, and the RGO</A>
answers questions like ``What is the difference between GMT and UTC?''
<LI><A HREF="http://www.energy.ca.gov/energy/daylightsaving.html">Daylight
<LI><A HREF="http://www.energy.ca.gov/daylightsaving.html">Daylight
Saving Time -- Saving Time, Saving Energy</A>
is a history of DST in the US.
<LI><A HREF="http://www.yahoo.com/Science/Weights_and_Measures/Measurements/Time/Daylight_Saving_Time/">Yahoo! - Science:Weights and Measures:Measurements:Time:Daylight Saving Time</A>

View File

@ -1,4 +1,4 @@
/* $NetBSD: asctime.c,v 1.6 1997/07/13 20:26:47 christos Exp $ */
/* $NetBSD: asctime.c,v 1.7 1998/09/10 15:58:39 kleink Exp $ */
/*
** This file is in the public domain, so clarified as of
@ -11,7 +11,7 @@
#if 0
static char elsieid[] = "@(#)asctime.c 7.8";
#else
__RCSID("$NetBSD: asctime.c,v 1.6 1997/07/13 20:26:47 christos Exp $");
__RCSID("$NetBSD: asctime.c,v 1.7 1998/09/10 15:58:39 kleink Exp $");
#endif
#endif /* !defined NOID */
#endif /* !defined lint */
@ -21,13 +21,27 @@ __RCSID("$NetBSD: asctime.c,v 1.6 1997/07/13 20:26:47 christos Exp $");
#include "private.h"
#include "tzfile.h"
#ifdef __weak_alias
__weak_alias(asctime_r,_asctime_r);
#endif
/*
** A la X3J11, with core dump avoidance.
** A la ISO/IEC 9945-1, ANSI/IEEE Std 1003.1, Second Edition, 1996-07-12.
*/
/*
** Big enough for something such as
** ??? ???-2147483648 -2147483648:-2147483648:-2147483648 -2147483648\n
** (two three-character abbreviations, five strings denoting integers,
** three explicit spaces, two explicit colons, a newline,
** and a trailing ASCII nul).
*/
#define ASCTIME_BUFLEN (3 * 2 + 5 * INT_STRLEN_MAXIMUM(int) + 3 + 2 + 1 + 1)
char *
asctime(timeptr)
asctime_r(timeptr, buf)
register const struct tm * timeptr;
char * buf;
{
static const char wday_name[][3] = {
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
@ -36,15 +50,6 @@ register const struct tm * timeptr;
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
};
/*
** Big enough for something such as
** ??? ???-2147483648 -2147483648:-2147483648:-2147483648 -2147483648\n
** (two three-character abbreviations, five strings denoting integers,
** three explicit spaces, two explicit colons, a newline,
** and a trailing ASCII nul).
*/
static char result[3 * 2 + 5 * INT_STRLEN_MAXIMUM(int) +
3 + 2 + 1 + 1];
register const char * wn;
register const char * mn;
@ -59,10 +64,25 @@ register const struct tm * timeptr;
** "%.3s %.3s%3d %02.2d:%02.2d:%02.2d %d\n"
** Since the .2 in 02.2d is ignored, we drop it.
*/
(void)snprintf(result, sizeof result,"%.3s %.3s%3d %02d:%02d:%02d %d\n",
(void)snprintf(buf,
sizeof (char[ASCTIME_BUFLEN]),
"%.3s %.3s%3d %02d:%02d:%02d %d\n",
wn, mn,
timeptr->tm_mday, timeptr->tm_hour,
timeptr->tm_min, timeptr->tm_sec,
TM_YEAR_BASE + timeptr->tm_year);
return result;
return buf;
}
/*
** A la X3J11, with core dump avoidance.
*/
char *
asctime(timeptr)
register const struct tm * timeptr;
{
static char result[ASCTIME_BUFLEN];
return asctime_r(timeptr, result);
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: localtime.c,v 1.17 1998/07/28 20:28:04 mycroft Exp $ */
/* $NetBSD: localtime.c,v 1.18 1998/09/10 15:58:39 kleink Exp $ */
/*
** This file is in the public domain, so clarified as of
@ -9,9 +9,9 @@
#ifndef lint
#ifndef NOID
#if 0
static char elsieid[] = "@(#)localtime.c 7.64";
static char elsieid[] = "@(#)localtime.c 7.66";
#else
__RCSID("$NetBSD: localtime.c,v 1.17 1998/07/28 20:28:04 mycroft Exp $");
__RCSID("$NetBSD: localtime.c,v 1.18 1998/09/10 15:58:39 kleink Exp $");
#endif
#endif /* !defined NOID */
#endif /* !defined lint */
@ -30,6 +30,9 @@ __RCSID("$NetBSD: localtime.c,v 1.17 1998/07/28 20:28:04 mycroft Exp $");
#include "fcntl.h"
#ifdef __weak_alias
__weak_alias(ctime_r,_ctime_r);
__weak_alias(gmtime_r,_gmtime_r);
__weak_alias(localtime_r,_localtime_r);
__weak_alias(offtime,_offtime);
__weak_alias(posix2time,_posix2time);
__weak_alias(time2posix,_time2posix);
@ -1081,6 +1084,18 @@ const time_t * const timep;
return &tm;
}
/*
* Re-entrant version of localtime
*/
struct tm *
localtime_r(timep, tm)
const time_t * const timep;
struct tm * tm;
{
localsub(timep, 0L, tm);
return tm;
}
/*
** gmtsub is to gmtime as localsub is to localtime.
*/
@ -1129,6 +1144,18 @@ const time_t * const timep;
return &tm;
}
/*
* Re-entrant version of gmtime
*/
struct tm *
gmtime_r(timep, tm)
const time_t * const timep;
struct tm * tm;
{
gmtsub(timep, 0L, tm);
return tm;
}
#ifdef STD_INSPIRED
struct tm *
@ -1249,13 +1276,23 @@ const time_t * const timep;
{
/*
** Section 4.12.3.2 of X3.159-1989 requires that
** The ctime funciton converts the calendar time pointed to by timer
** The ctime function converts the calendar time pointed to by timer
** to local time in the form of a string. It is equivalent to
** asctime(localtime(timer))
*/
return asctime(localtime(timep));
}
char *
ctime_r(timep, buf)
const time_t * const timep;
char * buf;
{
struct tm tm;
return asctime_r(localtime_r(timep, &tm), buf);
}
/*
** Adapted from code provided by Robert Elz, who writes:
** The "best" way to do mktime I think is based on an idea of Bob

View File

@ -1,4 +1,4 @@
/* $NetBSD: private.h,v 1.11 1998/09/09 11:32:13 kleink Exp $ */
/* $NetBSD: private.h,v 1.12 1998/09/10 15:58:40 kleink Exp $ */
#ifndef PRIVATE_H
#define PRIVATE_H
@ -29,7 +29,7 @@
#ifndef lint
#ifndef NOID
#if 0
static char privatehid[] = "@(#)private.h 7.46";
static char privatehid[] = "@(#)private.h 7.47";
#endif
#endif /* !defined NOID */
#endif /* !defined lint */
@ -55,6 +55,10 @@ static char privatehid[] = "@(#)private.h 7.46";
#define HAVE_STRERROR 1
#endif /* !defined HAVE_STRERROR */
#ifndef HAVE_SYMLINK
#define HAVE_SYMLINK 1
#endif /* !defined HAVE_SYMLINK */
#ifndef HAVE_UNISTD_H
#define HAVE_UNISTD_H 1
#endif /* !defined HAVE_UNISTD_H */

View File

@ -1,4 +1,4 @@
.\" $NetBSD: tzfile.5,v 1.7 1998/01/22 07:06:59 jtc Exp $
.\" $NetBSD: tzfile.5,v 1.8 1998/09/10 15:58:40 kleink Exp $
.TH TZFILE 5
.SH NAME
tzfile \- time zone information
@ -10,7 +10,7 @@ The time zone information files used by
.IR tzset (3)
begin with the magic characters "TZif" to identify then as
time zone information files,
followed by bytes reserved for future use,
followed by sixteen bytes reserved for future use,
followed by six four-byte values of type
.BR long ,
written in a ``standard'' byte order
@ -134,6 +134,6 @@ is zero or the time argument is less than the first transition time recorded
in the file.
.SH SEE ALSO
ctime(3)
.\" @(#)tzfile.5 7.10
.\" @(#)tzfile.5 7.11
.\" This file is in the public domain, so clarified as of
.\" 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).

View File

@ -1,6 +1,6 @@
#! /bin/ksh
#
# $NetBSD: tzselect.ksh,v 1.3 1998/01/22 07:07:00 jtc Exp $
# $NetBSD: tzselect.ksh,v 1.4 1998/09/10 15:58:40 kleink Exp $
#
# Ask the user about the time zone, and output the resulting TZ value to stdout.
# Interact with the user via stderr and stdin.
@ -13,7 +13,7 @@
# If your host lacks the Korn shell,
# you can use either of the following free programs instead:
#
# <a href=ftp://ftp.gnu.ai.mit.edu/pub/gnu/>
# <a href=ftp://ftp.gnu.org/pub/gnu/>
# Bourne-Again shell (bash)
# </a>
#
@ -25,7 +25,7 @@
# If your host lacks awk, or has an old awk that does not conform to Posix.2,
# you can use either of the following free programs instead:
#
# <a href=ftp://ftp.gnu.ai.mit.edu/pub/gnu/>
# <a href=ftp://ftp.gnu.org/pub/gnu/>
# GNU awk (gawk)
# </a>
#

View File

@ -1,12 +1,12 @@
/* $NetBSD: zic.c,v 1.11 1998/01/22 07:07:02 jtc Exp $ */
/* $NetBSD: zic.c,v 1.12 1998/09/10 15:58:40 kleink Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#ifndef NOID
#if 0
static char elsieid[] = "@(#)zic.c 7.93";
static char elsieid[] = "@(#)zic.c 7.94";
#else
__RCSID("$NetBSD: zic.c,v 1.11 1998/01/22 07:07:02 jtc Exp $");
__RCSID("$NetBSD: zic.c,v 1.12 1998/09/10 15:58:40 kleink Exp $");
#endif
#endif /* !defined NOID */
#endif /* !defined lint */
@ -609,9 +609,19 @@ const char * const tofile;
if (!itsdir(toname))
(void) remove(toname);
if (link(fromname, toname) != 0) {
int result;
if (mkdirs(toname) != 0)
(void) exit(EXIT_FAILURE);
if (link(fromname, toname) != 0) {
result = link(fromname, toname);
#if (HAVE_SYMLINK - 0)
if (result != 0) {
result = symlink(fromname, toname);
if (result == 0)
warning(_("hard link failed, symbolic link used"));
}
#endif
if (result != 0) {
const char *e = strerror(errno);
(void) fprintf(stderr,