summaryrefslogtreecommitdiff
path: root/lib/libc/time
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2008-01-07 01:09:38 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2008-01-07 01:09:38 +0000
commitd43baef7aecad5b8a465e8a723b5897ddf157172 (patch)
tree20ff8bb68e431ed3143a612007cebcbc2c576b2e /lib/libc/time
parent07cb9de5b8462fe0de9085d0637e2d48ee26bbc1 (diff)
update to tzcode2007k from elsie.nci.nih.gov
Diffstat (limited to 'lib/libc/time')
-rw-r--r--lib/libc/time/ctime.310
-rw-r--r--lib/libc/time/private.h8
-rw-r--r--lib/libc/time/tz-art.htm4
-rw-r--r--lib/libc/time/tz-link.htm162
-rw-r--r--lib/libc/time/tzfile.512
-rw-r--r--lib/libc/time/zic.c19
6 files changed, 100 insertions, 115 deletions
diff --git a/lib/libc/time/ctime.3 b/lib/libc/time/ctime.3
index cbe5a271e15..3fd7e7a3126 100644
--- a/lib/libc/time/ctime.3
+++ b/lib/libc/time/ctime.3
@@ -1,7 +1,7 @@
-.\" $OpenBSD: ctime.3,v 1.34 2007/05/31 19:19:34 jmc Exp $
+.\" $OpenBSD: ctime.3,v 1.35 2008/01/07 01:09:37 millert Exp $
.\"
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 7 2008 $
.Dt CTIME 3
.Os
.Sh NAME
@@ -174,7 +174,9 @@ A negative value for
causes the
.Fn mktime
function to attempt to divine whether summer time is in effect
-for the specified time.)
+for the specified time; in this case it does not use a consistent
+rule and may give a different answer when later
+presented with the same argument.)
On successful completion, the values of the
.Fa tm_wday
and
@@ -310,6 +312,6 @@ as the superuser.
Avoid using out-of-range values with
.Fn mktime
when setting up lunch with promptness sticklers in Riyadh.
-.\" based on @(#)newctime.3 8.1
+.\" based on @(#)newctime.3 8.2
.\" This file is in the public domain, so clarified as of
.\" 2003-02-14 by Arthur David Olson (arthur_david_olson@nih.gov).
diff --git a/lib/libc/time/private.h b/lib/libc/time/private.h
index 7dcb8a6d406..ffafa6ba041 100644
--- a/lib/libc/time/private.h
+++ b/lib/libc/time/private.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: private.h,v 1.21 2007/12/29 22:26:51 millert Exp $ */
+/* $OpenBSD: private.h,v 1.22 2008/01/07 01:09:37 millert Exp $ */
#ifndef PRIVATE_H
#define PRIVATE_H
@@ -33,7 +33,7 @@
#if 0
#ifndef lint
#ifndef NOID
-static char privatehid[] = "@(#)private.h 8.5";
+static char privatehid[] = "@(#)private.h 8.6";
#endif /* !defined NOID */
#endif /* !defined lint */
#endif
@@ -61,10 +61,6 @@ static char privatehid[] = "@(#)private.h 8.5";
#define HAVE_SETTIMEOFDAY 3
#endif /* !defined HAVE_SETTIMEOFDAY */
-#ifndef HAVE_STRERROR
-#define HAVE_STRERROR 1
-#endif /* !defined HAVE_STRERROR */
-
#ifndef HAVE_SYMLINK
#define HAVE_SYMLINK 1
#endif /* !defined HAVE_SYMLINK */
diff --git a/lib/libc/time/tz-art.htm b/lib/libc/time/tz-art.htm
index 40b6e543935..0b6cc4ed3e1 100644
--- a/lib/libc/time/tz-art.htm
+++ b/lib/libc/time/tz-art.htm
@@ -9,7 +9,7 @@ PUBLIC "-//W3C//DTD HTML 4.01//EN"
<body>
<h1>Time and the Arts</h1>
<address>
-@(#)tz-art.htm 8.8
+@(#)tz-art.htm 8.9
</address>
<p>
Please send corrections to this web page to the
@@ -365,7 +365,7 @@ or are you trying to dazzle me with your command of time zones?"
</li>
<li>
A private jet's mid-flight change of time zones distorts Alison Dubois'
-premonition in the "We Had a Dream" episoed of "Medium"
+premonition in the "We Had a Dream" episode of "Medium"
(originally aired 2007-02-28).
</li>
<li>
diff --git a/lib/libc/time/tz-link.htm b/lib/libc/time/tz-link.htm
index b54a5805a99..d3ca83dc178 100644
--- a/lib/libc/time/tz-link.htm
+++ b/lib/libc/time/tz-link.htm
@@ -8,7 +8,7 @@
<meta http-equiv="Content-type" content='text/html; charset="US-ASCII"'>
<meta name="DC.Creator" content="Eggert, Paul">
<meta name="DC.Contributor" content="Olson, Arthur David">
-<meta name="DC.Date" content="2007-11-29">
+<meta name="DC.Date" content="2007-12-26">
<meta name="DC.Description"
content="Sources of information about time zones and daylight saving time">
<meta name="DC.Identifier" content="http://www.twinsun.com/tz/tz-link.htm">
@@ -18,7 +18,7 @@
<body>
<h1>Sources for Time Zone and Daylight Saving Time Data</h1>
<address>
-@(#)tz-link.htm 8.14
+@(#)tz-link.htm 8.15
</address>
<p>
Please send corrections to this web page to the
@@ -45,18 +45,18 @@ including
C Library</a> used in
<a href="http://www.linux.org/"><abbr>GNU</abbr>/Linux</a>,
<a href="http://www.freebsd.org/">FreeBSD</a>,
-<a href="http://www.netbsd.org/">NetBSD</a>,
-<a href="http://www.openbsd.org/">OpenBSD</a>,
-<a href="http://www.cygwin.com/">Cygwin</a>,
+<a href="http://netbsd.org/">NetBSD</a>,
+<a href="http://openbsd.org/">OpenBSD</a>,
+<a href="http://cygwin.com/">Cygwin</a>,
<a href="http://www.delorie.com/djgpp/"><abbr
title="DJ's GNU Programming Platform">DJGPP</abbr></a>,
-<a href="http://www.ibm.com/servers/aix/">AIX</a>,
+<a href="http://ibm.com/aix">AIX</a>,
<a href="http://www.apple.com/macosx/">Mac OS X</a>,
<a href="http://h71000.www7.hp.com/">OpenVMS</a>,
-<a href="http://www.oracle.com/database/index.html">Oracle Database</a>,
-<a href="http://www.sun.com/software/solaris/">Solaris</a>,
+<a href="http://oracle.com/database">Oracle Database</a>,
+<a href="http://sun.com/software/solaris">Solaris</a>,
<a href="http://h30097.www3.hp.com/">Tru64</a>, and
-<a href="http://www.sco.com/products/unixware/">UnixWare</a>.</p>
+<a href="http://sco.com/products/unixware">UnixWare</a>.</p>
<p>
Each location in the database represents a national region where all
clocks keeping local time have agreed since 1970.
@@ -79,13 +79,14 @@ implementation set the <code>TZ</code> environment variable to
the location's full name, e.g., <code>TZ="America/New_York"</code>.</p>
<p>
In the <code>tz</code> database's
-<a href="ftp://elsie.nci.nih.gov/pub/"><abbr
+<a href="ftp://elsie.nci.nih.gov/pub"><abbr
title="File Transfer Protocol">FTP</abbr> distribution</a>
the code is in the file <code>tzcode<var>C</var>.tar.gz</code>,
where <code><var>C</var></code> is the code's version;
similarly, the data are in <code>tzdata<var>D</var>.tar.gz</code>,
where <code><var>D</var></code> is the data's version.
-The following shell commands download
+The following <a
+href="http://en.wikipedia.org/wiki/Unix_shell">shell</a> commands download
these files to a <abbr>GNU</abbr>/Linux or similar host;
see the downloaded
<code>README</code> file for what to do next.</p>
@@ -102,15 +103,15 @@ location.</p>
The data are by no means authoritative. If you find errors, please
send changes to the <a href="mailto:tz@elsie.nci.nih.gov">time zone
mailing list</a>. You can also <a
-href="http://news.gmane.org/gmane.comp.time.tz/">browse recent
+href="http://news.gmane.org/gmane.comp.time.tz">browse recent
messages</a> sent to the mailing list, <a
href="mailto:tz-request@elsie.nci.nih.gov">subscribe</a> to it,
retrieve the <a
href="ftp://elsie.nci.nih.gov/pub/tzarchive.gz">full archive of old
messages</a> (in gzip compressed format), or retrieve <a
-href="ftp://munnari.oz.au/pub/oldtz/">archived older versions of code
+href="ftp://munnari.oz.au/pub/oldtz">archived older versions of code
and data</a>; there is also a smaller <a
-href="http://public.planetmirror.com/pub/timezone/"><abbr
+href="http://public.planetmirror.com/pub/timezone"><abbr
title="Hypertext Transfer Protocol">HTTP</abbr>
mirror</a>.</p>
<p>
@@ -118,45 +119,47 @@ The Web has several other sources for time zone and daylight saving time data.
Here are some recent links that may be of interest.
</p>
<h2>Web pages using recent versions of the <code>tz</code> database</h2>
+<p>
+These are listed roughly in ascending order of complexity and fanciness.
+</p>
<ul>
<li><a href="http://twiki.org/cgi-bin/xtra/tzdatepick.html">Date and Time Gateway</a>
-is a text-based point-and-click interface to tables of current time
-throughout the world.</li>
-<li>Fancier web interfaces, roughly in ascending order of complexity, include:
-<ul>
+lets you see the <code>TZ</code> values directly.</li>
<li><a
-href="http://www.convertit.com/Go/ConvertIt/World_Time/Current_Time.ASP">Current
-Time in 1000 Places</a></li>
-<li><a href="http://timezoneconverter.com/">Time Zone Converter</a></li>
+href="http://convertit.com/Go/ConvertIt/World_Time/Current_Time.ASP">Current
+Time in 1000 Places</a> uses descriptions of the values.</li>
+<li><a href="http://www.timezoneconverter.com/">Time Zone Converter</a>
+uses a pulldown menu.</li>
<li><a href="http://home.tiscali.nl/~t876506/TZworld.html">Complete
-timezone information for all countries</a></li>
-</ul></li>
-<li><a href="http://www.timeanddate.com/worldclock/">The World Clock -
-Time Zones</a>
-is a web interface to a time zone database derived from
-<code>tz</code>'s.</li>
+timezone information for all countries</a> displays tables of DST rules.
+<li><a href="http://timeanddate.com/worldclock/">The World Clock -
+Time Zones</a> lets you sort zone names and convert times.</li>
+<li>The <a href="http://worldtimeengine.com/">World Time Engine</a>
+also contains data about time zone boundaries; it supports queries via place
+names and shows location maps.</li>
</ul>
<h2>Other time zone database formats</h2>
<ul>
<li>The <a href="ftp://ftp.rfc-editor.org/in-notes/rfc2445.txt">
Internet Calendaring and Scheduling Core Object Specification
-(iCalendar)</a> specification published by the (now-concluded) <a
-href="http://www.ietf.org/html.charters/OLD/calsch-charter.html"><abbr
+(iCalendar)</a>, Internet <abbr title="Request For
+Comments">RFC</abbr> 2445, published by the (now-concluded) <a
+href="http://ietf.org/html.charters/OLD/calsch-charter.html"><abbr
title="Internet Engineering Task Force">IETF</abbr>
Calendaring and Scheduling Working Group (<abbr
title="Calendaring and Scheduling Working Group">calsch</abbr>)</a>
covers time zone
data; see its VTIMEZONE calendar component.
-The <a href="http://www.calconnect.org/">Calendaring and Scheduling
+The <a href="http://calconnect.org/">Calendaring and Scheduling
Consortium</a> is promoting further work in this area. <a
-href="http://www.calconnect.org/publications/icalendartimezoneproblemsandrecommendationsv1.0.pdf">iCalendar
+href="http://calconnect.org/publications/icalendartimezoneproblemsandrecommendationsv1.0.pdf">iCalendar
TIMEZONE Problems and Recommendations</a> offers guidelines and
recommendations for the use of VTIMEZONE and <code>tz</code>.</li>
-<li><a href="http://www.calconnect.org/dstlinks.shtml">Extended Daylight
+<li><a href="http://calconnect.org/dstlinks.shtml">Extended Daylight
Saving Time Links, Advisories and Changes</a> lists vendor material on recent
daylight saving time changes.</li>
<li><a
-href="http://www.calconnect.org/publications/timezoneregistryandservicerecommendationsv1.0.pdf">Timezone
+href="http://calconnect.org/publications/timezoneregistryandservicerecommendationsv1.0.pdf">Timezone
Registry and Service Recommendations</a> discusses a
strategy for defining and deploying a time zone
registration process that would establish unique names for each
@@ -185,9 +188,9 @@ available under the <a
href="http://www.gnu.org/copyleft/gpl.html"><abbr>GNU</abbr>
General Public License (<abbr
title="General Public License">GPL</abbr>)</a>.</li>
-<li><a href="http://sourceforge.net/projects/tzical/">tziCal - tz
+<li><a href="http://sourceforge.net/projects/tzical">tziCal - tz
database conversion utility</a> is like Vzic, except for the <a
-href="http://msdn.microsoft.com/netframework/">.NET framework</a>.</li>
+href="http://msdn.microsoft.com/netframework">.NET framework</a>.</li>
<li><a
href="http://search.cpan.org/dist/DateTime-TimeZone/">DateTime::TimeZone</a>
contains a script <code>parse_olson</code> that compiles
@@ -212,23 +215,23 @@ contains a class
<code>org.joda.time.tz.ZoneInfoCompiler</code> that compiles
<code>tz</code> source into a Joda-specific binary format. Joda Time
is freely available under a <abbr>BSD</abbr>-style license.</li>
-<li><a href="http://sourceforge.net/projects/pytz/">PyTZ - Python Time
+<li><a href="http://sourceforge.net/projects/pytz">PyTZ - Python Time
Zone Library</a> compiles <code>tz</code> source into
-<a href="http://www.python.org/">Python</a>.
+<a href="http://python.org/">Python</a>.
It is freely available under a <abbr>BSD</abbr>-style license.</li>
<li><a href="http://tzinfo.rubyforge.org/">TZInfo - Ruby Timezone Library</a>
compiles <code>tz</code> source into
-<a href="http://www.ruby-lang.org/">Ruby</a>.
+<a href="http://ruby-lang.org">Ruby</a>.
It is freely available under the <abbr
title="Massachusetts Institute of Technology">MIT</abbr> license.</li>
-<li>The <a href="http://www.chronos-st.org/">Chronos Date/Time
-Library</a> is a <a href="http://smalltalk.org/">Smalltalk</a> class
+<li>The <a href="http://chronos-st.org/">Chronos Date/Time
+Library</a> is a <a href="http://smalltalk.org">Smalltalk</a> class
library that compiles <code>tz</code> source into a <a
href="http://date-time-zone.com/">time zone repository</a> whose format
is either proprietary or an <a href="http://www.w3.org/XML/"><abbr
title="Extensible Markup Language">XML</abbr></a>-encoded
representation.</li>
-<li>Starting with version 8.5, <a href="http://www.tcl.tk/">Tcl</a>
+<li>Starting with version 8.5, <a href="http://tcl.tk/">Tcl</a>
contains a developer-oriented parser that compiles <samp>tz</samp>
source into text files, along with a runtime that can read those
files. Tcl is freely available under a <abbr>BSD</abbr>-style
@@ -246,7 +249,7 @@ This library is freely available under the
<abbr>GNU</abbr> Lesser General Public License
(<abbr title="Lesser General Public License">LGPL</abbr>)</a>,
and is widely used in <abbr>GNU</abbr>/Linux systems.</li>
-<li><a href="http://www.bmsi.com/java/#TZ">ZoneInfo.java</a>
+<li><a href="http://bmsi.com/java/#TZ">ZoneInfo.java</a>
is a <code>tz</code> binary file reader written in Java.
It is freely available under the <abbr>LGPL</abbr>.</li>
<li>Tcl, mentioned above, also contains a
@@ -254,12 +257,12 @@ It is freely available under the <abbr>LGPL</abbr>.</li>
</ul>
<h2>Other <code>tz</code>-based time zone software</h2>
<ul>
-<li><a href="http://www.stemhaus.com/firefox/foxclocks/">FoxClocks</a>
+<li><a href="http://stemhaus.com/firefox/foxclocks/">FoxClocks</a>
is an extension for <a
href="http://developer.mozilla.org/en/docs/Toolkit_API">Mozilla
Toolkit</a> applications like <a
-href="http://www.mozilla.com/firefox/">Firefox</a>, <a
-href="http://www.mozilla.com/en-US/thunderbird/">Thunderbird</a>, and
+href="http://mozilla.com/firefox">Firefox</a>, <a
+href="http://mozilla.com/thunderbird">Thunderbird</a>, and
<a
href="http://www.mozilla.org/projects/calendar/sunbird/">Sunbird</a>.
It displays multiple clocks in the application window, and has a mapping
@@ -270,7 +273,7 @@ href="http://users.skynet.be/Peter.Verthez/projects/intclock/">International
clock (intclock)</a> is a multi-timezone clock for
<abbr>GNU</abbr>/Linux and similar systems. It is freely available
under the <abbr>GPL</abbr>.</li>
-<li><a href="http://www.codeplex.com/publicdomain">PublicDomain</a>
+<li><a href="http://codeplex.com/publicdomain">PublicDomain</a>
has a copy of a recent <code>tz</code> database, accessed via a <a
href="http://en.wikipedia.org/wiki/C_Sharp">C#</a> library. As its
name suggests, it is in the public domain. Only current time stamps
@@ -283,12 +286,12 @@ Java-specific format.</li>
a <a href="http://wordpress.org/">WordPress</a> plugin. It is freely
available under a <abbr>BSD</abbr>-style license.</li>
<li><a
-href="http://www.veladg.com/velaterra.html">VelaTerra</a> is
+href="http://veladg.com/velaterra.html">VelaTerra</a> is
a Mac OS X program. Its developers
-<a href="http://www.veladg.com/tzoffer.html">offer free
+<a href="http://veladg.com/tzoffer.html">offer free
licenses</a> to <code>tz</code> contributors.</li>
<li><a
-href="http://www.worldtimeexplorer.com/index.html">World Time Explorer</a> is a
+href="http://worldtimeexplorer.com/">World Time Explorer</a> is a
Microsoft Windows program.</li>
</ul>
<h2>Other time zone databases</h2>
@@ -307,15 +310,15 @@ href="http://astrocom.com/">Astro Communications Services</a>.</li>
time info, public holidays</a>
contains information on local time, sunrise and sunset,
and public holidays in several hundred cities around the world.</li>
-<li><a href="http://www.worldtimeserver.com/">World Time Server</a>
+<li><a href="http://worldtimeserver.com/">World Time Server</a>
is another time zone database.</li>
<li><a href="http://tycho.usno.navy.mil/tzones.html">World Time Zones</a>
contains data from the Time Service Department of the
<abbr>US</abbr> Naval Observatory, used as the source
for the <code>usno*</code> files in the <code>tz</code> distribution.</li>
-<li>The <a href="http://www.iata.org/ps/publications/9179.htm">Standard
+<li>The <a href="http://iata.org/ps/publications/SSIM.htm">Standard
Schedules Information Manual</a> of the
-<a href="http://www.iata.org/index.htm">International Air Transport
+<a href="http://iata.org/index.htm">International Air Transport
Association</a>
gives current time zone rules for airports served by commercial aviation.</li>
<li>Some Microsoft Windows versions contain time zone information in
@@ -350,11 +353,11 @@ but the maps are more up to date.</li>
</ul>
<h2>Time zone boundaries</h2>
<ul>
-<li><a href="http://www.efele.net/maps/">A map of the TZ timezones in
+<li><a href="http://efele.net/maps/">A map of the TZ timezones in
the US</a> contains a <a
href="http://en.wikipedia.org/wiki/Shapefile">shapefile</a> of the
<code>tz</code> regions in the US.</li>
-<li><a href="http://www.statoids.com/statoids.html">Administrative Divisions
+<li><a href="http://statoids.com/statoids.html">Administrative Divisions
of Countries ("Statoids")</a> contains detailed lists of
<code>tz</code>-related zone subdivision data.</li>
<li><a href="http://home.tiscali.nl/~t876506/Multizones.html">Time
@@ -391,9 +394,9 @@ surveys the evolution of timekeeping.</li>
<li><a href="http://webexhibits.org/daylightsaving/">About Daylight
Saving Time - History, rationale, laws &amp; dates</a>
is an overall history of <abbr>DST</abbr>.</li>
-<li><a href="http://www.energy.ca.gov/daylightsaving.html">Saving Time,
+<li><a href="http://energy.ca.gov/daylightsaving.html">Saving Time,
Saving Energy</a> discusses a primary justification for <abbr>DST</abbr>.</li>
-<li><a href="http://www.seizethedaylight.com/dst/">Who Knew? A Brief
+<li><a href="http://seizethedaylight.com/dst/">Who Knew? A Brief
History of Daylight Saving Time</a> summarizes some of the contentious
history of <abbr>DST</abbr>.</li>
<li><a href="http://toi.iriti.cnr.it/">The
@@ -404,7 +407,7 @@ The time zone map is out of date, however.</li>
<li><a href="http://www.phys.uu.nl/~vgent/idl/idl.htm">A History of
the International Date Line</a> tells the story of the most important
time zone boundary.</li>
-<li><a href="http://www.statoids.com/tconcept.html">Basic Time
+<li><a href="http://statoids.com/tconcept.html">Basic Time
Zone Concepts</a> discusses terminological issues behind time zones.</li>
</ul>
<h2>National histories of legal time</h2>
@@ -428,9 +431,7 @@ Portuguese)</a>.</dd>
<dd>The Institute for National Measurement Standards publishes current
and some older information about <a
href="http://inms-ienm.nrc-cnrc.gc.ca/time_services/daylight_saving_e.html">Time
-Zones &amp; Daylight Saving Time</a>.
-<a href="http://www3.sympatico.ca/c.walton/canada_dst.html">Canadian
-Daylight Saving Regulations</a> summarizes changes for 2007.</dd>
+Zones &amp; Daylight Saving Time</a>.</dd>
<dt>Chile</dt>
<dd>The Chilean Hydrographic and Oceanographic Service publishes a <a
href="http://www.horaoficial.cl/horaof.htm" hreflang="es"> history of
@@ -441,7 +442,7 @@ href="http://www.ptb.de/en/org/4/44/441/dars_e.htm">Realisation of
Legal Time in Germany</a>.</dd>
<dt>Israel</dt>
<dd>The Interior Ministry periodically issues <a
-href="ftp://ftp.cs.huji.ac.il/pub/tz/announcements/"
+href="ftp://ftp.cs.huji.ac.il/pub/tz/announcements"
hreflang="he">announcements (in Hebrew)</a>.</dd>
<dt>Mexico</dt>
<dd>The Investigation and Analysis Service of the Mexican Library of
@@ -456,9 +457,9 @@ hreflang="nl">Legal time in the Netherlands (in Dutch)</a>
covers the history of local time in the Netherlands from ancient times.</dd>
<dt>New Zealand</dt>
<dd>The Department of Internal Affairs maintains a brief history <a
-href="http://www.dia.govt.nz/diawebsite.nsf/wpg_URL/Resource-material-Information-We-Provide-About-Daylight-Saving">About
+href="http://dia.govt.nz/diawebsite.nsf/wpg_URL/Resource-material-Information-We-Provide-About-Daylight-Saving">About
Daylight Saving</a>. The privately-maintained <a
-href="http://www.astrologyschool.com/nztime.html">History of New Zealand
+href="http://astrologyschool.com/nztime.html">History of New Zealand
time</a> has more details.</dd>
<dt>Norway</dt>
<dd>The Norwegian Meteorological Institute lists
@@ -491,8 +492,9 @@ Time Protocol</a>
discusses how to synchronize clocks of
Internet hosts.</li>
<li><a
-href="ftp://ftp.rfc-editor.org/in-notes/rfc4833.txt">A
-Timezone Option for <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr></a>
+href="ftp://ftp.rfc-editor.org/in-notes/rfc4833.txt">Timezone
+Options for <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr></a>
+(Internet <abbr>RFC</abbr> 4833)
specifies a <a
href="http://www.dhcp.org/">DHCP</a> option for a server to configure
a client's time zone and daylight saving settings automatically.</li>
@@ -510,7 +512,7 @@ Times</a> explains more abstruse astronomical time scales like
<abbr title="Barycentric Dynamic Time">TDB</abbr>.
<a href="http://www.ucolick.org/~sla/leapsecs/timescales.html">Time
Scales</a> goes into more detail, particularly for historical variants.</li>
-<li>The <a href="http://www.iau.org/"><abbr
+<li>The <a href="http://iau.org/"><abbr
title="International Astronomical Union">IAU</abbr></a>'s <a
href="http://www.iau-sofa.rl.ac.uk/"><abbr
title="Standards Of Fundamental Astronomy">SOFA</abbr></a>
@@ -519,7 +521,7 @@ code for converting among time scales like
<abbr title="International Atomic Time">TAI</abbr>,
<abbr>TDB</abbr>, <abbr>TDT</abbr> and
<abbr>UTC</abbr>.</li>
-<li><a href="http://www.jpl.nasa.gov/basics/bsf2-3.htm">Basics of
+<li><a href="http://jpl.nasa.gov/basics/bsf2-3.htm">Basics of
Space Flight - Reference Systems - Time Conventions</a>
briefly explains interplanetary space flight timekeeping.</li>
<li><a
@@ -529,7 +531,7 @@ describes Mars Coordinated Time (<abbr
title="Mars Coordinated Time">MTC</abbr>) and the
diverse local time
scales used by each landed mission on Mars.</li>
-<li><a href="http://www.leapsecond.com/">LeapSecond.com</a> is
+<li><a href="http://leapsecond.com/">LeapSecond.com</a> is
dedicated not only to leap seconds but to precise time and frequency
in general. It covers the state of the art in amateur timekeeping, and
how the art has progressed over the past few decades.</li>
@@ -543,15 +545,14 @@ the Earth Orientation Parameters Product Center of the
International Earth Rotation Service, the committee that decides
when leap seconds occur.</li>
<li>The <a
-href="http://www.mail-archive.com/leapsecs@rom.usno.navy.mil/">Leap
-Second Discussion List</a> and <a
-href="http://rom.usno.navy.mil/archives/leapsecs.html">archive</a> covers <a
+href="http://six.pairlist.net/mailman/listinfo/leapsecs">Leap
+Second Discussion List</a> covers <a
href="http://gauss.gge.unb.ca/papers.pdf/gpsworld.november99.pdf">McCarthy
and Klepczynski's proposal to discontinue leap seconds</a>,
discussed further in
<a href="http://www.cl.cam.ac.uk/~mgk25/time/metrologia-leapsecond.pdf">The
leap second: its history and possible future</a>.
-The <a href="http://www.aas.org/policy/LeapSecondCommittee.html"><abbr
+The <a href="http://aas.org/policy/LeapSecondCommittee.html"><abbr
title="American Astronomical Society">AAS</abbr> Leap Second
Committee</a> has solicited input on this proposal.
<a href="http://www.ucolick.org/~sla/leapsecs/">The
@@ -574,14 +575,15 @@ interchange -- Representation of dates and times</a>.</li>
Schema: Datatypes - dateTime</a> specifies a format inspired by
<abbr>ISO</abbr> 8601 that is in common use in XML data.</li>
<li>
-<a href="ftp://ftp.rfc-editor.org/in-notes/rfc2822.txt">Internet <abbr
-title="Request For Comments">RFC</abbr> 2822</a> &sect;3.3
+<a href="ftp://ftp.rfc-editor.org/in-notes/rfc2822.txt">Internet
+Message Format</a> (Internet <abbr>RFC</abbr> 2822) &sect;3.3
specifies the time notation used in email and <a
href="ftp://ftp.rfc-editor.org/in-notes/rfc2616.txt"><abbr>HTTP</abbr></a>
headers.</li>
<li>
-<a href="ftp://ftp.rfc-editor.org/in-notes/rfc3339.txt">Internet
-<abbr>RFC</abbr> 3339</a> specifies an <abbr>ISO</abbr> 8601
+<a href="ftp://ftp.rfc-editor.org/in-notes/rfc3339.txt">Date and Time
+on the Internet: Timestamps</a> (Internet <abbr>RFC</abbr> 3339)
+specifies an <abbr>ISO</abbr> 8601
profile for use in new Internet
protocols.</li>
<li>
@@ -589,7 +591,7 @@ protocols.</li>
Formats on the Web</a> surveys web- and Internet-oriented date and time
formats.</li>
<li>
-<a href="http://www.exit109.com/~ghealton/y2k/yrexamples.html">The
+<a href="http://exit109.com/~ghealton/y2k/yrexamples.html">The
Best of Dates, the Worst of Dates</a> covers many problems encountered
by software developers when handling dates and time stamps.</li>
<li>The <a
@@ -599,7 +601,7 @@ abbreviations, identifiers, and formats. For example, it contains
French translations for "Eastern European Summer Time", "<abbr
title="Eastern European Summer Time">EEST</abbr>", and
"Bucharest". <a
-href="http://www.unicode.org/cldr/data/charts/by_type/names.metazone.html">By-Type
+href="http://unicode.org/cldr/data/charts/by_type/names.metazone.html">By-Type
Chart: names.metazone</a> shows these values for many locales.
<abbr>ICU</abbr> contains a mechanism for using this data.</li>
<li>Alphabetic time zone abbreviations should not be used as unique
@@ -632,11 +634,11 @@ is called "<abbr>GMT</abbr>".</li>
<h2>Related indexes</h2>
<ul>
<li><a href="tz-art.htm">Time and the Arts</a></li>
-<li><a href="http://dmoz.org/Reference/Time/">Open Directory -
+<li><a href="http://www.dmoz.org/Reference/Time/">Open Directory -
Reference: Time</a></li>
<li><a href="http://directory.google.com/Top/Reference/Time/">Google Directory
- Reference &gt; Time</a></li>
-<li><a href="http://dir.yahoo.com/Science/Measurements_and_Units/Time/">Yahoo!
+<li><a href="http://dir.yahoo.com/Science/Measurements_and_Units/Time">Yahoo!
Directory &gt; Science &gt; Measurements and Units &gt; Time</a></li>
</ul>
</body>
diff --git a/lib/libc/time/tzfile.5 b/lib/libc/time/tzfile.5
index d055e457b7e..21e5b495d05 100644
--- a/lib/libc/time/tzfile.5
+++ b/lib/libc/time/tzfile.5
@@ -1,5 +1,5 @@
-.\" $OpenBSD: tzfile.5,v 1.11 2007/05/31 19:19:34 jmc Exp $
-.Dd $Mdocdate: May 31 2007 $
+.\" $OpenBSD: tzfile.5,v 1.12 2008/01/07 01:09:37 millert Exp $
+.Dd $Mdocdate: January 7 2008 $
.Dt TZFILE 5
.Os
.Sh NAME
@@ -64,7 +64,9 @@ types
described in the file is associated with the same-indexed transition time.
These values serve as indices into an array of
.Fa ttinfo
-structures that appears next in the file;
+structures (with
+.Fa tzh_typecnt
+entries) that appears next in the file;
these structures are defined as follows:
.Bd -literal -offset indent
.ta .5i +\w'unsigned int\0\0'u
@@ -141,13 +143,13 @@ For version-2-format time zone files,
the above header and data is followed by a second header and data,
identical in format except that
eight bytes are used for each transition time or leap second time.
-After the second header and data comes a newline-encloded,
+After the second header and data comes a newline-enclosed,
POSIX-TZ-environment-variable-style string for use in handling instants
after the last transition time stored in the file
(with nothing between the newlines if there is no POSIX representation for
such instants).
.Sh SEE ALSO
.Xr ctime 3
-.\" @(#)tzfile.5 8.1
+.\" @(#)tzfile.5 8.2
.\" This file is in the public domain, so clarified as of
.\" 1996-06-05 by Arthur David Olson.
diff --git a/lib/libc/time/zic.c b/lib/libc/time/zic.c
index 8ba884209bf..2d6facacbf1 100644
--- a/lib/libc/time/zic.c
+++ b/lib/libc/time/zic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zic.c,v 1.30 2007/12/29 22:26:51 millert Exp $ */
+/* $OpenBSD: zic.c,v 1.31 2008/01/07 01:09:37 millert Exp $ */
/*
** This file is in the public domain, so clarified as of
** 2006-07-17 by Arthur David Olson.
@@ -163,10 +163,6 @@ static void usage(void);
static void writezone(const char * name, const char * string);
static int yearistype(int year, const char * type);
-#if !HAVE_STRERROR
-static char * strerror(int);
-#endif /* !HAVE_STRERROR */
-
static int charcnt;
static int errors;
static const char * filename;
@@ -408,19 +404,6 @@ char * const ptr;
** Error handling.
*/
-#if !HAVE_STRERROR
-static char *
-strerror(errnum)
-int errnum;
-{
- extern char * sys_errlist[];
- extern int sys_nerr;
-
- return (errnum > 0 && errnum <= sys_nerr) ?
- sys_errlist[errnum] : _("Unknown system error");
-}
-#endif /* !HAVE_STRERROR */
-
static void
eats(name, num, rname, rnum)
const char * const name;