summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libc/time/Arts.htm65
-rw-r--r--lib/libc/time/WWW.htm42
-rw-r--r--lib/libc/time/private.h11
-rw-r--r--lib/libc/time/tzfile.56
-rw-r--r--lib/libc/time/zdump.c10
-rw-r--r--lib/libc/time/zic.86
-rw-r--r--lib/libc/time/zic.c25
7 files changed, 104 insertions, 61 deletions
diff --git a/lib/libc/time/Arts.htm b/lib/libc/time/Arts.htm
index 87468b04102..9284324689b 100644
--- a/lib/libc/time/Arts.htm
+++ b/lib/libc/time/Arts.htm
@@ -1,7 +1,17 @@
-<pre>
-$OpenBSD: Arts.htm,v 1.1 1998/01/18 23:24:43 millert Exp $
-@(#)Arts.htm 7.15
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<HTML>
+<HEAD>
+<TITLE>Time and the Arts</TITLE>
+</HEAD>
+<BODY>
+<H1>Time and the Arts</H1>
+<P>
+<H6>
+$OpenBSD: Arts.htm,v 1.2 1999/01/29 07:04:05 d Exp $
+@(#)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>
diff --git a/lib/libc/time/WWW.htm b/lib/libc/time/WWW.htm
index a17f03ffa45..eadcce6567e 100644
--- a/lib/libc/time/WWW.htm
+++ b/lib/libc/time/WWW.htm
@@ -6,11 +6,10 @@
<BODY>
<H1>Sources for Time Zone and Daylight Saving Time Data</H1>
<P>
-<small>
-@(#)WWW.htm 7.11
-$OpenBSD: WWW.htm,v 1.1 1998/01/18 23:24:49 millert Exp $
-</small>
-</P>
+<H6>
+@(#)WWW.htm 7.16
+$OpenBSD: WWW.htm,v 1.2 1999/01/29 07:04:05 d Exp $
+</H6>
<H2>Paul Eggert writes:</H2><P>
The public-domain tz database contains code and data
that represent the history of local time
@@ -50,33 +49,32 @@ 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>
contains good descriptions of Time Zones and daylight saving time,
with diagrams.
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>
+<LI><A HREF="http://ecco.bsee.swin.edu.au/chronos/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>
+<LI><A HREF="http://dir.yahoo.com/Science/Measurements_and_Units/Time/Time_Zones/">Yahoo! - Science:Measurements and Units:Time:Time Zones</A>
is where the famous Internet indexing service Yahoo! collects its time zone
info.
<LI>The <A HREF="http://www.iata.org/">International Air Transport Association</A>
-publishes the IATA SSIM, which gives current time zone rules for
+publishes the IATA Standard Schedules Information Manual (SSIM),
+which gives current time zone rules for
all the airports served by commercial aviation.
<LI><A HREF="http://hpiers.obspm.fr/webiers/results/bul/README.html">Bulletins
of IERS</A> contains official publications of the
@@ -85,11 +83,11 @@ when leap seconds occur.
</UL>
<P>
-- <A HREF="mailto:eggert@twinsun.com">eggert@twinsun.com</A>
-(1997-12-26)
+(1998-09-22)
</P>
<H2>Arthur David Olson writes:</H2><P>
A good source of information about ISO 8601 seems to be
-<A HREF="http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html">International
+<A HREF="http://www.cl.cam.ac.uk/~mgk25/iso-time.html">International
Standard Date and Time Notation</A>
maintained by Markus Kuhn.
<P>
diff --git a/lib/libc/time/private.h b/lib/libc/time/private.h
index 51c051bc866..cec18889859 100644
--- a/lib/libc/time/private.h
+++ b/lib/libc/time/private.h
@@ -1,5 +1,4 @@
-/* $OpenBSD: private.h,v 1.10 1998/01/23 19:33:51 millert Exp $ */
-
+/* $OpenBSD: private.h,v 1.11 1999/01/29 07:04:05 d Exp $ */
#ifndef PRIVATE_H
#define PRIVATE_H
@@ -34,7 +33,7 @@
#if 0
#ifndef lint
#ifndef NOID
-static char privatehid[] = "@(#)private.h 7.46";
+static char privatehid[] = "@(#)private.h 7.48";
#endif /* !defined NOID */
#endif /* !defined lint */
#endif
@@ -60,6 +59,10 @@ static char privatehid[] = "@(#)private.h 7.46";
#define HAVE_STRERROR 0
#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 */
@@ -231,7 +234,7 @@ char * scheck P((const char *string, const char *format));
** add one more for a minus sign if the type is signed.
*/
#define INT_STRLEN_MAXIMUM(type) \
- ((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 100 + 1 + TYPE_SIGNED(type))
+ ((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + 1 + TYPE_SIGNED(type))
#endif /* !defined INT_STRLEN_MAXIMUM */
/*
diff --git a/lib/libc/time/tzfile.5 b/lib/libc/time/tzfile.5
index 10818e881a6..92b3cf735bc 100644
--- a/lib/libc/time/tzfile.5
+++ b/lib/libc/time/tzfile.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tzfile.5,v 1.5 1998/01/18 23:24:59 millert Exp $
+.\" $OpenBSD: tzfile.5,v 1.6 1999/01/29 07:04:05 d 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).
diff --git a/lib/libc/time/zdump.c b/lib/libc/time/zdump.c
index 5addc2d21c1..ed1e0e2f2cd 100644
--- a/lib/libc/time/zdump.c
+++ b/lib/libc/time/zdump.c
@@ -1,6 +1,6 @@
#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)zdump.c 7.27";
-static char rcsid[] = "$OpenBSD: zdump.c,v 1.6 1998/01/18 23:25:02 millert Exp $";
+static char elsieid[] = "@(#)zdump.c 7.28";
+static char rcsid[] = "$OpenBSD: zdump.c,v 1.7 1999/01/29 07:04:05 d Exp $";
#endif /* LIBC_SCCS and not lint */
/*
@@ -128,7 +128,7 @@ extern char * tzname[2];
static char * abbr P((struct tm * tmp));
static long delta P((struct tm * newp, struct tm * oldp));
-static time_t hunt P((char * name, time_t lot, time_t hit));
+static time_t hunt P((char * name, time_t lot, time_t hit));
static size_t longest;
static char * progname;
static void show P((char * zone, time_t t, int v));
@@ -167,7 +167,7 @@ char * argv[];
if (c == 'v')
vflag = 1;
else cutoff = optarg;
- if (c != -1 ||
+ if ((c != EOF && c != -1) ||
(optind == argc - 1 && strcmp(argv[optind], "=") == 0)) {
(void) fprintf(stderr,
_("%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"),
@@ -262,7 +262,7 @@ _("%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"),
show(argv[i], t, TRUE);
}
if (fflush(stdout) || ferror(stdout)) {
- (void) fprintf(stderr, _("%s: Error writing standard output "),
+ (void) fprintf(stderr, _("%s: Error writing "),
argv[0]);
(void) perror(_("standard output"));
(void) exit(EXIT_FAILURE);
diff --git a/lib/libc/time/zic.8 b/lib/libc/time/zic.8
index 7f511211508..f3ba312852a 100644
--- a/lib/libc/time/zic.8
+++ b/lib/libc/time/zic.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: zic.8,v 1.5 1998/01/18 23:25:03 millert Exp $
+.\" $OpenBSD: zic.8,v 1.6 1999/01/29 07:04:05 d Exp $
.TH ZIC 8
.SH NAME
zic \- time zone compiler
@@ -206,6 +206,8 @@ Recognized forms include:
.fi
.in -.5i
.sp
+where hour 0 is midnight at the start of the day,
+and hour 24 is midnight at the end of the day.
Any of these forms may be followed by the letter
.B w
if the given time is local
@@ -409,4 +411,4 @@ the earliest transition time recorded in the compiled file is correct.
/usr/share/zoneinfo standard directory used for created files
.SH "SEE ALSO"
ctime(3), tzfile(5), zdump(8)
-.\" @(#)zic.8 7.17
+.\" @(#)zic.8 7.18
diff --git a/lib/libc/time/zic.c b/lib/libc/time/zic.c
index d3e9a3a1c6d..a75d32f4af7 100644
--- a/lib/libc/time/zic.c
+++ b/lib/libc/time/zic.c
@@ -1,6 +1,6 @@
#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)zic.c 7.93";
-static char rcsid[] = "$OpenBSD: zic.c,v 1.8 1999/01/28 23:44:37 espie Exp $";
+static char elsieid[] = "@(#)zic.c 7.96";
+static char rcsid[] = "$OpenBSD: zic.c,v 1.9 1999/01/29 07:04:05 d Exp $";
#endif /* LIBC_SCCS and not lint */
#include "private.h"
@@ -380,7 +380,7 @@ int errnum;
extern int sys_nerr;
return (errnum > 0 && errnum <= sys_nerr) ?
- sys_errlist[errnum] : "Unknown system error";
+ sys_errlist[errnum] : _("Unknown system error");
}
#endif /* !(HAVE_STRERROR - 0) */
@@ -429,7 +429,7 @@ const char * const string;
{
char * cp;
- cp = ecpyalloc("warning: ");
+ cp = ecpyalloc(_("warning: "));
cp = ecatalloc(cp, string);
error(cp);
ifree(cp);
@@ -600,9 +600,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,
@@ -890,9 +900,10 @@ const int signable;
error(errstring);
return 0;
}
- if (hh < 0 || hh >= HOURSPERDAY ||
+ if ((hh < 0 || hh >= HOURSPERDAY ||
mm < 0 || mm >= MINSPERHOUR ||
- ss < 0 || ss > SECSPERMIN) {
+ ss < 0 || ss > SECSPERMIN) &&
+ !(hh == HOURSPERDAY && mm == 0 && ss == 0)) {
error(errstring);
return 0;
}