summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libc/time/asctime.c99
-rw-r--r--lib/libc/time/ctime.336
-rw-r--r--lib/libc/time/localtime.c72
-rw-r--r--lib/libc/time/private.h16
-rw-r--r--lib/libc/time/strftime.c53
-rw-r--r--lib/libc/time/tz-link.htm277
-rw-r--r--lib/libc/time/zdump.c76
7 files changed, 438 insertions, 191 deletions
diff --git a/lib/libc/time/asctime.c b/lib/libc/time/asctime.c
index 15bcb448cac..5e22f919b72 100644
--- a/lib/libc/time/asctime.c
+++ b/lib/libc/time/asctime.c
@@ -4,8 +4,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)asctime.c 7.9";
-static char rcsid[] = "$OpenBSD: asctime.c,v 1.7 2000/01/06 08:24:17 d Exp $";
+static char elsieid[] = "@(#)asctime.c 7.22";
+static char rcsid[] = "$OpenBSD: asctime.c,v 1.8 2004/10/18 22:33:43 millert Exp $";
#endif /* LIBC_SCCS and not lint */
/*LINTLIBRARY*/
@@ -14,14 +14,51 @@ static char rcsid[] = "$OpenBSD: asctime.c,v 1.7 2000/01/06 08:24:17 d Exp $";
#include "tzfile.h"
#include "thread_private.h"
+#if STRICTLY_STANDARD_ASCTIME
+#define ASCTIME_FMT "%.3s %.3s%3d %.2d:%.2d:%.2d %ld\n"
+#define ASCTIME_FMT_B ASCTIME_FMT
+#else /* !STRICTLY_STANDARD_ASCTIME */
/*
-** A la ISO/IEC 9945-1, ANSI/IEEE Std 1003.1, Second Edition, 1996-07-12.
+** Some systems only handle "%.2d"; others only handle "%02d";
+** "%02.2d" makes (most) everybody happy.
+** At least some versions of gcc warn about the %02.2d; ignore the warning.
*/
+/*
+** All years associated with 32-bit time_t values are exactly four digits long;
+** some years associated with 64-bit time_t values are not.
+** Vintage programs are coded for years that are always four digits long
+** and may assume that the newline always lands in the same place.
+** For years that are less than four digits, we pad the output with
+** spaces before the newline to get the newline in the traditional place.
+*/
+#define ASCTIME_FMT "%.3s %.3s%3d %02.2d:%02.2d:%02.2d %-4ld\n"
+/*
+** For years that are more than four digits we put extra spaces before the year
+** so that code trying to overwrite the newline won't end up overwriting
+** a digit within a year and truncating the year (operating on the assumption
+** that no output is better than wrong output).
+*/
+#define ASCTIME_FMT_B "%.3s %.3s%3d %02.2d:%02.2d:%02.2d %ld\n"
+#endif /* !STRICTLY_STANDARD_ASCTIME */
-char *
-asctime_r(timeptr, buf)
+#define STD_ASCTIME_BUF_SIZE 26
+/*
+** Big enough for something such as
+** ??? ???-2147483648 -2147483648:-2147483648:-2147483648 -2147483648\n
+** (two three-character abbreviations, five strings denoting integers,
+** seven explicit spaces, two explicit colons, a newline,
+** and a trailing ASCII nul).
+** The values above are for systems where an int is 32 bits and are provided
+** as an example; the define below calculates the maximum for the system at
+** hand.
+*/
+#define MAX_ASCTIME_BUF_SIZE (2*3+5*INT_STRLEN_MAXIMUM(int)+7+2+1+1)
+
+static char *
+asctime3(timeptr, buf, bufsize)
register const struct tm * timeptr;
char * buf;
+int bufsize;
{
static const char wday_name[][3] = {
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
@@ -32,7 +69,8 @@ char * buf;
};
register const char * wn;
register const char * mn;
- int size;
+ long year;
+ int len;
if (timeptr->tm_wday < 0 || timeptr->tm_wday >= DAYSPERWEEK)
wn = "???";
@@ -40,40 +78,55 @@ char * buf;
if (timeptr->tm_mon < 0 || timeptr->tm_mon >= MONSPERYEAR)
mn = "???";
else mn = mon_name[timeptr->tm_mon];
- /*
- ** The X3J11-suggested format is
- ** "%.3s %.3s%3d %02.2d:%02.2d:%02.2d %d\n"
- ** Since the .2 in 02.2d is ignored, we drop it.
- */
- /*
- * P1003 8.3.5.2 says that asctime_r() can only assume at most
- * a 26 byte buffer. *XXX*
- */
- size = snprintf(buf, 26, "%.3s %.3s%3d %02d:%02d:%02d %d\n",
+ year = timeptr->tm_year + (long) TM_YEAR_BASE;
+ len = snprintf(buf, bufsize,
+ ((year >= -999 && year <= 9999) ? ASCTIME_FMT : ASCTIME_FMT_B),
wn, mn,
timeptr->tm_mday, timeptr->tm_hour,
timeptr->tm_min, timeptr->tm_sec,
TM_YEAR_BASE + timeptr->tm_year);
- if (size >= 26)
+ if (len < bufsize) {
+ return buf;
+ } else {
+#ifdef EOVERFLOW
+ errno = EOVERFLOW;
+#else /* !defined EOVERFLOW */
+ errno = EINVAL;
+#endif /* !defined EOVERFLOW */
return NULL;
- return buf;
+ }
+}
+
+/*
+** A la ISO/IEC 9945-1, ANSI/IEEE Std 1003.1, 2004 Edition.
+*/
+
+char *
+asctime_r(timeptr, buf)
+register const struct tm * timeptr;
+char * buf;
+{
+ /*
+ ** P1003 8.3.5.2 says that asctime_r() can only assume at most
+ ** a 26 byte buffer.
+ */
+ return asctime3(timeptr, buf, STD_ASCTIME_BUF_SIZE);
}
/*
-** A la X3J11, with core dump avoidance.
+** A la ISO/IEC 9945-1, ANSI/IEEE Std 1003.1, 2004 Edition.
*/
char *
asctime(timeptr)
const struct tm * timeptr;
{
- /* asctime_r won't exceed this buffer: */
- static char result[26];
+ static char result[MAX_ASCTIME_BUF_SIZE];
_THREAD_PRIVATE_KEY(asctime);
- char *resultp = (char*) _THREAD_PRIVATE(asctime, result, NULL);
+ char *resultp = (char *)_THREAD_PRIVATE(asctime, result, NULL);
if (resultp == NULL)
return NULL;
else
- return asctime_r(timeptr, resultp);
+ return asctime3(timeptr, resultp, sizeof(result));
}
diff --git a/lib/libc/time/ctime.3 b/lib/libc/time/ctime.3
index 5fe445196ab..d7bc31615f2 100644
--- a/lib/libc/time/ctime.3
+++ b/lib/libc/time/ctime.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ctime.3,v 1.28 2003/07/07 15:38:38 jmc Exp $
+.\" $OpenBSD: ctime.3,v 1.29 2004/10/18 22:33:43 millert Exp $
.\"
.\"
.Dd February 16, 1999
@@ -59,12 +59,19 @@ pointed to by
representing the time in seconds since
00:00:00 UTC, 1970-01-01,
and returns a pointer to a
-26-character string
-of the form
+string of the form
.Pp
.Dl Thu Nov 24 18:22:48 1986\en
.Pp
-All the fields have constant width.
+Years requiring fewer than four characters are padded with trailing spaces.
+For years longer than four characters, the string is of the form
+.Pp
+.Dl Thu Nov 24 18:22:48\ \ \ \ \ 81986\en
+.Pp
+with five spaces before the year.
+This unusual format is designed to make it less likely that older
+software that expects exactly 26 bytes of output will mistakenly output
+misleading values for out-of-range years.
.Pp
The
.Fn ctime_r
@@ -130,10 +137,9 @@ the reentrant version is not required to set
.Fn asctime
converts a time value contained in a
.Li tm
-structure to a 26-character string,
+structure to a string,
as shown in the above example,
-and returns a pointer
-to the string.
+and returns a pointer to the string.
.Fn asctime_r
uses the buffer pointed to by
.Fa buf
@@ -285,6 +291,20 @@ will also be overwritten at the next call
(and by calls to
.Fn tzset ) .
.Pp
+.Fn asctime
+and
+.Fn ctime
+behave strangely for years before 1000 or after 9999.
+The 1989 and 1999 editions of the C Standard say
+that years from \-99 through 999 are converted without
+extra spaces, but this conflicts with longstanding
+tradition and with this implementation.
+Traditional implementations of these two functions are
+restricted to years in the range 1900 through 2099.
+To avoid this portability mess, new programs should use
+.Fn strftime
+instead.
+.Pp
The default system time zone may be set by running
.Dq Li zic -l timezone
as the superuser.
@@ -292,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 7.14
+.\" based on @(#)newctime.3 7.16
.\" 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/localtime.c b/lib/libc/time/localtime.c
index 59615a97971..e9bb299afe9 100644
--- a/lib/libc/time/localtime.c
+++ b/lib/libc/time/localtime.c
@@ -4,8 +4,8 @@
*/
#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
-static char elsieid[] = "@(#)localtime.c 7.78";
-static char rcsid[] = "$OpenBSD: localtime.c,v 1.24 2004/06/28 14:47:41 millert Exp $";
+static char elsieid[] = "@(#)localtime.c 7.80";
+static char rcsid[] = "$OpenBSD: localtime.c,v 1.25 2004/10/18 22:33:43 millert Exp $";
#endif /* LIBC_SCCS and not lint */
/*
@@ -134,6 +134,9 @@ static void gmtsub P((const time_t * timep, long offset,
static void localsub P((const time_t * timep, long offset,
struct tm * tmp));
static int increment_overflow P((int * number, int delta));
+static int long_increment_overflow P((long * number, int delta));
+static int long_normalize_overflow P((long * tensptr,
+ int * unitsptr, int base));
static int normalize_overflow P((int * tensptr, int * unitsptr,
int base));
static void settzname P((void));
@@ -1183,7 +1186,7 @@ register struct tm * const tmp;
register const struct lsinfo * lp;
register long days;
register long rem;
- register int y;
+ register long y;
register int yleap;
register const int * ip;
register long corr;
@@ -1252,7 +1255,7 @@ register struct tm * const tmp;
y = EPOCH_YEAR;
#define LEAPS_THRU_END_OF(y) ((y) / 4 - (y) / 100 + (y) / 400)
while (days < 0 || days >= (long) year_lengths[yleap = isleap(y)]) {
- register int newy;
+ register long newy;
newy = y + days / DAYSPERNYEAR;
if (days < 0)
@@ -1328,6 +1331,18 @@ int delta;
}
static int
+long_increment_overflow(number, delta)
+long * number;
+int delta;
+{
+ long number0;
+
+ number0 = *number;
+ *number += delta;
+ return (*number < number0) != (delta < 0);
+}
+
+static int
normalize_overflow(tensptr, unitsptr, base)
int * const tensptr;
int * const unitsptr;
@@ -1343,6 +1358,21 @@ const int base;
}
static int
+long_normalize_overflow(tensptr, unitsptr, base)
+long * const tensptr;
+int * const unitsptr;
+const int base;
+{
+ register int tensdelta;
+
+ tensdelta = (*unitsptr >= 0) ?
+ (*unitsptr / base) :
+ (-1 - (-1 - *unitsptr) / base);
+ *unitsptr -= tensdelta * base;
+ return long_increment_overflow(tensptr, tensdelta);
+}
+
+static int
tmcomp(atmp, btmp)
register const struct tm * const atmp;
register const struct tm * const btmp;
@@ -1369,8 +1399,10 @@ const int do_norm_secs;
register const struct state * sp;
register int dir;
register int bits;
- register int i, j ;
+ register int i, j;
register int saved_seconds;
+ register long li;
+ long y;
time_t newt;
time_t t;
struct tm yourtm, mytm;
@@ -1386,42 +1418,46 @@ const int do_norm_secs;
return WRONG;
if (normalize_overflow(&yourtm.tm_mday, &yourtm.tm_hour, HOURSPERDAY))
return WRONG;
- if (normalize_overflow(&yourtm.tm_year, &yourtm.tm_mon, MONSPERYEAR))
+ y = yourtm.tm_year;
+ if (long_normalize_overflow(&y, &yourtm.tm_mon, MONSPERYEAR))
return WRONG;
/*
- ** Turn yourtm.tm_year into an actual year number for now.
+ ** Turn y into an actual year number for now.
** It is converted back to an offset from TM_YEAR_BASE later.
*/
- if (increment_overflow(&yourtm.tm_year, TM_YEAR_BASE))
+ if (long_increment_overflow(&y, TM_YEAR_BASE))
return WRONG;
while (yourtm.tm_mday <= 0) {
- if (increment_overflow(&yourtm.tm_year, -1))
+ if (long_increment_overflow(&y, -1))
return WRONG;
- i = yourtm.tm_year + (1 < yourtm.tm_mon);
- yourtm.tm_mday += year_lengths[isleap(i)];
+ li = y + (1 < yourtm.tm_mon);
+ yourtm.tm_mday += year_lengths[isleap(li)];
}
while (yourtm.tm_mday > DAYSPERLYEAR) {
- i = yourtm.tm_year + (1 < yourtm.tm_mon);
- yourtm.tm_mday -= year_lengths[isleap(i)];
- if (increment_overflow(&yourtm.tm_year, 1))
+ li = y + (1 < yourtm.tm_mon);
+ yourtm.tm_mday -= year_lengths[isleap(li)];
+ if (long_increment_overflow(&y, 1))
return WRONG;
}
for ( ; ; ) {
- i = mon_lengths[isleap(yourtm.tm_year)][yourtm.tm_mon];
+ i = mon_lengths[isleap(y)][yourtm.tm_mon];
if (yourtm.tm_mday <= i)
break;
yourtm.tm_mday -= i;
if (++yourtm.tm_mon >= MONSPERYEAR) {
yourtm.tm_mon = 0;
- if (increment_overflow(&yourtm.tm_year, 1))
+ if (long_increment_overflow(&y, 1))
return WRONG;
}
}
- if (increment_overflow(&yourtm.tm_year, -TM_YEAR_BASE))
+ if (long_increment_overflow(&y, -TM_YEAR_BASE))
return WRONG;
+ yourtm.tm_year = y;
+ if (yourtm.tm_year != y)
+ return WRONG;
if (yourtm.tm_sec >= 0 && yourtm.tm_sec < SECSPERMIN)
saved_seconds = 0;
- else if (yourtm.tm_year + TM_YEAR_BASE < EPOCH_YEAR) {
+ else if (y + TM_YEAR_BASE < EPOCH_YEAR) {
/*
** We can't set tm_sec to 0, because that might push the
** time below the minimum representable time.
diff --git a/lib/libc/time/private.h b/lib/libc/time/private.h
index b1b6b10e0ab..72a1a785323 100644
--- a/lib/libc/time/private.h
+++ b/lib/libc/time/private.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: private.h,v 1.15 2004/06/28 14:47:41 millert Exp $ */
+/* $OpenBSD: private.h,v 1.16 2004/10/18 22:33:43 millert Exp $ */
#ifndef PRIVATE_H
#define PRIVATE_H
@@ -33,7 +33,7 @@
#if 0
#ifndef lint
#ifndef NOID
-static char privatehid[] = "@(#)private.h 7.53";
+static char privatehid[] = "@(#)private.h 7.54";
#endif /* !defined NOID */
#endif /* !defined lint */
#endif
@@ -191,6 +191,7 @@ static char privatehid[] = "@(#)private.h 7.53";
#endif /* !defined FILENAME_MAX */
+#if 0
/*
** SunOS 4.1.1 libraries lack remove.
*/
@@ -200,7 +201,6 @@ extern int unlink P((const char * filename));
#define remove unlink
#endif /* !defined remove */
-#if 0
/*
** Some ancient errno.h implementations don't declare errno.
** But some newer errno.h implementations define it as a macro.
@@ -209,6 +209,16 @@ extern int unlink P((const char * filename));
#ifndef errno
extern int errno;
#endif /* !defined errno */
+
+/*
+** Some time.h implementations don't declare asctime_r.
+** Others might define it as a macro.
+** Fix the former without affecting the latter.
+*/
+
+#ifndef asctime_r
+extern char * asctime_r();
+#endif
#endif
/*
diff --git a/lib/libc/time/strftime.c b/lib/libc/time/strftime.c
index 9be6718fedd..8246302c69d 100644
--- a/lib/libc/time/strftime.c
+++ b/lib/libc/time/strftime.c
@@ -1,6 +1,12 @@
+/*
+** XXX To do: figure out correct (as distinct from standard-mandated)
+** output for "two digits of year" and "century" formats when
+** the year is negative or less than 100. --ado, 2004-09-09
+*/
+
#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
static char elsieid[] = "@(#)strftime.c 7.64";
-static char *rcsid = "$OpenBSD: strftime.c,v 1.13 2003/06/04 21:47:58 deraadt Exp $";
+static char *rcsid = "$OpenBSD: strftime.c,v 1.14 2004/10/18 22:33:43 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include "private.h"
@@ -120,6 +126,7 @@ static const struct lc_time_T C_time_locale = {
static char * _add P((const char *, char *, const char *));
static char * _conv P((int, const char *, char *, const char *));
+static char * _lconv P((long, const char *, char *, const char *));
static char * _fmt P((const char *, const struct tm *, char *, const char *, int *));
size_t strftime P((char *, size_t, const char *, const struct tm *));
@@ -225,7 +232,8 @@ label:
** something completely different.
** (ado, 1993-05-24)
*/
- pt = _conv((t->tm_year + TM_YEAR_BASE) / 100,
+ pt = _conv((int) ((t->tm_year +
+ (long) TM_YEAR_BASE) / 100),
"%02d", pt, ptlim);
continue;
case 'c':
@@ -394,12 +402,13 @@ label:
** (ado, 1996-01-02)
*/
{
- int year;
+ long year;
int yday;
int wday;
int w;
- year = t->tm_year + TM_YEAR_BASE;
+ year = t->tm_year;
+ year += TM_YEAR_BASE;
yday = t->tm_yday;
wday = t->tm_wday;
for ( ; ; ) {
@@ -441,20 +450,20 @@ label:
DAYSPERNYEAR;
}
#ifdef XPG4_1994_04_09
- if ((w == 52
- && t->tm_mon == TM_JANUARY)
- || (w == 1
- && t->tm_mon == TM_DECEMBER))
- w = 53;
+ if ((w == 52 &&
+ t->tm_mon == TM_JANUARY) ||
+ (w == 1 &&
+ t->tm_mon == TM_DECEMBER))
+ w = 53;
#endif /* defined XPG4_1994_04_09 */
if (*format == 'V')
pt = _conv(w, "%02d",
pt, ptlim);
else if (*format == 'g') {
*warnp = IN_ALL;
- pt = _conv(year % 100, "%02d",
- pt, ptlim);
- } else pt = _conv(year, "%04d",
+ pt = _conv((int) (year % 100),
+ "%02d", pt, ptlim);
+ } else pt = _lconv(year, "%04ld",
pt, ptlim);
}
continue;
@@ -492,12 +501,13 @@ label:
continue;
case 'y':
*warnp = IN_ALL;
- pt = _conv((t->tm_year + TM_YEAR_BASE) % 100,
+ pt = _conv((int) ((t->tm_year +
+ (long) TM_YEAR_BASE) % 100),
"%02d", pt, ptlim);
continue;
case 'Y':
- pt = _conv(t->tm_year + TM_YEAR_BASE, "%04d",
- pt, ptlim);
+ pt = _lconv(t->tm_year + (long) TM_YEAR_BASE,
+ "%04ld", pt, ptlim);
continue;
case 'Z':
#ifdef TM_ZONE
@@ -601,6 +611,19 @@ const char * const ptlim;
}
static char *
+_lconv(n, format, pt, ptlim)
+const long n;
+const char * const format;
+char * const pt;
+const char * const ptlim;
+{
+ char buf[INT_STRLEN_MAXIMUM(long) + 1];
+
+ (void) snprintf(buf, sizeof buf, format, n);
+ return _add(buf, pt, ptlim);
+}
+
+static char *
_add(str, pt, ptlim)
const char * str;
char * pt;
diff --git a/lib/libc/time/tz-link.htm b/lib/libc/time/tz-link.htm
index 0e630730070..e55d1f6a288 100644
--- a/lib/libc/time/tz-link.htm
+++ b/lib/libc/time/tz-link.htm
@@ -9,7 +9,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="2004-05-24" />
+<meta name="DC.Date" content="2004-09-22" />
<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" />
@@ -19,35 +19,38 @@
<body>
<h1>Sources for Time Zone and Daylight Saving Time Data</h1>
<address>
-@(#)tz-link.htm 7.42
+@(#)tz-link.htm 7.44
</address>
<p>
Please send corrections to this web page to the
-<a href="mailto:tz@elsie.nci.nih.gov">time zone mailing list</a>.
-</p>
+<a href="mailto:tz@elsie.nci.nih.gov">time zone mailing list</a>.</p>
<h2>The <code>tz</code> database</h2>
<p>
The public-domain time zone 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.
+to <abbr title="Coordinated Universal Time">UTC</abbr>
+offsets and daylight-saving rules.
This database (often called <code>tz</code> or <code>zoneinfo</code>)
is used by several implementations,
including
-<a href="http://www.gnu.org/software/libc/">the GNU C Library</a> used in
-<a href="http://www.linux.org/">GNU/Linux</a>,
+<a href="http://www.gnu.org/software/libc/">the
+<acronym title="GNU's Not Unix">GNU</acronym>
+C Library</a> used in
+<a href="http://www.linux.org/"><acronym>GNU</acronym>/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://www.delorie.com/djgpp/">DJGPP</a>,
+<a href="http://www.delorie.com/djgpp/"><abbr
+title="DJ's GNU Programming Platform">DJGPP</abbr></a>,
<a href="http://www.hp.com/products1/unix/operating/">HP-UX</a>,
<a href="http://www.sgi.com/developers/technology/irix/">IRIX</a>,
<a href="http://www.apple.com/macosx/">Mac OS X</a>,
<a href="http://h71000.www7.hp.com/">OpenVMS</a>,
<a href="http://wwws.sun.com/software/solaris/">Solaris</a>,
-<a href="http://www.tru64unix.compaq.com/">Tru64</a>, and
+<a href="http://h30097.www3.hp.com/">Tru64</a>, and
<a href="http://www.sco.com/products/unixware/">UnixWare</a>.</p>
<p>
Each location in the database represents a national region where all
@@ -55,24 +58,30 @@ clocks keeping local time have agreed since 1970.
Locations are identified by continent or ocean and then by the name of
the location, which is typically the largest city within the region.
For example, <code>America/New_York</code>
-represents most of the US eastern time zone;
+represents most of the <abbr title="United States">US</abbr> eastern time zone;
<code>America/Indianapolis</code> represents most of Indiana, which
-uses eastern time without daylight saving time (DST);
+uses eastern time without daylight saving time (<abbr
+title="daylight saving time">DST</abbr>);
<code>America/Detroit</code> represents most of Michigan, which uses
-eastern time but with different DST rules in 1975;
+eastern time but with different <abbr>DST</abbr> rules in 1975;
and other entries represent smaller regions like Starke County,
Kentucky, which switched from central to eastern time in 1991.
-To use the database, set the <code>TZ</code> environment variable to
+To use the database on an extended <a
+href="http://www.pasc.org/#POSIX"><abbr
+title="Portable Operating System Interface">POSIX</abbr></a>
+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/">FTP distribution</a>,
+<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
-these files to a GNU/Linux or similar host; see the downloaded
+these files to a <acronym>GNU</acronym>/Linux or similar host;
+see the downloaded
<code>README</code> file for what to do next.</p>
<pre style="margin-left: 2em"><code><a href="http://www.gnu.org/software/wget/">wget</a> 'ftp://elsie.nci.nih.gov/pub/tz*.tar.gz'
<a href="http://www.gnu.org/software/gzip/">gzip</a> -dc tzcode*.tar.gz | <a href="http://www.gnu.org/software/tar/">tar</a> -xf -
@@ -92,7 +101,10 @@ mailing list, retrieve the <a
href="ftp://elsie.nci.nih.gov/pub/tzarchive.gz">archive of old
messages</a> (in gzip compressed format), or retrieve <a
href="ftp://munnari.oz.au/pub/oldtz/">archived older versions of code
-and data</a>.</p>
+and data</a>; there is also a smaller <a
+href="http://public.planetmirror.com/pub/timezone/"><abbr
+title="Hypertext Transfer Protocol">HTTP</abbr>
+mirror</a>.</p>
<p>
The Web has several other sources for time zone and daylight saving time data.
Here are some recent links that may be of interest.
@@ -104,14 +116,11 @@ 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>
-<li><a href="http://www.hilink.com.au/times/">Local Times Around the
-World</a></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://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>
</ul></li>
-<li><a href="http://www.holidayfestival.com/">The Worldwide Holiday
-&amp; Festival Site</a> lists DST-related clock changes along with
-holidays.</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
@@ -121,21 +130,29 @@ is a web interface to a time zone database derived from
<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 <a
-href="http://www.ietf.org/html.charters/calsch-charter.html">IETF
-Calendaring and Scheduling Working Group (calsch)</a> covers time zone
+(iCalendar)</a> specification published by the (now-concluded) <a
+href="http://www.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.</li>
<li>The <a
href="http://lists.w3.org/Archives/Public/www-rdf-calendar/">www-rdf-calendar</a>
-list discusses <a href="http://www.w3.org/RDF/">RDF</a>-based calendar
+list discusses <a
+href="http://www.w3.org/RDF/"><abbr
+title="Resource Description Framework">RDF</abbr></a>-based calendar
and group scheduling systems, and has a <a
href="http://www.w3.org/2002/12/cal/#tzd">workspace on time zone
data</a> converted from <code>tz</code>. An earlier <a
href="http://www.w3.org/2000/01/foo">schema</a> was sketched out by <a
href="http://www.w3.org/People/Berners-Lee/">Tim Berners-Lee</a>.</li>
<li><a
-href="http://www.calsch.org/ietf/archives/draft-ietf-calsch-many-xcal-02.txt">XCal</a>
-was a draft <a href="http://www.w3.org/XML/">XML</a> document type
+href="http://www.calsch.org/ietf/archives/draft-ietf-calsch-many-xcal-02.txt"><abbr
+title="XML DTD for iCalendar">XCal</abbr></a>
+was a draft <a
+href="http://www.w3.org/XML/"><abbr
+title="Extensible Markup Language">XML</abbr></a> document type
definition that corresponded to iCalendar.</li>
</ul>
<h2>Other <code>tz</code> compilers</h2>
@@ -144,51 +161,63 @@ definition that corresponded to iCalendar.</li>
Timezone Converter</a> describes a program Vzic that compiles
<code>tz</code> source into iCalendar-compatible VTIMEZONE files.
Vzic is freely
-available under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU
-General Public License (GPL)</a>.</li>
+available under the <a
+href="http://www.gnu.org/copyleft/gpl.html"><acronym>GNU</acronym>
+General Public License (<abbr
+title="General Public License">GPL</abbr>)</a>.</li>
<li><a
href="http://search.cpan.org/dist/DateTime-TimeZone/">DateTime::TimeZone</a>
contains a script <code>parse_olson</code> that compiles
<code>tz</code> source into <a href="http://www.perl.org/">Perl</a>
modules. It is part of the Perl <a
href="http://datetime.perl.org/">DateTime Project</a>, which is freely
-available under both the GPL and the Perl <a
-href="http://www.perl.com/language/misc/Artistic.html">Artistic
-License</a>. DateTime::TimeZone also contains a script
+available under both the <abbr>GPL</abbr> and the Perl Artistic
+License. DateTime::TimeZone also contains a script
<code>tests_from_zdump</code> that generates test cases for each clock
transition in the <code>tz</code> database.</li>
-<li><a href="http://oss.software.ibm.com/icu/">International Components for
-Unicode (ICU)</a> contains a C/C++ library for internationalization that
-has a compiler from <samp>tz</samp> source into an ICU-specific format.
-ICU is freely available under a BSD-style license.</li>
+<li><a href="http://oss.software.ibm.com/icu/"><abbr
+title="International Components for Unicode">ICU</abbr></a>
+contains a C/C++ library for internationalization that
+has a compiler from <samp>tz</samp> source
+into an <abbr>ICU</abbr>-specific format.
+<abbr>ICU</abbr> is freely available under a
+<abbr title="Berkeley Software Distribution">BSD</abbr>-style license.</li>
<li><a href="http://joda-time.sourceforge.net/">Joda Time - Java date
-and time API</a> contains a class
+and time <abbr title="Application Program Interface">API</abbr></a>
+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 BSD-style license.</li>
+is freely available under a <abbr>BSD</abbr>-style license.</li>
+<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>.
+It is freely available under a <abbr>BSD</abbr>-style license.</li>
</ul>
<h2>Other <code>tz</code> binary file readers</h2>
<ul>
-<li>The <a href="http://www.gnu.org/software/libc/">GNU C Library</a>
+<li>The <a
+href="http://www.gnu.org/software/libc/"><acronym>GNU</acronym> C
+Library</a>
has an independent, thread-safe implementation of
a <code>tz</code> binary file reader.
This library is freely available under the
<a href="http://www.gnu.org/copyleft/lesser.html">
-GNU Lesser General Public License (LGPL)</a>,
-and is widely used in GNU/Linux systems.</li>
+<acronym>GNU</acronym> Lesser General Public License
+(<abbr title="Lesser General Public License">LGPL</abbr>)</a>,
+and is widely used in <acronym>GNU</acronym>/Linux systems.</li>
<li><a href="http://www.bmsi.com/java/#TZ">ZoneInfo.java</a>
is a <code>tz</code> binary file reader written in Java.
-It is freely available under the GNU LGPL.</li>
+It is freely available under the <acronym>GNU</acronym>
+<abbr>LGPL</abbr>.</li>
<li><a href="http://s.keim.free.fr/tz/doc.html">Python time zones</a>
-is a <code>tz</code> binary file reader written in <a
-href="http://www.python.org/">Python</a>. It is freely available
-under a BSD-style license.</li>
+is a <code>tz</code> binary file reader written in Python.
+It is freely available under a <abbr>BSD</abbr>-style license.</li>
</ul>
<h2>Other <code>tz</code>-based time zone conversion software</h2>
<ul>
<li><a href="http://java.sun.com/">Sun Java</a> releases since 1.4
-contain a copy of a recent <samp>tz</samp> database in a Java-specific
-format.</li>
+contain a copy of a subset of a recent <samp>tz</samp> database in a
+Java-specific format.</li>
<li><a
href="http://www1.tip.nl/~t876506/AboutTimeZonesHC.html">HyperCard
time zones calculator</a> is a HyperCard stack.</li>
@@ -198,11 +227,11 @@ Microsoft Windows program.</li>
</ul>
<h2>Other time zone databases</h2>
<ul>
-<li><a href="http://www.astro.com/cgi-bin/atlw3/aq.cgi?lang=e">Atlas Query
-- Astrodienst</a> is Astrodienst's Web version of Shanks's
+<li><a href="http://www.astro.com/cgi/aq.cgi?lang=e">Atlas Query</a>
+is Astrodienst's Web version of Shanks's
excellent time zone history atlases published in both <a
-href="http://astrocom.com/software/pcatlas.php">computer</a> and <a
-href="http://astrocom.com/books/xrefa.php#SHANKS">book</a> form by <a
+href="http://astrocom.com/products/software.php?software_id=ibmwboth">computer
+and book form</a> by <a
href="http://astrocom.com/">Astro Communications Services</a>.</li>
<li><a href="http://worldtime.com/">WORLDTIME: interactive atlas,
time info, public holidays</a>
@@ -211,14 +240,14 @@ and public holidays in several hundred cities around the world.</li>
<li><a href="http://www.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 US Naval Observatory
-(USNO), used as the source
+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><a href="http://www.airportcitycodes.com/aaa/">Airlines, Airplanes
and Airports</a> lists current standard times for thousands of
airports around the world. This seems to be derived from
-the <a href="http://www.iata.org/sked/publications/">Standard
-Schedules Information Manual (SSIM)</a> of the
+the <a href="http://www.iata.org/ps/publications/9179.htm">Standard
+Schedules Information Manual</a> of the
the <a href="http://www.iata.org/">International Air Transport
Association</a>,
which gives current time zone rules for
@@ -227,7 +256,8 @@ all the airports served by commercial aviation.</li>
<h2>Maps</h2>
<ul>
<li>The <a href="http://www.odci.gov/">United States Central
-Intelligence Agency (CIA)</a> publishes a <a
+Intelligence Agency (<abbr
+title="Central Intelligence Agency">CIA</abbr>)</a> publishes a <a
href="http://www.odci.gov/cia/publications/factbook/reference_maps/pdf/time_zones.pdf">time
zone map</a>; the
<a
@@ -238,24 +268,29 @@ recent 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>
-<li><a href="http://worldtimezone.com/">World timezones map with
-current time</a>
+<li><a href="http://worldtimezone.com/">Current time around the world
+and standard time zones map of the world</a>
has several fancy time zone maps; it covers Russia particularly well.
-The maps' pictorial quality is not quite as good as the CIA's
+The maps' pictorial quality is not quite as good as the
+<abbr>CIA</abbr>'s
but the maps are more up to date.</li>
</ul>
<h2>Time zone boundaries</h2>
<ul>
+<li><a href="http://www.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-4.tiscali.nl/~t876506/Multizones.html">Time
zone boundaries for multizone countries</a> summarizes legal
boundaries between time zones within countries.</li>
<li>Manifold.net's <a
href="http://www.manifold.net/download/freemaps.html">Free Maps and
-GIS Data</a> includes a Manifold-format map of world time zone
-boundaries distributed under the GPL. The GeoCommunity's <a
-href="http://software.geocomm.com/data/intl_timezones.html">International
-Time Zones</a> publishes the same data in other formats.</li>
-<li>The US Geological Survey's National Atlas of the United States
+<acronym title="Geographic Information Systems">GIS</acronym>
+Data</a> includes a Manifold-format map of
+world time zone boundaries distributed under the
+<abbr>GPL</abbr>.</li>
+<li>The <abbr>US</abbr> Geological Survey's National Atlas of
+the United States
publishes the <a href="http://www.nationalatlas.gov/timeznm.html">Time
Zones of the United States</a> in the public domain.</li>
<li>The GeoCommunity lists several commercial sources for <a
@@ -267,8 +302,8 @@ Time Zones and Time Zone Data</a>.</li>
<li><a href="http://physics.nist.gov/time">A Walk through Time</a>
surveys the evolution of timekeeping.</li>
<li><a href="http://webexhibits.org/daylightsaving/">About Daylight
-Saving Time - History, rationale, laws and dates</a>
-is an overall history of DST.</li>
+Saving Time - History, rationale, laws &amp; dates</a>
+is an overall history of <abbr>DST</abbr>.</li>
<li><a href="http://toi.iriti.cnr.it/">The
Time of Internet</a>
describes time zones and daylight saving time,
@@ -283,10 +318,11 @@ Zone Concepts</a> discusses terminological issues behind time zones.</li>
<h2>National histories of legal time</h2>
<dl>
<dt>Australia</dt>
-<dd>The Community Relations Division of the New South Wales (NSW)
+<dd>The Community Relations Division of the New South Wales
+(<abbr title="New South Wales">NSW</abbr>)
Attorney General's Department maintains a <a
href="http://www.lawlink.nsw.gov.au/crd.nsf/pages/time2">history of
-daylight saving in NSW</a>.</dd>
+daylight saving in <abbr>NSW</abbr></a>.</dd>
<dt>Austria</dt>
<dd>The Federal Office of Metrology and Surveying publishes a
table of <a href="http://www.metrologie.at/pdf/sommerzeit.pdf"
@@ -304,7 +340,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_savings_e.html">Time
-Zones and Daylight Saving Time</a>.</dd>
+Zones &amp; Daylight Saving Time</a>.</dd>
<dt>Chile</dt>
<dd>WebExhibits publishes a <a
href="http://webexhibits.org/daylightsaving/chile.html"
@@ -355,40 +391,59 @@ of summer time dates</a>.</dd>
href="http://literature.agilent.com/litwebbin/purl.cgi?org_id=tmo&amp;pub_id=5965-7984E">The
Science of Timekeeping</a> is a thorough introduction
to the theory and practice of precision timekeeping.</li>
-<li><a href="http://www.ntp.org/">NTP: The Network Time Protocol</a>
+<li><a href="http://www.ntp.org/"><abbr
+title="Network Time Protocol">NTP</abbr>: The Network
+Time Protocol</a>
discusses how to synchronize clocks of
Internet hosts.</li>
-<li><a href="http://gauss.gge.unb.ca/GMT.UT.and.the.RGO.txt"
-charset="macintosh">A
-Few Facts Concerning GMT, UT, and the RGO</a>
-answers questions like "What is the difference between GMT and UTC?"</li>
+<li><a href="http://gauss.gge.unb.ca/GMT.UT.and.the.RGO.html">A Few
+Facts Concerning <abbr title="Greenwich Mean Time">GMT</abbr>, <abbr
+title="Universal Time">UT</abbr>, and
+the <abbr title="Royal Greenwich Observatory">RGO</abbr></a>
+answers questions like "What is the
+difference between <abbr>GMT</abbr> and <abbr>UTC</abbr>?"</li>
<li><a
href="http://www.gb.nrao.edu/~rfisher/Ephemerides/times.html">Astronomical
-Times</a> explains more abstruse astronomical time scales like TT, TCG,
-and TDB.</li>
-<li>The <a href="http://www.iau.org/">IAU</a>'s <a
-href="http://www.iau-sofa.rl.ac.uk/">Standards Of Fundamental
-Astronomy</a> (SOFA) initiative publishes Fortran code for converting
-among time scales like TAI, TDB, TT and UTC.</li>
+Times</a> explains more abstruse astronomical time scales like
+<abbr title="Terrestrial Dynamic Time">TDT</abbr>,
+<abbr title="Geocentric Coordinate Time">TCG</abbr>, and
+<abbr title="Barycentric Dynamic Time">TDB</abbr>.</li>
+<li>The <a href="http://www.iau.org/"><abbr
+title="International Astronomical Union">IAU</abbr></a>'s <a
+href="http://www.iau-sofa.rl.ac.uk/"><acronym
+title="Standards Of Fundamental Astronomy">SOFA</acronym></a>
+initiative publishes Fortran
+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
Space Flight - Reference Systems - Time Conventions</a>
briefly explains interplanetary space flight timekeeping.</li>
<li><a
href="http://www.giss.nasa.gov/tools/mars24/help/notes.html">Technical
Notes on Mars Solar Time as Adopted by the Mars24 Sunclock</a> briefly
-describes Mars Coordinated Time (MTC) and the diverse local time
+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://hpiers.obspm.fr/eop-pc/products/bulletins/bulletins.html">Bulletins
-maintained by the IERS EOP (PC)</a> contains official publications of
+maintained by the
+<abbr title="International Earth Rotation Service">IERS</abbr>
+<abbr title="Earth Orientation Parameters">EOP</abbr>
+(<abbr title="Product Center">PC</abbr>)</a> contains official publications of
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> covers McCarthy and Klepczynski's proposal
-to discontinue leap seconds, published in <a
-href="http://www.gpsworld.com/">GPS World</a> <strong>10</strong>, 11
+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>, published in <a
+href="http://www.gpsworld.com/"><abbr
+title="Global Positioning System">GPS</abbr> World</a>
+<strong>10</strong>, 11
(1999-11), 50&ndash;57 and discussed further in R. A. Nelson et al.,
<a href="http://www.cl.cam.ac.uk/~mgk25/time/metrologia-leapsecond.pdf">The
leap second: its history and possible future</a>,
@@ -403,32 +458,46 @@ contentious issue.</li>
<li>
<a href="http://www.cl.cam.ac.uk/~mgk25/iso-time.html">A Summary of
the International Standard Date and Time Notation</a> is a good
-summary of ISO
+summary of
+<abbr title="International Organization for Standardization">ISO</abbr>
8601:1988 - Data elements and interchange formats - Information interchange
- Representation of dates and times (which has been superseded by
-<a href="http://www.iso.org/iso/en/CatalogueDetailPage.CatalogueDetail?CSNUMBER=26780">ISO 8601:2000</a>).</li>
+<a
+href="http://www.iso.org/iso/en/CatalogueDetailPage.CatalogueDetail?CSNUMBER=26780"><abbr>ISO</abbr>
+8601:2000</a>).</li>
<li>
Section 3.3 of <a
-href="ftp://ftp.rfc-editor.org/in-notes/rfc2822.txt">Internet RFC 2822</a>
+href="ftp://ftp.rfc-editor.org/in-notes/rfc2822.txt">Internet
+<abbr title="Request For Comments">RFC</abbr> 2822</a>
specifies the time notation used in email and <a
-href="ftp://ftp.rfc-editor.org/in-notes/rfc2616.txt">HTTP</a> headers.</li>
+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 RFC
-3339</a> specifies an ISO 8601 profile for use in new Internet
+<a href="ftp://ftp.rfc-editor.org/in-notes/rfc3339.txt">Internet
+<abbr>RFC</abbr> 3339</a> specifies an <abbr>ISO</abbr> 8601
+profile for use in new Internet
protocols.</li>
<li>
<a href="http://www.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>
-Alphabetic time zone abbreviations should not be used as unique
-identifiers for UTC offsets as they are ambiguous in practice. For
-example, "EST" denotes 5 hours behind UTC in English-speaking North
-America, but it denotes 10 or 11 hours ahead of UTC in Australia;
-and French-speaking North Americans prefer "HNE" to "EST". For
-compatibility with <a href="http://www.pasc.org/#POSIX">POSIX</a> the
-<code>tz</code> database contains English abbreviations for all time
-stamps but in many cases these are merely inventions of the database
+<li><a
+href="http://oss.software.ibm.com/cvs/icu/~checkout~/icuhtml/design/formatting/time_zone_localization.html">Time
+Zone Localization</a> is a proposed mechanism for localizing time zone
+labels and abbreviations; for example, one might use it to specify
+Russian translations for "Eastern European Summer Time",
+"<abbr title="Eastern European Summer Time">EEST</abbr>",
+and <code>Europe/Bucharest</code>.</li>
+<li> Alphabetic time zone abbreviations should not be used as unique
+identifiers for <abbr>UTC</abbr> offsets as they are ambiguous in
+practice. For example, "<abbr>EST</abbr>" denotes 5 hours behind
+<abbr>UTC</abbr> in English-speaking North America, but it denotes 10
+or 11 hours ahead of <abbr>UTC</abbr> in Australia; and
+French-speaking North Americans prefer
+"<abbr title="Heure Normale de l'Est">HNE</abbr>" to
+"<abbr>EST</abbr>". For <abbr>POSIX</abbr> the <code>tz</code>
+database contains English abbreviations for all time stamps but in
+many cases these are merely inventions of the database
maintainers.</li>
</ul>
<h2>Related indexes</h2>
@@ -436,8 +505,10 @@ maintainers.</li>
<li><a href="tz-art.htm">Time and the Arts</a></li>
<li><a href="http://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! Science &gt; Measurements and Units &gt; 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!
+Science &gt; Measurements and Units &gt; Time</a></li>
</ul>
</body>
</html>
diff --git a/lib/libc/time/zdump.c b/lib/libc/time/zdump.c
index baaec05b26a..df9669979a9 100644
--- a/lib/libc/time/zdump.c
+++ b/lib/libc/time/zdump.c
@@ -5,8 +5,8 @@
#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
static char elsieid[] = "@(#)zdump.c 7.31";
-static char rcsid[] = "$OpenBSD: zdump.c,v 1.13 2004/04/01 11:37:02 jmc Exp $";
-#endif /* LIBC_SCCS and not lint */
+static char rcsid[] = "$OpenBSD: zdump.c,v 1.14 2004/10/18 22:33:43 millert Exp $";
+static char elsieid[] = "@(#)zdump.c 7.40";
/*
** This code has been made independent of the rest of the time
@@ -15,7 +15,7 @@ static char rcsid[] = "$OpenBSD: zdump.c,v 1.13 2004/04/01 11:37:02 jmc Exp $";
*/
#include "stdio.h" /* for stdout, stderr, perror */
-#include "string.h" /* for strcpy */
+#include "string.h" /* for strlcpy */
#include "sys/types.h" /* for time_t */
#include "time.h" /* for struct tm */
#include "stdlib.h" /* for exit, malloc, atoi */
@@ -72,16 +72,15 @@ static char rcsid[] = "$OpenBSD: zdump.c,v 1.13 2004/04/01 11:37:02 jmc Exp $";
#define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
#endif /* !defined isleap */
-#if HAVE_GETTEXT - 0
+#if HAVE_GETTEXT
#include "locale.h" /* for setlocale */
#include "libintl.h"
-#endif /* HAVE_GETTEXT - 0 */
+#endif /* HAVE_GETTEXT */
#ifndef GNUC_or_lint
#ifdef lint
#define GNUC_or_lint
-#endif /* defined lint */
-#ifndef lint
+#else /* !defined lint */
#ifdef __GNUC__
#define GNUC_or_lint
#endif /* defined __GNUC__ */
@@ -91,8 +90,7 @@ static char rcsid[] = "$OpenBSD: zdump.c,v 1.13 2004/04/01 11:37:02 jmc Exp $";
#ifndef INITIALIZE
#ifdef GNUC_or_lint
#define INITIALIZE(x) ((x) = 0)
-#endif /* defined GNUC_or_lint */
-#ifndef GNUC_or_lint
+#else /* !defined GNUC_or_lint */
#define INITIALIZE(x)
#endif /* !defined GNUC_or_lint */
#endif /* !defined INITIALIZE */
@@ -104,11 +102,11 @@ static char rcsid[] = "$OpenBSD: zdump.c,v 1.13 2004/04/01 11:37:02 jmc Exp $";
*/
#ifndef _
-#if HAVE_GETTEXT - 0
+#if HAVE_GETTEXT
#define _(msgid) gettext(msgid)
-#else /* !(HAVE_GETTEXT - 0) */
+#else /* !HAVE_GETTEXT */
#define _(msgid) msgid
-#endif /* !(HAVE_GETTEXT - 0) */
+#endif /* !HAVE_GETTEXT */
#endif /* !defined _ */
#ifndef TZ_DOMAIN
@@ -118,8 +116,7 @@ static char rcsid[] = "$OpenBSD: zdump.c,v 1.13 2004/04/01 11:37:02 jmc Exp $";
#ifndef P
#ifdef __STDC__
#define P(x) x
-#endif /* defined __STDC__ */
-#ifndef __STDC__
+#else /* !defined __STDC__ */
#define P(x) ()
#endif /* !defined __STDC__ */
#endif /* !defined P */
@@ -137,6 +134,7 @@ 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));
+static void dumptime P((const struct tm * tmp));
int
main(argc, argv)
@@ -158,13 +156,13 @@ char * argv[];
struct tm newtm;
INITIALIZE(cuttime);
-#if HAVE_GETTEXT - 0
+#if HAVE_GETTEXT
(void) setlocale(LC_MESSAGES, "");
#ifdef TZ_DOMAINDIR
(void) bindtextdomain(TZ_DOMAIN, TZ_DOMAINDIR);
-#endif /* defined(TEXTDOMAINDIR) */
+#endif /* defined TEXTDOMAINDIR */
(void) textdomain(TZ_DOMAIN);
-#endif /* HAVE_GETTEXT - 0 */
+#endif /* HAVE_GETTEXT */
progname = argv[0];
vflag = 0;
cutoff = NULL;
@@ -326,7 +324,7 @@ struct tm * oldp;
return -delta(oldp, newp);
result = 0;
for (tmy = oldp->tm_year; tmy < newp->tm_year; ++tmy)
- result += DAYSPERNYEAR + isleap(tmy + TM_YEAR_BASE);
+ result += DAYSPERNYEAR + isleap(tmy + (long) TM_YEAR_BASE);
result += newp->tm_yday - oldp->tm_yday;
result *= HOURSPERDAY;
result += newp->tm_hour - oldp->tm_hour;
@@ -346,10 +344,12 @@ int v;
struct tm * tmp;
(void) printf("%-*s ", (int) longest, zone);
- if (v)
- (void) printf("%.24s UTC = ", asctime(gmtime(&t)));
+ if (v) {
+ dumptime(gmtime(&t));
+ (void) printf(" UTC = ");
+ }
tmp = localtime(&t);
- (void) printf("%.24s", asctime(tmp));
+ dumptime(tmp);
if (*abbr(tmp) != '\0')
(void) printf(" %s", abbr(tmp));
if (v) {
@@ -373,3 +373,37 @@ struct tm * tmp;
result = tzname[tmp->tm_isdst];
return (result == NULL) ? &nada : result;
}
+
+static void
+dumptime(timeptr)
+register const struct tm * timeptr;
+{
+ static const char wday_name[][3] = {
+ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+ };
+ static const char mon_name[][3] = {
+ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+ };
+ register const char * wn;
+ register const char * mn;
+
+ /*
+ ** The packaged versions of localtime and gmtime never put out-of-range
+ ** values in tm_wday or tm_mon, but since this code might be compiled
+ ** with other (perhaps experimental) versions, paranoia is in order.
+ */
+ if (timeptr->tm_wday < 0 || timeptr->tm_wday >=
+ (int) (sizeof wday_name / sizeof wday_name[0]))
+ wn = "???";
+ else wn = wday_name[timeptr->tm_wday];
+ if (timeptr->tm_mon < 0 || timeptr->tm_mon >=
+ (int) (sizeof mon_name / sizeof mon_name[0]))
+ mn = "???";
+ else mn = mon_name[timeptr->tm_mon];
+ (void) printf("%.3s %.3s%3d %.2d:%.2d:%.2d %ld",
+ wn, mn,
+ timeptr->tm_mday, timeptr->tm_hour,
+ timeptr->tm_min, timeptr->tm_sec,
+ timeptr->tm_year + (long) TM_YEAR_BASE);
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 17:49:22 +0000