aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2010-09-09 07:48:01 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2010-09-09 07:48:01 +0000
commitdfca6b5ed7757d91368c5aace6705a1678825db7 (patch)
treeb231514883dd6c5e1f9bd00596d40b765da65554
parentf9c13c1a3125c3b582cf1cea2cfb61ba7c5be8b5 (diff)
downloadsrc-dfca6b5ed7757d91368c5aace6705a1678825db7.tar.gz
src-dfca6b5ed7757d91368c5aace6705a1678825db7.zip
Vendor import of tzcode2010lvendor/tzcode/tzcode2010l
Notes
Notes: svn path=/vendor/tzcode/dist/; revision=212353 svn path=/vendor/tzcode/tzcode2010l/; revision=212354; tag=vendor/tzcode/tzcode2010l
-rw-r--r--libc/stdtime/localtime.c26
-rw-r--r--unused/tz-link.htm15
-rw-r--r--zic/zdump.c2
3 files changed, 25 insertions, 18 deletions
diff --git a/libc/stdtime/localtime.c b/libc/stdtime/localtime.c
index f5833e85b790..d397472dcdfd 100644
--- a/libc/stdtime/localtime.c
+++ b/libc/stdtime/localtime.c
@@ -5,7 +5,7 @@
#ifndef lint
#ifndef NOID
-static char elsieid[] = "@(#)localtime.c 8.13";
+static char elsieid[] = "@(#)localtime.c 8.14";
#endif /* !defined NOID */
#endif /* !defined lint */
@@ -274,34 +274,28 @@ settzname(void)
return;
}
#endif /* defined ALL_STATE */
- for (i = 0; i < sp->typecnt; ++i) {
- register const struct ttinfo * const ttisp = &sp->ttis[i];
+ /*
+ ** And to get the latest zone names into tzname. . .
+ */
+ for (i = 0; i < sp->timecnt; ++i) {
+ register const struct ttinfo * const ttisp =
+ &sp->ttis[
+ sp->types[i]];
tzname[ttisp->tt_isdst] =
&sp->chars[ttisp->tt_abbrind];
#ifdef USG_COMPAT
if (ttisp->tt_isdst)
daylight = 1;
- if (i == 0 || !ttisp->tt_isdst)
+ if (!ttisp->tt_isdst)
timezone = -(ttisp->tt_gmtoff);
#endif /* defined USG_COMPAT */
#ifdef ALTZONE
- if (i == 0 || ttisp->tt_isdst)
+ if (ttisp->tt_isdst)
altzone = -(ttisp->tt_gmtoff);
#endif /* defined ALTZONE */
}
/*
- ** And to get the latest zone names into tzname. . .
- */
- for (i = 0; i < sp->timecnt; ++i) {
- register const struct ttinfo * const ttisp =
- &sp->ttis[
- sp->types[i]];
-
- tzname[ttisp->tt_isdst] =
- &sp->chars[ttisp->tt_abbrind];
- }
- /*
** Finally, scrub the abbreviations.
** First, replace bogus characters.
*/
diff --git a/unused/tz-link.htm b/unused/tz-link.htm
index 8c094824d95d..26235100b98b 100644
--- a/unused/tz-link.htm
+++ b/unused/tz-link.htm
@@ -18,7 +18,7 @@
<body>
<h1>Sources for Time Zone and Daylight Saving Time Data</h1>
<address>
-@(#)tz-link.htm 8.26
+@(#)tz-link.htm 8.30
</address>
<p>
This file is in the public domain, so clarified as of
@@ -89,6 +89,8 @@ 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.
+Each version is a four-digit year followed by lower-case letters
+(a through z, then za through zz, then zza through zzz, and so on).
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;
@@ -349,6 +351,17 @@ href="http://unicode.org/cldr/data/diff/supplemental/windows_tzid.html">Windows
&rarr; Tzid table</a> maintained by the <abbr
title="Common Locale Data Repository">CLDR</abbr> data mentioned
below.</li>
+<li>
+<a href="http://code.google.com/p/tzdata/">
+http://code.google.com/p/tzdata/
+</a>
+provides programming-language-specific representations of timezone
+data. Currently this includes XML, PHP, Ruby, Javascript, JSON and CSV
+formatted data. The repository is updated as soon as the FTP
+distribution is updated. All data can be downloaded as a zip and/or it
+can be obtained/synced via anonymous SVN. Data is made available under
+the MIT license. (From Rich Tibbett.)
+</li>
</ul>
<h2>Maps</h2>
<ul>
diff --git a/zic/zdump.c b/zic/zdump.c
index 7985b9269da9..67bed06bc398 100644
--- a/zic/zdump.c
+++ b/zic/zdump.c
@@ -238,7 +238,7 @@ const char * const zone;
static void
usage(stream, status)
FILE * const stream;
-const int status
+const int status;
{
(void) fprintf(stream,
_("%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n\