- tz - lists.iana.org

Rerun of proposed localtime.c changes
by Arthur David Olson Nov. 25, 2012

Nov. 25, 2012

Now that silly season seems to be over, two reruns. First, changes to localtime.c (both attached and below, with tabs mangled). These are designed to address two issues noted earlier this year by Doug Bailey: ensuring that "tzname" values are set, and getting proper behavior when the software is being run on an unsigned-time_t system but is using data files generated on a signed-time_t system. These changes have been updated to be relative to tz2012j. --ado *** tz2012j/localtime.c 2012-10-26 20:37:42.000000000 -0400 --- tznew/localtime.c 2012-11-25 16:11:23.833188100 -0500 *************** *** 271,276 **** --- 271,281 ---- /* ** And to get the latest zone names into tzname. . . */ + for (i = 0; i < sp->typecnt; ++i) { + register const struct ttinfo * const ttisp = &sp->ttis[i]; + + tzname[ttisp->tt_isdst] = &sp->chars[ttisp->tt_abbrind]; + } for (i = 0; i < sp->timecnt; ++i) { register const struct ttinfo * const ttisp = &sp->ttis[ *************** *** 479,498 **** ** signed time_t system but using a data file with ** unsigned values (or vice versa). */ ! for (i = 0; i < sp->timecnt - 2; ++i) ! if (sp->ats[i] > sp->ats[i + 1]) { ! ++i; if (TYPE_SIGNED(time_t)) { /* ** Ignore the end (easy). */ ! sp->timecnt = i; } else { /* ** Ignore the beginning (harder). */ register int j; for (j = 0; j + i < sp->timecnt; ++j) { sp->ats[j] = sp->ats[j + i]; sp->types[j] = sp->types[j + i]; --- 484,514 ---- ** signed time_t system but using a data file with ** unsigned values (or vice versa). */ ! for (i = 0; i < sp->timecnt; ++i) ! if ((i < sp->timecnt - 1 && ! sp->ats[i] > sp->ats[i + 1]) || ! (i == sp->timecnt - 1 && !TYPE_SIGNED(time_t) && ! sp->ats[i] > ! ((stored == 4) ? INT32_MAX : INT64_MAX))) { if (TYPE_SIGNED(time_t)) { /* ** Ignore the end (easy). */ ! sp->timecnt = i + 1; } else { /* ** Ignore the beginning (harder). */ register int j; + /* + ** Keep the record right before the + ** epoch boundary, + ** but tweak it so that it starts + ** right with the epoch + ** (thanks to Doug Bailey). + */ + sp->ats[i] = 0; for (j = 0; j + i < sp->timecnt; ++j) { sp->ats[j] = sp->ats[j + i]; sp->types[j] = sp->types[j + i];

1 0

Make bug-reporting address more configurable
by Joseph S. Myers Nov. 12, 2012

Nov. 12, 2012

When distributing programs from tzcode as part of a larger software distribution, it can be desirable to redirect user bug reports to the bug-reporting system of that distribution as a whole (with a view to then passing along reports or fixes where it's determined that they don't relate to local modifications or packaging). This patch moves the bug-reporting address from being hardcoded in various strings to being in variables that are more convenient to modify in the packaging process. (Some people may wish to use an email address for bug reports, some a URL to a bug tracker and some a URL for instructions on bug reporting. But making the accompanying text configurable rather than just the address bit, to accommodate those variations better, would make things worse for i18n.) diff --git a/Makefile b/Makefile index 5a17164..cbda727 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ PACKAGE= tzcode # Version numbers of the code and data distributions. VERSION= 2012i +# Email address for bug reports. +BUGEMAIL= tz(a)iana.org + # Change the line below for your time zone (after finding the zone you want in # the time zone files, or adding it to a time zone file). # Alternately, if you discover you've got the wrong time zone, you can just @@ -344,7 +347,8 @@ INSTALL: ALL install date.1 version.h: (echo 'static char const PKGVERSION[]="($(PACKAGE)) ";' && \ - echo 'static char const TZVERSION[]="$(VERSION)";') >$@ + echo 'static char const TZVERSION[]="$(VERSION)";' && \ + echo 'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";') >$@ zdump: $(TZDOBJS) $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) diff --git a/tzselect.ksh b/tzselect.ksh index 51bafc1..8e66b44 100644 --- a/tzselect.ksh +++ b/tzselect.ksh @@ -2,6 +2,7 @@ PKGVERSION='(tzcode) ' TZVERSION=see_Makefile +REPORT_BUGS_TO=tz(a)iana.org # Ask the user about the time zone, and output the resulting TZ value to stdout. # Interact with the user via stderr and stdin. @@ -44,7 +45,7 @@ if [ "$1" = "--help" ]; then Usage: tzselect Select a time zone interactively. -Report bugs to tz(a)iana.org. +Report bugs to $REPORT_BUGS_TO. EOF exit elif [ "$1" = "--version" ]; then diff --git a/zdump.c b/zdump.c index 626b09d..9255aff 100644 --- a/zdump.c +++ b/zdump.c @@ -272,8 +272,8 @@ usage(FILE * const stream, const int status) (void) fprintf(stream, _("%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n\ \n\ -Report bugs to tz(a)iana.org.\n"), - progname, progname); +Report bugs to %s.\n"), + progname, progname, REPORT_BUGS_TO); exit(status); } diff --git a/zic.c b/zic.c index 1964a89..a5202a1 100644 --- a/zic.c +++ b/zic.c @@ -426,8 +426,8 @@ usage(FILE *stream, int status) [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\ \t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n\ \n\ -Report bugs to tz(a)iana.org.\n"), - progname, progname); +Report bugs to %s.\n"), + progname, progname, REPORT_BUGS_TO); exit(status); } -- Joseph S. Myers joseph(a)codesourcery.com

2 1

tzcode2012j and tzdata2012j available
by Paul Eggert Nov. 12, 2012

Nov. 12, 2012

The 2012j release of the tz code and data is available. It reflects the following changes recently circulated on the tz mailing list: Libya moved to CET this weekend, but with DST planned next year. (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) Signatures now have the extension .asc, not .sign, as that's more standard. (Thanks to Phil Pennock.) The output of 'zdump --version', and of 'zic --version', now uses a format that is more typical for --version. (Thanks to Joseph S. Myers.) The output of 'tzselect --help', 'zdump --help', and 'zic --help' now uses tz(a)iana.org rather than the old elsie address. zic -v now complains about abbreviations that are less than 3 or more than 6 characters, as per Posix. Formerly, it checked for abbreviations that were more than 3. 'make public' no longer puts its temporary directory under /tmp, and uses the just-built zic rather than the system zic. Various fixes to documentation and commentary. For this release I did not find the time to carefully review Joseph S. Myers's suggestion about BUGEMAIL in <http://mm.icann.org/pipermail/tz/2012-November/018452.html>. At first glance the suggestion seems like a good one, and I'd like to put it into the next release. Here are links to the release files: http://www.iana.org/time-zones/repository/releases/tzcode2012j.tar.gz http://www.iana.org/time-zones/repository/releases/tzdata2012j.tar.gz ftp://ftp.iana.org/tz/releases/tzcode2012j.tar.gz ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz Each release file has a GPG signature, which can be retrieved by appending ".asc" to the above URLs. Copies of these signatures are appended to this message. As usual, links to the latest release files are here: http://www.iana.org/time-zones/repository/tzcode-latest.tar.gz http://www.iana.org/time-zones/repository/tzdata-latest.tar.gz ftp://ftp.iana.org/tz/tzcode-latest.tar.gz ftp://ftp.iana.org/tz/tzdata-latest.tar.gz This release corresponds to commit dec96c09a2e3f735292a49929df29028d26c4f1c in the unofficial github repository at <https://github.com/eggert/tz>. Here are the GPG checksums for the release files: -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQobHpAAoJEO2X6Q5iqn40P8oQAIrQuNzzbLe6vcegbNAE1CME NwSqANNbsehf6vC6C/n5SLl6R329wFYZ4XXYSgzOVqKMW37IjULO+/xIxIeRdJ2h soFBd3G4AVM7bMlVPEwXe6rHeQ4x0KofejJIwT+B1gUrWCtaJ/3cse+0qwoGAi9t iahC/9h7ERNUy5S5ZJ228ZDrwq9vtLxtBLSZby7a/g11jUM+OVWwHrJAaj9d8PR/ zv0OKtZ1jhJdvcKgdnpdVMAC3Nvp+hNNae9UvLxtoTGn8WVG54zXaRVgBwAol7// WrZQHidJXPLg9mbvpNgFleMN5IJrOXh3P2kW0hr9LkeZFlNeuKWQ3YxjEvz0EKe2 0Oi30OYZlyfEFALMSvpuQ0LnxM7WSTkecrh4LbL3OZM2bzoC0TNqgFb1GX9hIc0h VV0StBUB9H0mGud4TA8WYzoX5oO7Obz+mogOZ754TKQ7aqAzWveEaQHSwjTBst6O VC7htCKT5pwUY0v+v9vp+as2qMplTMBMNDegSIYHEwyWVdHpZnRtBcGwd56exWCa MZiIhdZ9txmyCcxbAstZym/crvHpRxR1jabOShlRzuqFAuqOO0PkrdUUcPHGGY9P J1wJvDThZr6il/oR5/m6V+9OcKc4qDC9h8F8sKMq7xcmzQiTTscnvwmE6QQfDKlO PAN37ua5YwawD9kErq1z =tjIa -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQobH2AAoJEO2X6Q5iqn40kBsP/j8AqTr5mkZDfqVFcoIvR4ej HChstB5X8RRgNyqk/89t5dwkVTSOmJ4f2kqhXnBRbq93I+KGT0STHZatYMPXkuKV pGWYkpdW1esyBrPT8ypqC3yWkBw3ZXoojT+CeeKifLLAyUGwoik9IfZz8DMtbm/s YdTP3Iv9sjwcybmGWLeRFq4htXOKtIzKAsTKJtfEjvdUBNgdl8McOsytUp3jMoPh /UNL2K3zIzBSX/keUXWnKv87ZWjmgBp0QpAZ+WecQcuLLyasTo8ktuT+7LCD/W8k jPq5itr3WP43tjvE6BA1mIyKdwBuYw6yhe1+acd/E6n3PJvxnLQYvER24v8B/4OQ dJtGEO2zzUZEfVYrfHeTdIu8gdE22MjrbhvB8rF1g8STRoNgligY0Owb7kGK9w0F ktX8z6JMVd2umca5mfkW2T9OH4Tr+EXYK1vSn1BOrUEcIJr2Li3XwZbs4s7fQgMT mfN97ce8+CapUmUN+D0Ce0aSlkU5IN27zZvORar3N8jKh3F8ls5Ge17M2tEPHRtW DWrRztFlRMwW0keHhna6+Q1+PzGxUAxGhWL7O73BddUD9gKo7nu9nbNc4cdeKul8 rRUctp5BEu4GpBqi7LLscLXEe0vZJWAgjX4FTfY17+MzFyKv0SfT3sDeuOiH8Ckb LihrCaAvM539PSqk3fWA =0LL/ -----END PGP SIGNATURE-----

1 0

Re: [tz] tz Digest, Vol 14, Issue 10
by Andy McDonald Nov. 12, 2012

Nov. 12, 2012

On 12/11/2012 7:00 AM, tz-request(a)iana.org wrote: > Today's Topics: > > 1. [PATCH] Update documentation. (Paul Eggert) I thought it was too minor to mention, but since we're on the topic: FoxClocks now lives at http://foxclocks.org, and is available for Mozilla Firefox, Thunderbird and Google Chrome (Sunbird is no longer supported). It would be great if the documentation could reflect this. Andy

1 0

[PATCH] Update documentation.
by Paul Eggert Nov. 12, 2012

Nov. 12, 2012

Here are some documentation updates I'd like to fold into the next release. * tz-link.htm: Prune no-longer-working URLs, update URLs that got moved, sort a bit. The most-important casualty is the Norwegian Meteorological Institute's web page for Summer time in Norway, formerly at <http://met.no/met/met_lex/q_u/sommertid.html>: it's no longer there and I can't find out where it moved to, if anywhere. * tzfile.5: Fix minor grammar problem. --- tz-link.htm | 173 +++++++++++++++++++++-------------------------------------- tzfile.5 | 2 +- 2 files changed, 63 insertions(+), 112 deletions(-) diff --git a/tz-link.htm b/tz-link.htm index 2690e1f..0d5d7da 100644 --- a/tz-link.htm +++ b/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="2012-10-28"> +<meta name="DC.Date" content="2012-11-12"> <meta name="DC.Description" content="Sources of information about time zones and daylight saving time"> <meta name="DC.Identifier" @@ -101,11 +101,13 @@ gzip -dc tzdata-latest.tar.gz | tar -xf - </code></pre> <p> The code and data files can also be obtained from the -<a href="http://www.iana.org">IANA</a> -<a href="http://www.iana.org/time-zones">timezone web page</a>. +<a href="http://www.iana.org/time-zones">timezone web page</a> +of the <a href="http://www.iana.org">Internet Assigned Numbers +Authority (IANA)</a>. An <a href="https://github.com/eggert/tz">unofficial development repository</a> of the code and data is available -in <a href="http://git-scm.com/">Git</a> form; be careful, as this +in <a href="http://git-scm.com/">Git</a> form +from <a href="https://github.com/">GitHub</a>; be careful, as this repository is less well tested and probably contains more errors. <p> The code lets you compile the <code>tz</code> source files into @@ -118,30 +120,19 @@ send changes to the <a href="mailto:tz@iana.org">time zone mailing list</a>. You can also <a href="http://news.gmane.org/gmane.comp.time.tz">browse recent messages</a> sent to the mailing list, <a -href="https://mm.icann.org/mailman/listinfo/tz">subscribe</a> to it. -browse the <a +href="https://mm.icann.org/mailman/listinfo/tz">subscribe</a> to it, +and browse the <a href="http://mm.icann.org/pipermail/tz/">archive of old -messages</a> (message by message or in gzip compressed format), -or retrieve <a -href="ftp://ftp.iana.org/tz/releases/">archived older versions of code -and data</a>.</p> +messages</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. +Here are some 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://permatime.com"> -Permatime</a> -is a service for generating and viewing links that refer to a -particular point in time and can be displayed in multiple timezones. -It uses the ruby tzinfo gem. -(From Tim Diggins, 2009-11-03.) -</li> <li><a href="http://twiki.org/cgi-bin/xtra/tzdatepick.html">Date and Time Gateway</a> lets you see the <code>TZ</code> values directly.</li> <li><a @@ -151,10 +142,13 @@ Time in 1000 Places</a> uses descriptions of the values.</li> uses a pulldown menu.</li> <li><a href="http://home.tiscali.nl/~t876506/TZworld.html">Complete timezone information for all countries</a> displays tables of DST rules. -<li><a href="http://timeanddate.com/worldclock/">The World Clock - +<li><a href="http://timeanddate.com/worldclock/">The World Clock – Time Zones</a> lets you sort zone names and convert times.</li> -<li><a href="http://daylight-savings-time.info/">Graphical Display of -Time Zones and Daylight Saving Times</a> shows a graph of time +<li><a href="http://permatime.com/">Permatime</a> generates and views +links that refer to a particular point in time and can be displayed in +multiple timezones.</li> +<li><a href="http://daylight-savings-time.info/">Daylight Saving Time info</a> +shows a graph of time difference versus time for any pair of locations.</li> <li>The <a href="http://worldtimeengine.com/">World Time Engine</a> also contains data about time zone boundaries; it supports queries via place @@ -175,7 +169,7 @@ 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://calconnect.org/">Calendaring and Scheduling +<a href="http://calconnect.org/">CalConnect, The Calendaring and Scheduling Consortium</a> is promoting further work in this area. <a href="http://calconnect.org/publications/icalendartimezoneproblemsandrecommendati…">iCalendar TIMEZONE Problems and Recommendations</a> offers guidelines and @@ -203,7 +197,7 @@ href="http://www.w3.org/2000/01/foo">schema</a> was sketched out.</li> </ul> <h2>Other <code>tz</code> compilers</h2> <ul> -<li><a href="http://www.dachaplin.dsl.pipex.com/vzic/">Vzic iCalendar +<li><a href="http://sourceforge.net/projects/vzic/">Vzic iCalendar Timezone Converter</a> describes a <a href="http://en.wikipedia.org/wiki/C_%28programming_language%29">C</a> program that compiles @@ -250,9 +244,9 @@ compiles <code>tz</code> source into It is freely available under the <abbr title="Massachusetts Institute of Technology">MIT</abbr> license.</li> <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 +Library</a> is +a <a href="http://en.wikipedia.org/wiki/Smalltalk">Smalltalk</a> class +library that compiles <code>tz</code> source into a time zone repository 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> @@ -294,7 +288,7 @@ Toolkit</a> applications like <a 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>. +href="https://addons.mozilla.org/en-US/thunderbird/addon/lightning/">Lightning</a>. It displays multiple clocks in the application window, and has a mapping interface to <a href="http://earth.google.com/">Google Earth</a>. It is freely available under the <abbr>GPL</abbr>.</li> @@ -303,18 +297,17 @@ 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://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 -are well supported; historical data are compiled into the runtime but -are not easily accessible.</li> -<li><a href="http://java.sun.com/">Sun Java</a> releases since 1.4 +<li><a href="http://www.oracle.com/us/technologies/java/overview/index.html">Oracle +Java</a> releases since 1.4 contain a copy of a subset of a recent <code>tz</code> database in a Java-specific format.</li> <li><a href="http://kimmo.suominen.com/sw/timezone/">Time Zone</a> is 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.relativedata.com/time-zone-master">Time Zone +Master</a> is a Microsoft Windows clock program that can automatically +download, compile and use the <code>tzdata<var>D</var>.tar.gz</code> +files as they are released. The Basic version is free.</li> <li><a href="http://veladg.com/velaterra.html">VelaTerra</a> is a Mac OS X program. Its developers @@ -323,36 +316,19 @@ licenses</a> to <code>tz</code> contributors.</li> <li><a href="http://worldtimeexplorer.com/">World Time Explorer</a> is a Microsoft Windows program.</li> -<li> -<a href="http://www.toriasoft.com"> -WorldClock for Windows and Windows Mobile</a> -lets users "see the time in up to 25 locations in the world at once." -(From Hans Nieuwenhuis, 2009-11-02.) -</li> -<li> -<a href="http://www.relativedata.com/time-zone-master"> -Time Zone Master Basic -</a> "allows people to display multiple desktop clocks, and to -research current and historical time information, as well as times of -astronomical events (sunrise/transit/set, moonrise/transit/set, phases, -season starts) for user-selected dates in the past and future. It can -automatically download, compile and use the tzdata**.gz database files -as they are released to keep the data up to date. The software is -free." (Davie Patte) -</li> </ul> <h2>Other time zone databases</h2> <ul> <li><a href="http://www.astro.com/cgi/aq.cgi">Atlas Query</a> -is Astrodienst's Web version of Shanks's -excellent time zone history atlases published in both <a -href="http://astrocom.com/products/software.php?software_id=ibmwboth">computer</a> +is Astrodienst's Web version of Shanks and Pottenger's +time zone history atlases published in both <a +href="http://astrocom.com/astrology-products/software/acs-atlas-software">computer</a> and book form (<a -href="http://astrocom.com/products/book.php?book_id=b110x">one volume +href="http://www.astrocom.com/astrology/books/american-atlas">one volume for the USA</a>, and <a -href="http://astrocom.com/products/book.php?book_id=b112x">one for +href="http://www.astrocom.com/astrology/books/international-atlas">one for other locations</a>) by <a -href="http://astrocom.com/">Astro Communications Services</a>.</li> +href="http://astrocom.com/">Astro Computing Services</a>.</li> <li><a href="http://worldtime.com/">WORLDTIME: interactive atlas, time info, public holidays</a> contains information on local time, sunrise and sunset, @@ -371,28 +347,17 @@ gives current time zone rules for airports served by commercial aviation.</li> <li>Some Microsoft Windows versions contain time zone information in an undocumented format, with IDs that can be mapped to <code>TZ</code> values using the <a -href="http://unicode.org/cldr/data/diff/supplemental/windows_tzid.html">Windows +href="http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/zone_tzid.html">Zone → 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> <li>The <a href="https://www.cia.gov/">United States Central Intelligence Agency (<abbr title="Central Intelligence Agency">CIA</abbr>)</a> publishes a <a -href="https://www.cia.gov/library/publications/the-world-factbook/reference_maps/…">time +href="https://www.cia.gov/library/publications/the-world-factbook/graphics/ref_ma…">time zone map</a>; the <a href="http://www.lib.utexas.edu/maps/world.html">Perry-Castañeda @@ -421,9 +386,8 @@ of Countries ("Statoids")</a> contains detailed lists of 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 -<abbr title="Geographic Information Systems">GIS</abbr> -Data</a> includes a Manifold-format map of +href="http://manifold.net/info/freestuff.shtml">Free Stuff for +Manifold System Users</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 @@ -453,15 +417,15 @@ Saving Time - History, rationale, laws & dates</a> is an overall history of <abbr>DST</abbr>.</li> <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://seizethedaylight.com/dst/">Who Knew? A Brief +<li><a href="http://seizethedaylight.com/dst/">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 +<li><a href="http://toi.inrim.it/uk/toi.html">The Time of Internet</a> describes time zones and daylight saving time, with diagrams. 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 +<li><a href="http://www.staff.science.uu.nl/~gent0113/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://statoids.com/tconcept.html">Basic Time @@ -471,7 +435,7 @@ Zone Concepts</a> discusses terminological issues behind time zones.</li> <dl> <dt>Australia</dt> <dd>The Parliamentary Library has commissioned <a -href="http://www.aph.gov.au/LIBRARY/Pubs/rn/2006-07/07rn13.pdf">research +href="http://www.aph.gov.au/binaries/library/pubs/rn/2006-07/07rn13.pdf">research note on daylight saving time in Australia</a>. The Bureau of Meteorology publishes a list of <a href="http://www.bom.gov.au/climate/averages/tables/dst_times.shtml">Implementation Dates of Daylight Savings Time within Australia</a>.</dd> @@ -485,17 +449,17 @@ records <a href="http://pcdsh01.on.br/DecHV.html" hreflang="pt-BR">Brazil's daylight saving time decrees (in Portuguese)</a>.</dd> <dt>Canada</dt> -<dd>The Institute for National Measurement Standards publishes current +<dd>National Research Council Canada publishes current and some older information about <a -href="http://inms-ienm.nrc-cnrc.gc.ca/time_services/daylight_saving_e.html">Time -Zones & Daylight Saving Time</a>.</dd> +href="http://www.nrc-cnrc.gc.ca/eng/services/time/time_zones.html">time +zones & 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 official time (in Spanish)</a>.</dd> <dt>Germany</dt> <dd>The National Institute for Science and Technology maintains the <a -href="http://www.ptb.de/en/org/4/44/441/dars_e.htm">Realisation of +href="http://www.ptb.de/cms/en/fachabteilungen/abt4/fb-44/ag-441/realisation-of-l…">Realisation of Legal Time in Germany</a>.</dd> <dt>Israel</dt> <dd>The Interior Ministry periodically issues <a @@ -509,20 +473,15 @@ hreflang="es">history of Mexican local time (in Spanish)</a>.</dd> <dt>Malaysia</dt> <dd>See Singapore below.</dd> <dt>Netherlands</dt> -<dd><a href="http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm" +<dd><a href="http://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm" 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://dia.govt.nz/diawebsite.nsf/wpg_URL/Resource-material-Information-We-…">About +<dd>The Department of Internal Affairs maintains a brief <a +href="http://www.dia.govt.nz/Daylight-Saving-History">History of Daylight Saving</a>. The privately-maintained <a 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 -<a href="http://met.no/met/met_lex/q_u/sommertid.html" hreflang="no">Summer -time in Norway (in Norwegian)</a>, citing the -Institute of Theoretical Astrophysics, Oslo.</dd> <dt>Singapore</dt> <dd><a href="http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html">Why @@ -530,11 +489,11 @@ is Singapore in the "Wrong" Time Zone?</a> details the history of legal time in Singapore and Malaysia.</dd> <dt>United Kingdom</dt> <dd><a -href="http://www.srcf.ucam.org/~jsm28/british-time/">History of +href="http://www.polyomino.org.uk/british-time/">History of legal time in Britain</a> discusses in detail the country with perhaps the best-documented history of clock adjustments. The National Physical Laboratory also maintains an <a -href="http://www.npl.co.uk/server.php?show=ConWebDoc.2714">Archive +href="http://www.npl.co.uk/educate-explore/what-is-the-time/archive-of-summer-tim…">Archive of Summer time dates</a>.</dd> </dl> <h2>Precision timekeeping</h2> @@ -553,7 +512,8 @@ 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 +href="http://en.wikipedia.org/wiki/Dynamic_Host_Configuration_Protocol">DHCP</a> +option for a server to configure a client's time zone and daylight saving settings automatically.</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 @@ -578,7 +538,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://jpl.nasa.gov/basics/bsf2-3.htm">Basics of +<li><a href="http://www2.jpl.nasa.gov/basics/bsf2-3.php">Basics of Space Flight - Reference Systems - Time Conventions</a> briefly explains interplanetary space flight timekeeping.</li> <li><a @@ -593,13 +553,9 @@ 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> <li><a -href="http://hpiers.obspm.fr/eop-pc/products/bulletins/bulletins.html">Bulletins -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 +href="http://www.iers.org/IERS/EN/Publications/Bulletins/bulletins.html">IERS +Bulletins</a> contains official publications of the International +Earth Rotation and Reference Systems Service, which decides when leap seconds occur.</li> <li>The <a href="http://six.pairlist.net/mailman/listinfo/leapsecs">Leap @@ -609,11 +565,8 @@ 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 (now disbanded) <a href="http://members.aas.org/comms/leap.cfm"><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 -Future of Leap Seconds</a> covers this +<a href="http://www.ucolick.org/~sla/leapsecs/">UTC might be redefined +without Leap Seconds</a> gives pointers on this contentious issue.</li> </ul> <h2>Time notation</h2> @@ -623,7 +576,7 @@ contentious issue.</li> the International Standard Date and Time Notation</a> is a good summary of <a -href="http://www.iso.org/iso/en/CatalogueDetailPage.CatalogueDetail?CSNUMBER=40874"><abbr +href="http://www.iso.org/iso/catalogue_detail?csnumber=40874"><abbr title="International Organization for Standardization">ISO</abbr> 8601:2004 -- Data elements and interchange formats -- Information interchange -- Representation of dates and times</a>.</li> @@ -658,8 +611,8 @@ 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://unicode.org/cldr/data/charts/by_type/names.metazone.html">By-Type -Chart: names.metazone</a> shows these values for many locales. +href="http://unicode.org/cldr/charts/by_type/index.html">By-Type +Chart</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 identifiers for <abbr>UTC</abbr> offsets as they are ambiguous in @@ -693,8 +646,6 @@ is called "<abbr>GMT</abbr>".</li> <li><a href="tz-art.htm">Time and the Arts</a></li> <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 > Time</a></li> <li><a href="http://dir.yahoo.com/Science/Measurements_and_Units/Time">Yahoo! Directory > Science > Measurements and Units > Time</a></li> </ul> diff --git a/tzfile.5 b/tzfile.5 index aa7317b..10698a2 100644 --- a/tzfile.5 +++ b/tzfile.5 @@ -137,7 +137,7 @@ is zero or the time argument is less than the first transition time recorded in the file. .PP For version-2-format time zone files, -the above header and data is followed by a second header and data, +the above header and data are 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-enclosed, -- 1.7.9.5

2 2

Libya one hour back last night
by Even Scharning Nov. 11, 2012

Nov. 11, 2012

Libya set their time one hour back at 02:00 on Saturday November 10. Sources: http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ http://twitter.com/ShoofLibya/status/265193706439733248/photo/1 "By the time everyone in Libya realizes the clocks are supposed to be set back 1 hour, it'll be time to set them forward again." https://twitter.com/Tripolitanian/status/267040258363899905 Sincerely, Even Scharning Time.is - exact time, any time zone http://time.is/

4 4

Libya - Daylight Saving Time
by Eng. Ali H. Saleh Nov. 11, 2012

Nov. 11, 2012

Madam/Sir, Libya has changed its time 1 hour back for Daylight Saving Time since Sat 10 November 2012 to be +1GMT (CET). Please visit this link for confirmation http://www.timeanddate.com/worldclock/city.html?n=252 Kindly modify your database accordingly. Regards, -- Eng.Ali H. Saleh CEO *The Golden Group *Off Airport Road, behind Brega Tank Farm P.O. Box 83465, Tripoli - Libya Tel: +218 21 730 3903 Fax: +218 21 715 1478 Mobile LIbya: +218 91 495 7702 Web: www.goldengroup.info Confidentiality: The information contained in this e-mail is intended only for the personal and confidential use of the designated recipients of the email. This message may be an attorney-client communication and, as such, is privileged and confidential. If you are not an intended recipient of this message or an agent responsible for delivering it to an intended recipient, you are hereby notified that you have received this message in error, and that any review, dissemination, distribution, or copying of this message is strictly prohibited. If you have received this message in error, please delete it and all copies and notify us immediately by reply e-mail or by telephone (+218 21 730 3903). Thank you.

1 0

Libya one hour back last night
by Even Scharning Nov. 10, 2012

Nov. 10, 2012

Libya set their time one hour back at 02:00 on Saturday November 10. http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ http://twitter.com/ShoofLibya/status/265193706439733248/photo/1 "By the time everyone in Libya realizes the clocks are supposed to be set back 1 hour, it'll be time to set them forward again." https://twitter.com/Tripolitanian/status/267040258363899905 Sincerely, Even Scharning Time.is - exact time, any time zone http://time.is/

1 0

Print zdump and zic program names in --version output
by Joseph S. Myers Nov. 9, 2012

Nov. 9, 2012

This patch makes zdump and zic print their own names in their --version output, in accordance with the GNU standards for what --version should print. (tzselect already does print its name in --version output.) diff --git a/zdump.c b/zdump.c index 805267d..8b118ed 100644 --- a/zdump.c +++ b/zdump.c @@ -309,7 +309,7 @@ main(int argc, char *argv[]) progname = argv[0]; for (i = 1; i < argc; ++i) if (strcmp(argv[i], "--version") == 0) { - (void) printf("%s\n", TZVERSION); + (void) printf("zdump %s\n", TZVERSION); exit(EXIT_SUCCESS); } else if (strcmp(argv[i], "--help") == 0) { usage(stdout, EXIT_SUCCESS); diff --git a/zic.c b/zic.c index a9a54bb..428eaaa 100644 --- a/zic.c +++ b/zic.c @@ -462,7 +462,7 @@ main(int argc, char **argv) } for (i = 1; i < argc; ++i) if (strcmp(argv[i], "--version") == 0) { - (void) printf("%s\n", TZVERSION); + (void) printf("zic %s\n", TZVERSION); exit(EXIT_SUCCESS); } else if (strcmp(argv[i], "--help") == 0) { usage(stdout, EXIT_SUCCESS); -- Joseph S. Myers joseph(a)codesourcery.com

5 7

[PATCH] Change email address to tz@iana.org.
by Paul Eggert Nov. 9, 2012

Nov. 9, 2012

[The need for this change should be obvious.] * africa, australasia, europe, northamerica, southamerica: * tzselect.ksh, zdump.c, zic.c: In commentary and strings, change email address from tz(a)elsie.nci.nih.gov to tz(a)iana.org, as the old email address no longer works. --- africa | 2 +- asia | 5 ++--- australasia | 2 +- europe | 2 +- northamerica | 2 +- southamerica | 2 +- tzselect.ksh | 2 +- zdump.c | 2 +- zic.c | 2 +- 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/africa b/africa index 1c6e520..bbec05e 100644 --- a/africa +++ b/africa @@ -4,7 +4,7 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz(a)elsie.nci.nih.gov for general use in the future). +# tz(a)iana.org for general use in the future). # From Paul Eggert (2006-03-22): # diff --git a/asia b/asia index 9c6e1ac..d5562c8 100644 --- a/asia +++ b/asia @@ -4,7 +4,7 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz(a)elsie.nci.nih.gov for general use in the future). +# tz(a)iana.org for general use in the future). # From Paul Eggert (2006-03-22): # @@ -2052,8 +2052,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # occurred before our cutoff date of 1970. # However, as we get more information, we may need to add entries # for parts of the West Bank as they transitioned from Israel's rules -# to Palestine's rules. If you have more info about this, please -# send it to tz(a)elsie.nci.nih.gov for incorporation into future editions. +# to Palestine's rules. # From IINS News Service - Israel - 1998-03-23 10:38:07 Israel time, # forwarded by Ephraim Silverberg: diff --git a/australasia b/australasia index 74d476e..bef6f20 100644 --- a/australasia +++ b/australasia @@ -780,7 +780,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz(a)elsie.nci.nih.gov for general use in the future). +# tz(a)iana.org for general use in the future). # From Paul Eggert (2006-03-22): # A good source for time zone historical data outside the U.S. is diff --git a/europe b/europe index 5d2acc5..ad9816c 100644 --- a/europe +++ b/europe @@ -4,7 +4,7 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz(a)elsie.nci.nih.gov for general use in the future). +# tz(a)iana.org for general use in the future). # From Paul Eggert (2006-03-22): # A good source for time zone historical data outside the U.S. is diff --git a/northamerica b/northamerica index 18a4228..772d7a4 100644 --- a/northamerica +++ b/northamerica @@ -6,7 +6,7 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz(a)elsie.nci.nih.gov for general use in the future). +# tz(a)iana.org for general use in the future). # From Paul Eggert (1999-03-22): # A reliable and entertaining source about time zones is diff --git a/southamerica b/southamerica index 3195846..3301a43 100644 --- a/southamerica +++ b/southamerica @@ -4,7 +4,7 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# tz(a)elsie.nci.nih.gov for general use in the future). +# tz(a)iana.org for general use in the future). # From Paul Eggert (2006-03-22): # A good source for time zone historical data outside the U.S. is diff --git a/tzselect.ksh b/tzselect.ksh index 4fe5d02..279bdf2 100644 --- a/tzselect.ksh +++ b/tzselect.ksh @@ -43,7 +43,7 @@ if [ "$1" = "--help" ]; then Usage: tzselect Select a time zone interactively. -Report bugs to tz(a)elsie.nci.nih.gov. +Report bugs to tz(a)iana.org. EOF exit 0 elif [ "$1" = "--version" ]; then diff --git a/zdump.c b/zdump.c index 805267d..bdbd1d6 100644 --- a/zdump.c +++ b/zdump.c @@ -272,7 +272,7 @@ usage(FILE * const stream, const int status) (void) fprintf(stream, _("%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n\ \n\ -Report bugs to tz(a)elsie.nci.nih.gov.\n"), +Report bugs to tz(a)iana.org.\n"), progname, progname); exit(status); } diff --git a/zic.c b/zic.c index a9a54bb..35c8d4b 100644 --- a/zic.c +++ b/zic.c @@ -426,7 +426,7 @@ usage(FILE *stream, int status) [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\ \t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n\ \n\ -Report bugs to tz(a)elsie.nci.nih.gov.\n"), +Report bugs to tz(a)iana.org.\n"), progname, progname); exit(status); } -- 1.7.9.5

1 0

DST in the news: DC-area subway glitch
by Arthur David Olson Nov. 6, 2012

Nov. 6, 2012

Page B3 of the print edition of the 2012-11-06 Washington Post has the story "Metro time-change error strands riders;" the on-line version is available at... http://www.washingtonpost.com/blogs/dr-gridlock/wp/2012/11/05/metro-closes-… The DC-area Metro rail system failed to turn its clocks back and closed an hour earlier than expected. In line with past practice, Metro issued a pro-forma apology but provided neither an explanation nor an offer of compensation. --ado

1 0

[PATCH] Automate the building of tarball signatures.
by Paul Eggert Nov. 5, 2012

Nov. 5, 2012

* Makefile (public): Rewrite in terms of new rules, below. (check_public): New rule, containing the old checking part of 'make public'. (tarballs): New rule, containing the old tarball-making part of 'make public'. Do not run checktab twice. (signatures, tzcode$(VERSION).tar.gz.sign, tzdata$(VERSION).tar.gz.sign): New rules. --- Makefile | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c8150ba..c09d20f 100644 --- a/Makefile +++ b/Makefile @@ -420,6 +420,8 @@ maintainer-clean: clean names: @echo $(ENCHILADA) +public: check check_public set-timestamps tarballs signatures + # Set the time stamps to those of the git repository, if available, # and if the files have not changed since then. # This uses GNU 'touch' syntax 'touch -d@N FILE', @@ -439,26 +441,41 @@ set-timestamps: # The zics below ensure that each data file can stand on its own. # We also do an all-files run to catch links to links. -public: $(ENCHILADA) set-timestamps +check_public: $(ENCHILADA) make maintainer-clean make "CFLAGS=$(GCC_DEBUG_FLAGS)" mkdir -m go-rwx /tmp/,tzpublic - -for i in $(TDATA) ; do zic -v -d /tmp/,tzpublic $$i 2>&1 | grep -v "starting year" ; done + -for i in $(TDATA) ; do \ + zic -v -d /tmp/,tzpublic $$i 2>&1 | grep -v "starting year" ; \ + done for i in $(TDATA) ; do zic -d /tmp/,tzpublic $$i || exit; done zic -v -d /tmp/,tzpublic $(TDATA) || exit rm -f -r /tmp/,tzpublic + +tarballs: tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz + +tzcode$(VERSION).tar.gz: $(COMMON) $(DOCS) $(SOURCES) $(MISC) for i in *.[1-8] ; do \ LC_ALL=C sh workman.sh $$i > $$i.txt && \ touch -r $$i $$i.txt || exit; \ done - $(AWK) -f checktab.awk $(PRIMARY_YDATA) LC_ALL=C && export LC_ALL && \ tar $(TARFLAGS) -cf - \ $(COMMON) $(DOCS) $(SOURCES) $(MISC) *.[1-8].txt | \ - gzip $(GZIPFLAGS) > tzcode$(VERSION).tar.gz + gzip $(GZIPFLAGS) > $@ + +tzdata$(VERSION).tar.gz: $(COMMON) $(DATA) LC_ALL=C && export LC_ALL && \ tar $(TARFLAGS) -cf - $(COMMON) $(DATA) | \ - gzip $(GZIPFLAGS) > tzdata$(VERSION).tar.gz + gzip $(GZIPFLAGS) > $@ + +signatures: tzcode$(VERSION).tar.gz.sign tzdata$(VERSION).tar.gz.sign + +tzcode$(VERSION).tar.gz.sign: tzcode$(VERSION).tar.gz + gpg --armor --detach-sign -o $@ $? + +tzdata$(VERSION).tar.gz.sign: tzdata$(VERSION).tar.gz + gpg --armor --detach-sign -o $@ $? typecheck: make clean -- 1.7.9.5

3 3

[PATCH 3/3] Changes for Bahia, Tocantins, Israel, Jordan.
by Paul Eggert Nov. 5, 2012

Nov. 5, 2012

* asia (Zion): New Israeli rules next year. See Ephraim Silverberg in <http://mm.icann.org/pipermail/tz/2012-October/018351.html>. (Jordan): Jordan stays on DST this winter. See Steffen Thorsen in <http://mm.icann.org/pipermail/tz/2012-October/018374.html>. * southamerica (America/Araguaina): Now has DST. See Rodrigo Severo in <http://mm.icann.org/pipermail/tz/2012-October/018346.html>. (America/Bahia): No longer has DST. See Kelley Cook in <http://mm.icann.org/pipermail/tz/2012-October/018349.html>. --- asia | 82 ++++++++++++++++++++++++++++++++-------------------------- southamerica | 15 +++++++++-- 2 files changed, 58 insertions(+), 39 deletions(-) diff --git a/asia b/asia index 8e896fc..7d12e8b 100644 --- a/asia +++ b/asia @@ -1170,15 +1170,15 @@ Rule Zion 2004 only - Sep 22 1:00 0 S # # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps -# From Paul Eggert (2005-02-22): +# From Paul Eggert (2012-10-26): # I used Ephraim Silverberg's dst-israel.el program # <ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el> (2005-02-20) # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4, -# to generate the transitions in this list. +# to generate the transitions from 2005 through 2012. # (I replaced "lastFri" with "Fri>=26" by hand.) -# The spring transitions below all correspond to the following Rule: +# The spring transitions all correspond to the following Rule: # -# Rule Zion 2005 max - Mar Fri>=26 2:00 1:00 D +# Rule Zion 2005 2012 - Mar Fri>=26 2:00 1:00 D # # but older zic implementations (e.g., Solaris 8) do not support # "Fri>=26" to mean April 1 in years like 2005, so for now we list the @@ -1195,39 +1195,36 @@ Rule Zion 2009 only - Sep 27 2:00 0 S Rule Zion 2010 only - Sep 12 2:00 0 S Rule Zion 2011 only - Apr 1 2:00 1:00 D Rule Zion 2011 only - Oct 2 2:00 0 S -Rule Zion 2012 2015 - Mar Fri>=26 2:00 1:00 D +Rule Zion 2012 only - Mar Fri>=26 2:00 1:00 D Rule Zion 2012 only - Sep 23 2:00 0 S -Rule Zion 2013 only - Sep 8 2:00 0 S -Rule Zion 2014 only - Sep 28 2:00 0 S -Rule Zion 2015 only - Sep 20 2:00 0 S -Rule Zion 2016 only - Apr 1 2:00 1:00 D -Rule Zion 2016 only - Oct 9 2:00 0 S -Rule Zion 2017 2021 - Mar Fri>=26 2:00 1:00 D -Rule Zion 2017 only - Sep 24 2:00 0 S -Rule Zion 2018 only - Sep 16 2:00 0 S -Rule Zion 2019 only - Oct 6 2:00 0 S -Rule Zion 2020 only - Sep 27 2:00 0 S -Rule Zion 2021 only - Sep 12 2:00 0 S -Rule Zion 2022 only - Apr 1 2:00 1:00 D -Rule Zion 2022 only - Oct 2 2:00 0 S -Rule Zion 2023 2032 - Mar Fri>=26 2:00 1:00 D -Rule Zion 2023 only - Sep 24 2:00 0 S -Rule Zion 2024 only - Oct 6 2:00 0 S -Rule Zion 2025 only - Sep 28 2:00 0 S -Rule Zion 2026 only - Sep 20 2:00 0 S -Rule Zion 2027 only - Oct 10 2:00 0 S -Rule Zion 2028 only - Sep 24 2:00 0 S -Rule Zion 2029 only - Sep 16 2:00 0 S -Rule Zion 2030 only - Oct 6 2:00 0 S -Rule Zion 2031 only - Sep 21 2:00 0 S -Rule Zion 2032 only - Sep 12 2:00 0 S -Rule Zion 2033 only - Apr 1 2:00 1:00 D -Rule Zion 2033 only - Oct 2 2:00 0 S -Rule Zion 2034 2037 - Mar Fri>=26 2:00 1:00 D -Rule Zion 2034 only - Sep 17 2:00 0 S -Rule Zion 2035 only - Oct 7 2:00 0 S -Rule Zion 2036 only - Sep 28 2:00 0 S -Rule Zion 2037 only - Sep 13 2:00 0 S + +# From Ephraim Silverberg (2012-10-18): + +# Yesterday, the Interior Ministry Committee, after more than a year +# past, approved sending the proposed June 2011 changes to the Time +# Decree Law back to the Knesset for second and third (final) votes +# before the upcoming elections on Jan. 22, 2013. Hence, although the +# changes are not yet law, they are expected to be so before Februray 2013. +# +# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. +# DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the +# second day of the Jewish Rosh Hashana holiday, in which case DST ends a day +# later (i.e. at 02:00 the first Monday after October 2). +# [Rosh Hashana holidays are factored in until 2100.] + +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D +Rule Zion 2013 2026 - Oct Sun>=2 2:00 0 S +Rule Zion 2027 only - Oct Mon>=3 2:00 0 S +Rule Zion 2028 max - Oct Sun>=2 2:00 0 S +# The following rules are commented out for now, as they break older +# versions of zic that support only signed 32-bit timestamps, i.e., +# through 2038-01-19 03:14:07 UTC. +#Rule Zion 2028 2053 - Oct Sun>=2 2:00 0 S +#Rule Zion 2054 only - Oct Mon>=3 2:00 0 S +#Rule Zion 2055 2080 - Oct Sun>=2 2:00 0 S +#Rule Zion 2081 only - Oct Mon>=3 2:00 0 S +#Rule Zion 2082 max - Oct Sun>=2 2:00 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Jerusalem 2:20:56 - LMT 1880 @@ -1362,6 +1359,16 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u # From Arthur David Olson (2009-04-06): # We still have Jordan switching to DST on Thursdays in 2000 and 2001. +# From Steffen Thorsen (2012-10-25): +# Yesterday the government in Jordan announced that they will not +# switch back to standard time this winter, so the will stay on DST +# until about the same time next year (at least). +# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950 +# +# From Paul Eggert (2012-10-25): +# For now, assume this is just a one-year measure. If it becomes +# permanent, we should move Jordan from EET to AST effective tomorrow. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S Rule Jordan 1973 1975 - Oct 1 0:00 0 - @@ -1390,7 +1397,8 @@ Rule Jordan 2002 max - Mar lastThu 24:00 1:00 S Rule Jordan 2003 only - Oct 24 0:00s 0 - Rule Jordan 2004 only - Oct 15 0:00s 0 - Rule Jordan 2005 only - Sep lastFri 0:00s 0 - -Rule Jordan 2006 max - Oct lastFri 0:00s 0 - +Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - +Rule Jordan 2013 max - Oct lastFri 0:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Amman 2:23:44 - LMT 1931 2:00 Jordan EE%sT diff --git a/southamerica b/southamerica index ab4d14d..3195846 100644 --- a/southamerica +++ b/southamerica @@ -829,6 +829,15 @@ Zone America/La_Paz -4:32:36 - LMT 1890 # http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina… # </a> +# From Kelley Cook (2012-10-16): +# The governor of state of Bahia in Brazil announced on Thursday that +# due to public pressure, he is reversing the DST policy they implemented +# last year and will not be going to Summer Time on October 21st.... +# http://www.correio24horas.com.br/r/artigo/apos-pressoes-wagner-suspende-hor… + +# From Rodrigo Severo (2012-10-16): +# Tocantins state will have DST. +# http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01) @@ -1048,7 +1057,8 @@ Zone America/Araguaina -3:12:48 - LMT 1914 -3:00 Brazil BR%sT 1990 Sep 17 -3:00 - BRT 1995 Sep 14 -3:00 Brazil BR%sT 2003 Sep 24 - -3:00 - BRT + -3:00 - BRT 2012 Oct 21 + -3:00 Brazil BR%sT # # Alagoas (AL), Sergipe (SE) Zone America/Maceio -2:22:52 - LMT 1914 @@ -1067,7 +1077,8 @@ Zone America/Maceio -2:22:52 - LMT 1914 Zone America/Bahia -2:34:04 - LMT 1914 -3:00 Brazil BR%sT 2003 Sep 24 -3:00 - BRT 2011 Oct 16 - -3:00 Brazil BR%sT + -3:00 Brazil BR%sT 2012 Oct 21 + -3:00 - BRT # # Goias (GO), Distrito Federal (DF), Minas Gerais (MG), # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR), -- 1.7.9.5

2 3

[PATCH 2/2] Improve logic of zic -v abbreviation-length check.
by Paul Eggert Nov. 3, 2012

Nov. 3, 2012

This fixes a bunch of "time zone abbreviation has more than 3 alphabetics" diagnostics for 'make check_public'. * zic.c (newabbr): Check for <3 alphabetics, not for >3. POSIX-2008 requires at least 3 and says that it's not portable to use more than 6, which we check elsewhere. --- zic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zic.c b/zic.c index 64af1b2..a9a54bb 100644 --- a/zic.c +++ b/zic.c @@ -2534,8 +2534,8 @@ newabbr(const char *const string) ++cp; if (cp - string == 0) mp = _("time zone abbreviation lacks alphabetic at start"); - if (noise && cp - string > 3) -mp = _("time zone abbreviation has more than 3 alphabetics"); + if (noise && cp - string < 3) +mp = _("time zone abbreviation has fewer than 3 alphabetics"); if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN) mp = _("time zone abbreviation has too many alphabetics"); if (mp == NULL && (*cp == '+' || *cp == '-')) { -- 1.7.9.5

1 0

[PATCH 1/2] Check 'public' more carefully.
by Paul Eggert Nov. 3, 2012

Nov. 3, 2012

Here's the first of two more proposed patches for next time. * Makefile (ZFLAGS): Remove obsolete comment. (check_public): Put temporary directory under this directory, not under /tmp, as that's better if one is doing multiple builds in parallel. Also, use the just-built zic rather than the system zic. (clean): Remove temporary directory. --- Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index fd909f7..ea081a3 100644 --- a/Makefile +++ b/Makefile @@ -229,9 +229,6 @@ CFLAGS= LDFLAGS= $(LFLAGS) -# If you want zic's -s option used when installing, uncomment the next line -# ZFLAGS= -s - zic= ./zic ZIC= $(zic) $(ZFLAGS) @@ -411,6 +408,7 @@ check_web: $(WEB_PAGES) clean: rm -f core *.o *.out \ date tzselect version.h zdump zic yearistype + rm -f -r tzpublic maintainer-clean: clean @echo 'This command is intended for maintainers to use; it' @@ -444,13 +442,12 @@ set-timestamps: check_public: $(ENCHILADA) make maintainer-clean make "CFLAGS=$(GCC_DEBUG_FLAGS)" - mkdir -m go-rwx /tmp/,tzpublic - -for i in $(TDATA) ; do \ - zic -v -d /tmp/,tzpublic $$i 2>&1 | grep -v "starting year" ; \ + mkdir tzpublic + for i in $(TDATA) ; do \ + $(zic) -v -d tzpublic $$i 2>&1 || exit; \ done - for i in $(TDATA) ; do zic -d /tmp/,tzpublic $$i || exit; done - zic -v -d /tmp/,tzpublic $(TDATA) || exit - rm -f -r /tmp/,tzpublic + $(zic) -v -d tzpublic $(TDATA) + rm -f -r tzpublic tarballs: tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz -- 1.7.9.5

1 0

tzcode2012i and tzdata2012i available
by Paul Eggert Nov. 3, 2012

Nov. 3, 2012

The 2012i release of the tz code and data is available. It reflects the following changes recently circulated on the tz mailing list: Cuba switches from DST tomorrow at 01:00. (Thanks to Steffen Thorsen.) Linker flags can now be specified via LDFLAGS. AWK now defaults to 'awk', not 'nawk'. The shell in tzselect now defaults to /bin/bash, but this can be overridden by specifying KSHELL. The main web page now mentions the unofficial github repository. (Thanks to Mike Frysinger.) Tarball signatures can now be built by running 'make signatures'. There are also new makefile rules 'tarballs', 'check_public', and separate makefile rules for each tarball and signature file. A few makefile rules are now more portable to strict POSIX. The main web page now lists the canonical IANA URL. Here are links to the release files: http://www.iana.org/time-zones/repository/releases/tzcode2012i.tar.gz http://www.iana.org/time-zones/repository/releases/tzdata2012i.tar.gz ftp://ftp.iana.org/tz/releases/tzcode2012i.tar.gz ftp://ftp.iana.org/tz/releases/tzdata2012i.tar.gz Each release file has a GPG signature, which can be retrieved by appending ".sign" to the above URLs. Copies of these signatures are appended to this message. As usual, links to the latest release files are here: http://www.iana.org/time-zones/repository/tzcode-latest.tar.gz http://www.iana.org/time-zones/repository/tzdata-latest.tar.gz ftp://ftp.iana.org/tz/tzcode-latest.tar.gz ftp://ftp.iana.org/tz/tzdata-latest.tar.gz This release corresponds to commit a1752133a1b2ad076a2901fea51f8e3b3ab83379 in the unofficial github repository at <https://github.com/eggert/tz>. Here are the GPG checksums for the release files: -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQlXcwAAoJEO2X6Q5iqn40DmYP/2D4aEgIjN7lhjvkR5NnjYsd F4bhu2Obs8uLKAM3RalV7DS8YIT/wilsIA1xpW/XW+bv0FMymuJElEqfdL4VdfIE gg+/Xr3i2qsN664sqGnJekqwF1jjQfeA5ofOzxs5Bt7Yt4g2pqPiNAu1cm/7rBlF Pr6pKhQ9J71mmKo1r1J5echCDuPv0vyShmB+uNN0p6xqTsV9rLFLeh5+517cIIAp uadhThR/2ygs0ZMMsAQ8Xq5NRXYTnlKG/poHwdYwWV6yOTGFVJpbHz2Gz5BhCBvO nNEhLSgvrR2m2S73Jp6o3laFhYiJm7RhZl3mS6yXZApoYOu9r2lxU1hNzD7NYZSN I9xFYDa4haO0XxN0AgYHl4LuK9keqjGZsA5OlzG2bs8nH3ZNfopuRbtZDy10zxQs 8IBMbgdHDnOS9j3F4/f+jzrp0kGD6V1dvgCE8xHa/dcewdZaGFqjFezlK49uKIJF cEXuBTDI3pXiZ29gdVzUn2RyQ3ezjoKUfaxsloRlXIvJxrd7EJeDuWWMWWfqhu16 +xr/ocdceCcKjbGhV134O1kgM9s6jWxxUApycdmRchAuDNS9JF+mrHpuJ0mnkPP/ HGKPXFb+p2BywPjkxDLxdLsZYoIt+C502hdo/YnKpIKHGDDbD/YK4V0K2qrvJv68 u1zKzIUdRKRZ3jmOKY1r =Ru59 -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQlXcwAAoJEO2X6Q5iqn40Xu0P/3gkB48HDohDwtIfFRQlgo+z cbfWoSQ8ZDvFJRRpkJsqWryahKwn6ezd8yt2CmkdfvcFd4WggjrQIJC9wEZtRgog Y9laePIvwveWaxccc//iPfThsOdgUANqCWziEOxZwJAWbQvprv6YYuyXx2t2VC5s LqN62EgJJXlbCK43yhIoJrVQh/z5nAt8ObDuvkOM0f5JGTPXFZYQda/KFp8iNR0l 0HuKafacPNSRDTi8YTEBs8EH75MaLbcZzzFt5gN/FiW1FgrPmW44IKn0F89O3AIF Yh88+8DV3XKtSuaHPSnZXFXaa0IvEq5vec897zdW8dSSwlUazfzlcnTi19kiesZ3 PVMeeK6lwfBftZZ5/E62gVfQZZIebOnJdEw3sopo2BZaIdTwBLLYI019kzPO4U64 Z1EBDuFAQ3yd8nQnJF2f/vaQOwOwpuo3ZVjFJPqqp2+9+Xg5mv3StKRhFNrm9Nun kIVgsZUtjD5HfpM5S4QqbU1WRPdJVp0aTZwz7gKz/GrcKIEQFj039DvyEB5iY16Q MPPpQ5/yGeJ5K3fgcT+gBxklMOz7MoZ90NveZ4cQ0KHogs6walDAGi7LKWPVobDn hE1R2+n9BUdikcxk9EJ+LJYr4NXOCKiikzurV+EfXM/IGRKUnTKrOGJV+9l5hSPx Juu9SIUxSNpAsjS/55lc =p8iS -----END PGP SIGNATURE-----

1 0

Cuba changing clocks this Sunday
by Steffen Thorsen Nov. 3, 2012

Nov. 3, 2012

Radio Reloj and many other sources report that Cuba is changing back to standard time on 2012-11-04: http://www.radioreloj.cu/index.php/noticias-radio-reloj/36-nacionales/9961-… The database currently has it changing on the last Sunday of October. Best regards, Steffen Thorsen - timeanddate.com

2 1

Australia AEDT/EDT
by Steven Weiss Nov. 1, 2012

Nov. 1, 2012

Hi, I've been testing the timezone abbreviation and it seems to be incorrect for the current DST The abbreviation is giving me a EST instead of the expected EDT. I'm aware from your list there is a lot of discussion around EST/EDT vs AEST/AEDT. This is not the issue for me. either/or would be fine. Rather it appears that it should currently EDT/AEDT. I've downloaded the latest data and code as per the README. Regards Steven Weiss Cape Town South Africa

3 3

[PATCH 1/3] build: handle standard LDFLAGS variable
by Mike Frysinger Oct. 28, 2012

Oct. 28, 2012

This changes LFLAGS to the more standard LDFLAGS (while preserving backwards compatibility). It also adds the missing $(LDFLAGS) usage when linking `date`. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ab0f54b..625c6b2 100644 --- a/Makefile +++ b/Makefile @@ -224,6 +224,10 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ CFLAGS= +# Linker flags. + +LDFLAGS= $(LFLAGS) + # If you want zic's -s option used when installing, uncomment the next line # ZFLAGS= -s @@ -338,10 +342,10 @@ version.h: 'static char const TZVERSION[]="tz$(VERSION)";' zdump: $(TZDOBJS) - $(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@ zic: $(TZCOBJS) yearistype - $(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@ yearistype: yearistype.sh cp yearistype.sh yearistype @@ -380,8 +384,8 @@ $(TZLIB): $(LIBOBJS) then ranlib $@ ; fi date: $(DATEOBJS) - $(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \ - $(LDLIBS) -lc -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o \ + strftime.o $(LDLIBS) -lc -o $@ tzselect: tzselect.ksh sed \ -- 1.7.12

9 20

[PATCH] mention the github repo in the main tz page
by Mike Frysinger Oct. 27, 2012

Oct. 27, 2012

Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- tz-link.htm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tz-link.htm b/tz-link.htm index d1a8bf1..c55b94f 100644 --- a/tz-link.htm +++ b/tz-link.htm @@ -102,6 +102,8 @@ gzip -dc tzdata-latest.tar.gz | tar -xf - The code and data files can also be obtained from the <a href="http://www.iana.org">IANA</a> <a href="http://www.iana.org/time-zones">timezone web page</a>. +You can clone via <a href="http://git-scm.com/">git</a> the latest repository +from the <a href="https://github.com/eggert/tz">github tz repo</a>. <p> The code lets you compile the <code>tz</code> source files into machine-readable binary files, one for each location. It also lets -- 1.7.12

2 2

tzcode2012h and tzdata2012h available
by Paul Eggert Oct. 27, 2012

Oct. 27, 2012

[I forgot to CC: this to tz(a)iana.org, so I am doing it separately this time.] -------- Original Message -------- Subject: tzcode2012h and tzdata2012h available Date: Fri, 26 Oct 2012 23:18:24 -0700 From: Paul Eggert <eggert(a)cs.ucla.edu> To: Time zone announcements <tz-announce(a)iana.org> The 2012h release of the tz code and data is available. It reflects the following changes recently circulated on the tz mailing list: Bahia no longer has DST. (Thanks to Kelley Cook.) Tocantins has DST. (Thanks to Rodrigo Severo.) Israel has new DST rules next year. (Thanks to Ephraim Silverberg.) Jordan stays on DST this winter. (Thanks to Steffen Thorsen.) Web page updates. More C modernization, except that at Arthur David Olson's suggestion the instances of 'register' were kept. This release does not include an improved way of distributing checksums; I haven't had time to work the kinks out of that. Here are links to the release files: http://www.iana.org/time-zones/repository/releases/tzcode2012h.tar.gz http://www.iana.org/time-zones/repository/releases/tzdata2012h.tar.gz ftp://ftp.iana.org/tz/releases/tzcode2012h.tar.gz ftp://ftp.iana.org/tz/releases/tzdata2012h.tar.gz As usual, links to the latest release files are here: http://www.iana.org/time-zones/repository/tzcode-latest.tar.gz http://www.iana.org/time-zones/repository/tzdata-latest.tar.gz ftp://ftp.iana.org/tz/tzcode-latest.tar.gz ftp://ftp.iana.org/tz/tzdata-latest.tar.gz This release corresponds to commit 001a626d31ffb02dec209e539c9aedaf2f27ba20 in the unofficial github repository at <https://github.com/eggert/tz>. Here are the GPG checksums for the release files: -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQi3j1AAoJEO2X6Q5iqn40CXwP/1mQEIce/rO3BL2nFwnHoyTh F3FgSlnvCz65YJODlFROTPOsiKbrxJepILLoBXNQOgkD+gusQLrXCCvGMhu5aJ/9 OTxtRDdNC7F6b/HDW8Frw7oaD7ljMkos30vEtNrpM5xFQ3p5qc4jfGTMjq5RUR5B 2H7mxgnJXC4A0QznEjEnmnZ4z3Tm3XEhj3LEItH8c5VtIHmc/wZkrJATRT04sivN 221eF66T3rQFrmnrwayq96q+yxM9U+Y21oGw9MPlHA3eCXk/G/zmNYui6QVOL96z SGgPLj52M5CTTlWoLt5KUbrW6bKdhyX0zYX/j8pbD6haex0cfz02rJFiPUHtqwFt mnD2mvpQFqnCfua+LHSTrBGPm0N6v1WBg8UV1E3xQeVkF7S/8+OGtvAkSA4vICfE 5/u/LIXgn5NKt5u+LHr1/aAgtRLjAEr1B77noilC4C3pV+q2jIkp+TUAfV5gKMKx yOsKJF8g8y8mP8UWE9lkNLPepQ4RcsiRWMOV4CfMhJg6LJfLix+fnplEp09riWfc q0ngk5Qa7ydFykofvdb97yI0NuCsFbxkEdQpqvW6LeuMRtw7XXsgGoJwsD9lF4qL PsN0OIhNG04PIZEPPtulQih4Eeip2vfrOSCy07/6+8HoBFSkzEYPPCwnoiJ3QFYt bIOmNJLXmhYxrw2alIV2 =7FjC -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQi3khAAoJEO2X6Q5iqn40NV4P/RQK6e+9CF99rJB17EFvE2WD t7H2sg2Rfl805Iha/acl3DMJQepcSGvsv4paXD0buRJWlaTRbaY9nhk7bxi3VSfx A/IJTAd4ZiQLiD+J0IHTwE7NmV6r1GCqNs37H5iENDZp9gYXW59jePnfD0TitIND 9mFSCxWV5tZsktZIztUqYWcz/oABVODnaSGx21DTi27Y6aJpKxl5+TTRbPcFgQ6V 0jWsakzgJwWLRh1eTglFTSgbt2ui/o5D/W0d1RvtRlRHmXiLf3J3YO7PDWrCg/// 7CAf4MSL20OH4fG4Lj4IfCh86stEjKpgn+YmZjndkKYgBqKkve8r8yAkubAHni5q Jrod8g87w0W/XFw9C6C5kEN9+qCTXfM/zkBeh75iDVxvAJ0+G6DZRC9coL41tawl zg+s7dl+fiGjZzzDY287/tUP/u0omgHnG/OHkL/52KmTfVfbhLJvndrWe4ehx1z2 Z4gAdiIvCooh34uDRcK/EHWXV0FgX9Zf+k9LPy+7xSLELFoxVVbwJ8KTrQxzTwEL Qzx4nx7z1AEMIvm2HCZi+2pnBmrNYjG5quWyd2PxVuhYVFdqbRPZqPJh+9Qm0o4b +S6m/FmI/tkubF+J5uoQA8KowhZ5HU8DWo2LCNxSzyDRZAGzLEN8OPXpWIZ/3IMV m9JFu3Sqjuypx973arIQ =d4Nr -----END PGP SIGNATURE-----

4 3

Australian Timezone Abreviations - Next step
by Shaun Bouckaert Oct. 26, 2012

Oct. 26, 2012

After taking some time off from this issue, I've considered the next logical step to be contacting the relevant government departments in charge of the timezone legislation in each state. As a Queenslander I will start with the Queensland Attorney-General, as the timezone legislation falls under his responsibility. I honestly believe that the only argument for the status quo on this issue is that it's been this way for a long time. I have previously presented many good arguments as to why it needs to be updated to reflect what is widely used amongst government and private organisations across the country, and what is presented by the federal government on this page http://australia.gov.au/about-australia/our-country/time Hopefully, with responses from the relevant state departments, this issue can be resolved and put to bed. Shaun

15 28

bringing tzcode in the ANSI era
by christos＠zoulas.com Oct. 26, 2012

Oct. 26, 2012

Thanks Paul for the ANSI prototypes, now can we please 's/register //g'? It is not adding any value... christos

6 6

[PATCH 2/3] Web page updates.
by Paul Eggert Oct. 26, 2012

Oct. 26, 2012

* tz-link.htm (DC.Identifier): Move canonical location to cs.ucla.edu. Move public-domains and corrections notices to <address>. Update some URLs. Add Android. Mac OS X has been renamed to OS X. --- tz-link.htm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tz-link.htm b/tz-link.htm index f4371df..d1a8bf1 100644 --- a/tz-link.htm +++ b/tz-link.htm @@ -8,22 +8,15 @@ <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="2012-07-19"> +<meta name="DC.Date" content="2012-10-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"> +<meta name="DC.Identifier" content="http://cs.ucla.edu/~eggert/tz/tz-link.htm"> <meta name="Keywords" content="database,daylight saving,DST,time zone,timezone,tz,zoneinfo"> </head> <body> <h1>Sources for Time Zone and Daylight Saving Time Data</h1> -<p> -This file is in the public domain, so clarified as of -2009-05-17 by Arthur David Olson. -</p> -<p> -Please send corrections to this web page to the -<a href="mailto:tz@iana.org">time zone mailing list</a>.</p> <h2>The <code>tz</code> database</h2> <p> The <a href="http://en.wikipedia.org/wiki/Public_domain">public-domain</a> @@ -38,13 +31,14 @@ title="Coordinated Universal Time">UTC</abbr></a> offsets, and <a href="http://en.wikipedia.org/wiki/Daylight_saving">daylight-saving</a> rules. This database (often called <code>zoneinfo</code> or <a -href="http://en.wikipedia.org/wiki/TZ_database"><code>tz</code></a>) +href="http://en.wikipedia.org/wiki/Tz_database"><code>tz</code></a>) is used by several implementations, including <a href="http://www.gnu.org/software/libc/">the <abbr title="GNU's Not Unix">GNU</abbr> C Library</a> used in <a href="http://www.linux.org/"><abbr>GNU</abbr>/Linux</a>, +<a href="http://www.android.com/">Android</a>, <a href="http://www.freebsd.org/">FreeBSD</a>, <a href="http://netbsd.org/">NetBSD</a>, <a href="http://openbsd.org/">OpenBSD</a>, @@ -52,9 +46,9 @@ C Library</a> used in <a href="http://www.delorie.com/djgpp/"><abbr title="DJ's GNU Programming Platform">DJGPP</abbr></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://oracle.com/database">Oracle Database</a>, +<a href="http://www.apple.com/osx/">OS X</a>, <a href="http://sun.com/software/solaris">Solaris</a>, <a href="http://h30097.www3.hp.com/">Tru64</a>, and <a href="http://sco.com/products/unixware">UnixWare</a>.</p> @@ -699,5 +693,13 @@ Reference: Time</a></li> <li><a href="http://dir.yahoo.com/Science/Measurements_and_Units/Time">Yahoo! Directory > Science > Measurements and Units > Time</a></li> </ul> +<hr> +<address> +This file is in the public domain, so clarified as of +2009-05-17 by Arthur David Olson. +<br> +Please send corrections to this web page to the +<a href="mailto:tz@iana.org">time zone mailing list</a>. +</address> </body> </html> -- 1.7.9.5

1 0

[PATCH 1/3] More C modernization.
by Paul Eggert Oct. 26, 2012

Oct. 26, 2012

* Makefile (typecheck): Add -D__time_t_defined to CFLAGS, for glibc 2.15. * asctime.c (asctime_r, asctime): * date.c (main, dogmt, reset, nondigit, sametm, convert, checkfinal): * ialloc.c (icatalloc): * localtime.c (detzcode, detzcode64, settzname, tzload) (typesequiv, getzname, getqzname, getnum, getsecs, getoffset) (getrule, transtime, tzparse, tzset, localsub, gmtsub) (leaps_thru_end_of, timesub, increment_overflow) (long_increment_overflow, normalize_overflow) (long_normalize_overflow, tmcomp, time2sub, time1, leapcorr): * scheck.c (scheck): * strftime.c (_yconv): * zdump.c (my_localtime, abbrok, main, yeartot, hunt) (delta, show, abbr, dumptime): * zic.c (main, dolink, itsdir, associate, infile, inrule) (inzone, inzcont, inzsub, inleap, inlink, rulesub, convert64) (writezone, doabbr, stringoffset, stringrule, stringzone) (outzone, addtype, leapadd, adjleap, ciequal, itsabbr, byword) (getfields, rpytime, newabbr, mkdirs): Omit 'register', as it adds no value these days. See Christos Zoulas in <http://mm.icann.org/pipermail/tz/2012-October/018376.html>. * date.c (netsettime) [TSP_SETDATE]: Add forward decl. Don't rely on implicit int. Now static. Use NULL, not 0. * zdump.c: Include "limits.h". (absolute_min_time, absolute_max_time): Compute at compile-time, as the run-time tests relied on undefined behavior. (checkabsolutes): Rename from setabsolutes. Just check, since there's nothing to set now. All uses changed. --- Makefile | 2 +- asctime.c | 8 +- date.c | 64 ++++++++------- ialloc.c | 4 +- localtime.c | 253 +++++++++++++++++++++++++++++----------------------------- scheck.c | 12 +-- strftime.c | 4 +- zdump.c | 162 ++++++++++++++++++------------------- zic.c | 254 +++++++++++++++++++++++++++++------------------------------ 9 files changed, 380 insertions(+), 383 deletions(-) diff --git a/Makefile b/Makefile index ffd1cf0..5477133 100644 --- a/Makefile +++ b/Makefile @@ -455,7 +455,7 @@ typecheck: make clean for i in "long long" unsigned double; \ do \ - make CFLAGS="-DTYPECHECK -D_TIME_T \"-Dtime_t=$$i\"" ; \ + make CFLAGS="-DTYPECHECK -D__time_t_defined -D_TIME_T \"-Dtime_t=$$i\"" ; \ ./zdump -v Europe/Rome ; \ make clean ; \ done diff --git a/asctime.c b/asctime.c index 152b0db..e81b4f0 100644 --- a/asctime.c +++ b/asctime.c @@ -69,7 +69,7 @@ static char buf_asctime[MAX_ASCTIME_BUF_SIZE]; */ char * -asctime_r(register const struct tm *timeptr, char *buf) +asctime_r(const struct tm *timeptr, char *buf) { static const char wday_name[][3] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" @@ -78,8 +78,8 @@ asctime_r(register const struct tm *timeptr, char *buf) "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - register const char * wn; - register const char * mn; + const char *wn; + const char *mn; char year[INT_STRLEN_MAXIMUM(int) + 2]; char result[MAX_ASCTIME_BUF_SIZE]; @@ -126,7 +126,7 @@ asctime_r(register const struct tm *timeptr, char *buf) */ char * -asctime(register const struct tm *timeptr) +asctime(const struct tm *timeptr) { return asctime_r(timeptr, buf_asctime); } diff --git a/date.c b/date.c index b9578e1..1839397 100644 --- a/date.c +++ b/date.c @@ -85,20 +85,20 @@ static void wildinput(const char *, const char *, int main(const int argc, char *argv[]) { - register const char * format; - register const char * value; - register const char * cp; - register int ch; - register int dousg; - register int aflag = 0; - register int dflag = 0; - register int nflag = 0; - register int tflag = 0; - register int minuteswest; - register int dsttime; - register double adjust; - time_t now; - time_t t; + const char * format; + const char * value; + const char * cp; + int ch; + int dousg; + int aflag = 0; + int dflag = 0; + int nflag = 0; + int tflag = 0; + int minuteswest; + int dsttime; + double adjust; + time_t now; + time_t t; INITIALIZE(dousg); INITIALIZE(minuteswest); @@ -305,9 +305,9 @@ dogmt(void) static char ** fakeenv; if (fakeenv == NULL) { - register int from; - register int to; - register int n; + int from; + int to; + int n; static char tzegmt0[] = "TZ=GMT0"; for (n = 0; environ[n] != NULL; ++n) @@ -343,7 +343,7 @@ dogmt(void) static void reset(const time_t newt, const int nflag) { - register int fid; + int fid; time_t oldt; static struct { struct utmp before; @@ -439,13 +439,17 @@ extern int logwtmp(); #define settimeofday(t, tz) (settimeofday)(t) #endif /* HAVE_SETTIMEOFDAY == 1 */ +#ifdef TSP_SETDATE +static int netsettime(struct timeval); +#endif + #ifndef TSP_SETDATE /*ARGSUSED*/ #endif /* !defined TSP_SETDATE */ static void reset(const time_t newt, const int nflag) { - register const char * username; + const char * username; static struct timeval tv; /* static so tv_usec is 0 */ #ifdef EBUG @@ -491,7 +495,7 @@ errensure(void) } static const char * -nondigit(register const char *cp) +nondigit(const char *cp) { while (is_digit(*cp)) ++cp; @@ -573,8 +577,7 @@ timeout(FILE *const fp, const char *const format, const struct tm *const tmp) } static int -sametm(register const struct tm *const atmp, - register const struct tm *const btmp) +sametm(const struct tm *const atmp, const struct tm *const btmp) { return atmp->tm_year == btmp->tm_year && atmp->tm_mon == btmp->tm_mon && @@ -592,11 +595,11 @@ sametm(register const struct tm *const atmp, #define ATOI2(ar) (ar[0] - '0') * 10 + (ar[1] - '0'); ar += 2; static time_t -convert(register const char * const value, const int dousg, const time_t t) +convert(const char * const value, const int dousg, const time_t t) { - register const char * cp; - register const char * dotp; - register int cent, year_in_cent, month, hour, day, mins, secs; + const char * cp; + const char * dotp; + int cent, year_in_cent, month, hour, day, mins, secs; struct tm tm, outtm; time_t outt; @@ -704,8 +707,8 @@ checkfinal(const char * const value, time_t othert; struct tm tm; struct tm othertm; - register int pass; - register long offset; + int pass; + long offset; /* ** See if there's both a USG and a BSD interpretation. @@ -800,6 +803,7 @@ iffy(const time_t thist, const time_t thatt, * notifies the master that a correction is needed. * Returns 1 on success, 0 on failure. */ +static int netsettime(struct timeval ntv) { int s, length, port, timed_ack, found, err; @@ -812,7 +816,7 @@ netsettime(struct timeval ntv) struct sockaddr_in sin, dest, from; sp = getservbyname("timed", "udp"); - if (sp == 0) { + if (! sp) { fputs(_("udp/timed: unknown service\n"), stderr); retval = 2; return (0); @@ -869,7 +873,7 @@ loop: tout.tv_usec = 0; FD_ZERO(&ready); FD_SET(s, &ready); - found = select(FD_SETSIZE, &ready, 0, 0, &tout); + found = select(FD_SETSIZE, &ready, NULL, NULL, &tout); length = sizeof err; if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char *)&err, &length) == 0 && err) { diff --git a/ialloc.c b/ialloc.c index b6f0188..6a565c6 100644 --- a/ialloc.c +++ b/ialloc.c @@ -10,8 +10,8 @@ char * icatalloc(char *const old, const char *const new) { - register char * result; - register int oldsize, newsize; + char * result; + int oldsize, newsize; newsize = (new == NULL) ? 0 : strlen(new); if (old == NULL) diff --git a/localtime.c b/localtime.c index e074c54..b045b93 100644 --- a/localtime.c +++ b/localtime.c @@ -226,8 +226,8 @@ time_t altzone = 0; static long detzcode(const char *const codep) { - register long result; - register int i; + long result; + int i; result = (codep[0] & 0x80) ? ~0L : 0; for (i = 0; i < 4; ++i) @@ -238,8 +238,8 @@ detzcode(const char *const codep) static time_t detzcode64(const char *const codep) { - register time_t result; - register int i; + time_t result; + int i; result = (codep[0] & 0x80) ? (~(int_fast64_t) 0) : 0; for (i = 0; i < 8; ++i) @@ -250,8 +250,8 @@ detzcode64(const char *const codep) static void settzname(void) { - register struct state * const sp = lclptr; - register int i; + struct state * const sp = lclptr; + int i; tzname[0] = wildabbr; tzname[1] = wildabbr; @@ -272,7 +272,7 @@ settzname(void) ** And to get the latest zone names into tzname. . . */ for (i = 0; i < sp->timecnt; ++i) { - register const struct ttinfo * const ttisp = + const struct ttinfo * const ttisp = &sp->ttis[ sp->types[i]]; @@ -300,8 +300,8 @@ settzname(void) ** Second, truncate long abbreviations. */ for (i = 0; i < sp->typecnt; ++i) { - register const struct ttinfo * const ttisp = &sp->ttis[i]; - register char * cp = &sp->chars[ttisp->tt_abbrind]; + const struct ttinfo * const ttisp = &sp->ttis[i]; + char * cp = &sp->chars[ttisp->tt_abbrind]; if (strlen(cp) > TZ_ABBR_MAX_LEN && strcmp(cp, GRANDPARENTED) != 0) @@ -319,14 +319,13 @@ differ_by_repeat(const time_t t1, const time_t t0) } static int -tzload(register const char *name, register struct state *const sp, - register const int doextend) +tzload(const char *name, struct state *const sp, const int doextend) { - register const char * p; - register int i; - register int fid; - register int stored; - register int nread; + const char * p; + int i; + int fid; + int stored; + int nread; typedef union { struct tzhead tzhead; char buf[2 * sizeof(struct tzhead) + @@ -334,21 +333,21 @@ tzload(register const char *name, register struct state *const sp, 4 * TZ_MAX_TIMES]; } u_t; #ifdef ALL_STATE - register u_t * up; + u_t * up; up = (u_t *) calloc(1, sizeof *up); if (up == NULL) return -1; #else /* !defined ALL_STATE */ - u_t u; - register u_t * const up = &u; + u_t u; + u_t * const up = &u; #endif /* !defined ALL_STATE */ sp->goback = sp->goahead = FALSE; if (name == NULL && (name = TZDEFAULT) == NULL) goto oops; { - register int doaccess; + int doaccess; /* ** Section 4.9.1 of the C standard says that ** "FILENAME_MAX expands to an integral constant expression @@ -422,7 +421,7 @@ tzload(register const char *name, register struct state *const sp, goto oops; } for (i = 0; i < sp->typecnt; ++i) { - register struct ttinfo * ttisp; + struct ttinfo * ttisp; ttisp = &sp->ttis[i]; ttisp->tt_gmtoff = detzcode(p); @@ -439,7 +438,7 @@ tzload(register const char *name, register struct state *const sp, sp->chars[i] = *p++; sp->chars[i] = '\0'; /* ensure '\0' at end */ for (i = 0; i < sp->leapcnt; ++i) { - register struct lsinfo * lsisp; + struct lsinfo * lsisp; lsisp = &sp->lsis[i]; lsisp->ls_trans = (stored == 4) ? @@ -449,7 +448,7 @@ tzload(register const char *name, register struct state *const sp, p += 4; } for (i = 0; i < sp->typecnt; ++i) { - register struct ttinfo * ttisp; + struct ttinfo * ttisp; ttisp = &sp->ttis[i]; if (ttisstdcnt == 0) @@ -462,7 +461,7 @@ tzload(register const char *name, register struct state *const sp, } } for (i = 0; i < sp->typecnt; ++i) { - register struct ttinfo * ttisp; + struct ttinfo * ttisp; ttisp = &sp->ttis[i]; if (ttisgmtcnt == 0) @@ -491,7 +490,7 @@ tzload(register const char *name, register struct state *const sp, /* ** Ignore the beginning (harder). */ - register int j; + int j; for (j = 0; j + i < sp->timecnt; ++j) { sp->ats[j] = sp->ats[j + i]; @@ -519,7 +518,7 @@ tzload(register const char *name, register struct state *const sp, up->buf[0] == '\n' && up->buf[nread - 1] == '\n' && sp->typecnt + 2 <= TZ_MAX_TYPES) { struct state ts; - register int result; + int result; up->buf[nread - 1] = '\0'; result = tzparse(&up->buf[1], &ts, FALSE); @@ -580,15 +579,15 @@ oops: static int typesequiv(const struct state *const sp, const int a, const int b) { - register int result; + int result; if (sp == NULL || a < 0 || a >= sp->typecnt || b < 0 || b >= sp->typecnt) result = FALSE; else { - register const struct ttinfo * ap = &sp->ttis[a]; - register const struct ttinfo * bp = &sp->ttis[b]; + const struct ttinfo * ap = &sp->ttis[a]; + const struct ttinfo * bp = &sp->ttis[b]; result = ap->tt_gmtoff == bp->tt_gmtoff && ap->tt_isdst == bp->tt_isdst && ap->tt_ttisstd == bp->tt_ttisstd && @@ -615,9 +614,9 @@ static const int year_lengths[2] = { */ static const char * -getzname(register const char *strp) +getzname(const char *strp) { - register char c; + char c; while ((c = *strp) != '\0' && !is_digit(c) && c != ',' && c != '-' && c != '+') @@ -635,9 +634,9 @@ getzname(register const char *strp) */ static const char * -getqzname(register const char *strp, const int delim) +getqzname(const char *strp, const int delim) { - register int c; + int c; while ((c = *strp) != '\0' && c != delim) ++strp; @@ -652,10 +651,10 @@ getqzname(register const char *strp, const int delim) */ static const char * -getnum(register const char *strp, int *const nump, const int min, const int max) +getnum(const char *strp, int *const nump, const int min, const int max) { - register char c; - register int num; + char c; + int num; if (strp == NULL || !is_digit(c = *strp)) return NULL; @@ -681,7 +680,7 @@ getnum(register const char *strp, int *const nump, const int min, const int max) */ static const char * -getsecs(register const char *strp, long *const secsp) +getsecs(const char *strp, long *const secsp) { int num; @@ -721,9 +720,9 @@ getsecs(register const char *strp, long *const secsp) */ static const char * -getoffset(register const char *strp, long *const offsetp) +getoffset(const char *strp, long *const offsetp) { - register int neg = 0; + int neg = 0; if (*strp == '-') { neg = 1; @@ -746,7 +745,7 @@ getoffset(register const char *strp, long *const offsetp) */ static const char * -getrule(const char *strp, register struct rule *const rulep) +getrule(const char *strp, struct rule *const rulep) { if (*strp == 'J') { /* @@ -799,12 +798,12 @@ getrule(const char *strp, register struct rule *const rulep) static time_t transtime(const time_t janfirst, const int year, - register const struct rule *const rulep, const long offset) + const struct rule *const rulep, const long offset) { - register int leapyear; - register time_t value; - register int i; - int d, m1, yy0, yy1, yy2, dow; + int leapyear; + time_t value; + int i; + int d, m1, yy0, yy1, yy2, dow; INITIALIZE(value); leapyear = isleap(year); @@ -890,20 +889,20 @@ transtime(const time_t janfirst, const int year, */ static int -tzparse(const char *name, register struct state *const sp, +tzparse(const char *name, struct state *const sp, const int lastditch) { - const char * stdname; - const char * dstname; - size_t stdlen; - size_t dstlen; - long stdoffset; - long dstoffset; - register time_t * atp; - register unsigned char * typep; - register char * cp; - register int load_result; - static struct ttinfo zttinfo; + const char * stdname; + const char * dstname; + size_t stdlen; + size_t dstlen; + long stdoffset; + long dstoffset; + time_t * atp; + unsigned char * typep; + char * cp; + int load_result; + static struct ttinfo zttinfo; INITIALIZE(dstname); stdname = name; @@ -958,8 +957,8 @@ tzparse(const char *name, register struct state *const sp, if (*name == ',' || *name == ';') { struct rule start; struct rule end; - register int year; - register time_t janfirst; + int year; + time_t janfirst; time_t starttime; time_t endtime; @@ -1016,12 +1015,12 @@ tzparse(const char *name, register struct state *const sp, janfirst = newfirst; } } else { - register long theirstdoffset; - register long theirdstoffset; - register long theiroffset; - register int isdst; - register int i; - register int j; + long theirstdoffset; + long theirdstoffset; + long theiroffset; + int isdst; + int i; + int j; if (*name != '\0') return -1; @@ -1163,7 +1162,7 @@ tzsetwall(void) void tzset(void) { - register const char * name; + const char * name; name = getenv("TZ"); if (name == NULL) { @@ -1216,11 +1215,11 @@ tzset(void) static struct tm * localsub(const time_t *const timep, const long offset, struct tm *const tmp) { - register struct state * sp; - register const struct ttinfo * ttisp; - register int i; - register struct tm * result; - const time_t t = *timep; + struct state * sp; + const struct ttinfo * ttisp; + int i; + struct tm * result; + const time_t t = *timep; sp = lclptr; #ifdef ALL_STATE @@ -1229,10 +1228,10 @@ localsub(const time_t *const timep, const long offset, struct tm *const tmp) #endif /* defined ALL_STATE */ if ((sp->goback && t < sp->ats[0]) || (sp->goahead && t > sp->ats[sp->timecnt - 1])) { - time_t newt = t; - register time_t seconds; - register time_t tcycles; - register int_fast64_t icycles; + time_t newt = t; + time_t seconds; + time_t tcycles; + int_fast64_t icycles; if (t < sp->ats[0]) seconds = sp->ats[0] - t; @@ -1254,7 +1253,7 @@ localsub(const time_t *const timep, const long offset, struct tm *const tmp) return NULL; /* "cannot happen" */ result = localsub(&newt, offset, tmp); if (result == tmp) { - register time_t newy; + time_t newy; newy = tmp->tm_year; if (t < sp->ats[0]) @@ -1274,11 +1273,11 @@ localsub(const time_t *const timep, const long offset, struct tm *const tmp) break; } } else { - register int lo = 1; - register int hi = sp->timecnt; + int lo = 1; + int hi = sp->timecnt; while (lo < hi) { - register int mid = (lo + hi) >> 1; + int mid = (lo + hi) >> 1; if (t < sp->ats[mid]) hi = mid; @@ -1326,7 +1325,7 @@ localtime_r(const time_t *const timep, struct tm *tmp) static struct tm * gmtsub(const time_t *const timep, const long offset, struct tm *const tmp) { - register struct tm * result; + struct tm * result; if (!gmt_is_set) { gmt_is_set = TRUE; @@ -1391,7 +1390,7 @@ offtime(const time_t *const timep, const long offset) */ static int -leaps_thru_end_of(register const int y) +leaps_thru_end_of(const int y) { return (y >= 0) ? (y / 4 - y / 100 + y / 400) : -(leaps_thru_end_of(-(y + 1)) + 1); @@ -1399,18 +1398,18 @@ leaps_thru_end_of(register const int y) static struct tm * timesub(const time_t *const timep, const long offset, - register const struct state *const sp, - register struct tm *const tmp) + const struct state *const sp, + struct tm *const tmp) { - register const struct lsinfo * lp; - register time_t tdays; - register int idays; /* unsigned would be so 2003 */ - register long rem; - int y; - register const int * ip; - register long corr; - register int hit; - register int i; + const struct lsinfo * lp; + time_t tdays; + int idays; /* unsigned would be so 2003 */ + long rem; + int y; + const int * ip; + long corr; + int hit; + int i; corr = 0; hit = 0; @@ -1444,10 +1443,10 @@ timesub(const time_t *const timep, const long offset, tdays = *timep / SECSPERDAY; rem = *timep - tdays * SECSPERDAY; while (tdays < 0 || tdays >= year_lengths[isleap(y)]) { - int newy; - register time_t tdelta; - register int idelta; - register int leapdays; + int newy; + time_t tdelta; + int idelta; + int leapdays; tdelta = tdays / DAYSPERLYEAR; idelta = tdelta; @@ -1465,7 +1464,7 @@ timesub(const time_t *const timep, const long offset, y = newy; } { - register long seconds; + long seconds; seconds = tdays * SECSPERDAY + 0.5; tdays = seconds / SECSPERDAY; @@ -1569,7 +1568,7 @@ ctime_r(const time_t *const timep, char *buf) static int increment_overflow(int *const ip, int j) { - register int const i = *ip; + int const i = *ip; /* ** If i >= 0 there can only be overflow if i + j > INT_MAX @@ -1586,7 +1585,7 @@ increment_overflow(int *const ip, int j) static int long_increment_overflow(long *const lp, int const m) { - register long const l = *lp; + long const l = *lp; if ((l >= 0) ? (m > LONG_MAX - l) : (m < LONG_MIN - l)) return TRUE; @@ -1597,7 +1596,7 @@ long_increment_overflow(long *const lp, int const m) static int normalize_overflow(int *const tensptr, int *const unitsptr, const int base) { - register int tensdelta; + int tensdelta; tensdelta = (*unitsptr >= 0) ? (*unitsptr / base) : @@ -1609,7 +1608,7 @@ normalize_overflow(int *const tensptr, int *const unitsptr, const int base) static int long_normalize_overflow(long *const tensptr, int *const unitsptr, const int base) { - register int tensdelta; + int tensdelta; tensdelta = (*unitsptr >= 0) ? (*unitsptr / base) : @@ -1619,10 +1618,10 @@ long_normalize_overflow(long *const tensptr, int *const unitsptr, const int base } static int -tmcomp(register const struct tm *const atmp, - register const struct tm *const btmp) +tmcomp(const struct tm *const atmp, + const struct tm *const btmp) { - register int result; + int result; if ((result = (atmp->tm_year - btmp->tm_year)) == 0 && (result = (atmp->tm_mon - btmp->tm_mon)) == 0 && @@ -1640,17 +1639,17 @@ time2sub(struct tm *const tmp, int *const okayp, const int do_norm_secs) { - register const struct state * sp; - register int dir; - register int i, j; - register int saved_seconds; - register long li; - register time_t lo; - register time_t hi; - long y; - time_t newt; - time_t t; - struct tm yourtm, mytm; + const struct state * sp; + int dir; + int i, j; + int saved_seconds; + long li; + time_t lo; + time_t hi; + long y; + time_t newt; + time_t t; + struct tm yourtm, mytm; *okayp = FALSE; yourtm = *tmp; @@ -1838,15 +1837,15 @@ time1(struct tm *const tmp, struct tm *(*const funcp) (const time_t *, long, struct tm *), const long offset) { - register time_t t; - register const struct state * sp; - register int samei, otheri; - register int sameind, otherind; - register int i; - register int nseen; - int seen[TZ_MAX_TYPES]; - int types[TZ_MAX_TYPES]; - int okay; + time_t t; + const struct state * sp; + int samei, otheri; + int sameind, otherind; + int i; + int nseen; + int seen[TZ_MAX_TYPES]; + int types[TZ_MAX_TYPES]; + int okay; if (tmp == NULL) { errno = EINVAL; @@ -1980,9 +1979,9 @@ gtime(struct tm *const tmp) static long leapcorr(time_t *timep) { - register struct state * sp; - register struct lsinfo * lp; - register int i; + struct state * sp; + struct lsinfo * lp; + int i; sp = lclptr; i = sp->leapcnt; diff --git a/scheck.c b/scheck.c index ed60980..95bb716 100644 --- a/scheck.c +++ b/scheck.c @@ -10,12 +10,12 @@ const char * scheck(const char *const string, const char *const format) { - register char * fbuf; - register const char * fp; - register char * tp; - register int c; - register const char * result; - char dummy; + char * fbuf; + const char * fp; + char * tp; + int c; + const char * result; + char dummy; result = ""; if (string == NULL || format == NULL) diff --git a/strftime.c b/strftime.c index 4950f74..5b302ac 100644 --- a/strftime.c +++ b/strftime.c @@ -587,8 +587,8 @@ static char * _yconv(const int a, const int b, const int convert_top, const int convert_yy, char *pt, const char *const ptlim) { - register int lead; - register int trail; + int lead; + int trail; #define DIVISOR 100 trail = a % DIVISOR + b % DIVISOR; diff --git a/zdump.c b/zdump.c index 6caa7a2..ddb46b9 100644 --- a/zdump.c +++ b/zdump.c @@ -17,6 +17,7 @@ #include "time.h" /* for struct tm */ #include "stdlib.h" /* for exit, malloc, atoi */ #include "float.h" /* for FLT_MAX and DBL_MAX */ +#include "limits.h" /* for CHAR_BIT, LLONG_MAX */ #include "ctype.h" /* for isalpha et al. */ #ifndef isascii #define isascii(x) 1 @@ -150,8 +151,35 @@ extern char * optarg; extern int optind; extern char * tzname[2]; -static time_t absolute_min_time; -static time_t absolute_max_time; +/* The minimum and maximum finite time values. Shift 'long long' or + 'long' instead of 'time_t'; this avoids compile-time errors when + time_t is floating-point. In practice, 'long long' is wide enough. */ +static time_t const absolute_min_time = + ((time_t) 0.5 == 0.5 + ? (sizeof (time_t) == sizeof (float) ? (time_t) -FLT_MAX + : sizeof (time_t) == sizeof (double) ? (time_t) -DBL_MAX + : sizeof (time_t) == sizeof (long double) ? (time_t) -LDBL_MAX + : 0) + : (time_t) -1 < 0 +#ifdef LLONG_MAX + ? (time_t) ((long long) -1 << (CHAR_BIT * sizeof (time_t) - 1)) +#else + ? (time_t) ((long) -1 << (CHAR_BIT * sizeof (time_t) - 1)) +#endif + : 0); +static time_t const absolute_max_time = + ((time_t) 0.5 == 0.5 + ? (sizeof (time_t) == sizeof (float) ? (time_t) FLT_MAX + : sizeof (time_t) == sizeof (double) ? (time_t) DBL_MAX + : sizeof (time_t) == sizeof (long double) ? (time_t) LDBL_MAX + : -1) + : (time_t) -1 < 0 +#ifdef LLONG_MAX + ? (time_t) (- (~ 0 < 0) - ((long long) -1 << (CHAR_BIT * sizeof (time_t) - 1))) +#else + ? (time_t) (- (~ 0 < 0) - ((long) -1 << (CHAR_BIT * sizeof (time_t) - 1))) +#endif + : (time_t) -1); static size_t longest; static char * progname; static int warned; @@ -161,7 +189,7 @@ static void abbrok(const char * abbrp, const char * zone); static long delta(struct tm * newp, struct tm * oldp) ATTRIBUTE_PURE; static void dumptime(const struct tm * tmp); static time_t hunt(char * name, time_t lot, time_t hit); -static void setabsolutes(void); +static void checkabsolutes(void); static void show(char * zone, time_t t, int v); static const char * tformat(void); static time_t yeartot(long y) ATTRIBUTE_PURE; @@ -172,12 +200,12 @@ static time_t yeartot(long y) ATTRIBUTE_PURE; static struct tm * my_localtime(time_t *tp) { - register struct tm * tmp; + struct tm * tmp; tmp = localtime(tp); if (tp != NULL && tmp != NULL) { struct tm tm; - register time_t t; + time_t t; tm = *tmp; t = mktime(&tm); @@ -205,8 +233,8 @@ my_localtime(time_t *tp) static void abbrok(const char *const abbrp, const char *const zone) { - register const char * cp; - register const char * wp; + const char * cp; + const char * wp; if (warned) return; @@ -252,22 +280,22 @@ Report bugs to tz(a)elsie.nci.nih.gov.\n"), int main(int argc, char *argv[]) { - register int i; - register int c; - register int vflag; - register char * cutarg; - register long cutloyear = ZDUMP_LO_YEAR; - register long cuthiyear = ZDUMP_HI_YEAR; - register time_t cutlotime; - register time_t cuthitime; - register char ** fakeenv; - time_t now; - time_t t; - time_t newt; - struct tm tm; - struct tm newtm; - register struct tm * tmp; - register struct tm * newtmp; + int i; + int c; + int vflag; + char * cutarg; + long cutloyear = ZDUMP_LO_YEAR; + long cuthiyear = ZDUMP_HI_YEAR; + time_t cutlotime; + time_t cuthitime; + char ** fakeenv; + time_t now; + time_t t; + time_t newt; + struct tm tm; + struct tm newtm; + struct tm * tmp; + struct tm * newtmp; INITIALIZE(cutlotime); INITIALIZE(cuthitime); @@ -314,7 +342,7 @@ main(int argc, char *argv[]) exit(EXIT_FAILURE); } } - setabsolutes(); + checkabsolutes(); cutlotime = yeartot(cutloyear); cuthitime = yeartot(cuthiyear); } @@ -324,8 +352,8 @@ main(int argc, char *argv[]) if (strlen(argv[i]) > longest) longest = strlen(argv[i]); { - register int from; - register int to; + int from; + int to; for (i = 0; environ[i] != NULL; ++i) continue; @@ -404,56 +432,22 @@ main(int argc, char *argv[]) } static void -setabsolutes(void) +checkabsolutes(void) { - if (0.5 == (time_t) 0.5) { - /* - ** time_t is floating. - */ - if (sizeof (time_t) == sizeof (float)) { - absolute_min_time = (time_t) -FLT_MAX; - absolute_max_time = (time_t) FLT_MAX; - } else if (sizeof (time_t) == sizeof (double)) { - absolute_min_time = (time_t) -DBL_MAX; - absolute_max_time = (time_t) DBL_MAX; - } else { - (void) fprintf(stderr, + if (absolute_max_time < absolute_min_time) { + (void) fprintf(stderr, _("%s: use of -v on system with floating time_t other than float or double\n"), - progname); - exit(EXIT_FAILURE); - } - } else if (0 > (time_t) -1) { - /* - ** time_t is signed. Assume overflow wraps around. - */ - time_t t = 0; - time_t t1 = 1; - - while (t < t1) { - t = t1; - t1 = 2 * t1 + 1; - } - - absolute_max_time = t; - t = -t; - absolute_min_time = t - 1; - if (t < absolute_min_time) - absolute_min_time = t; - } else { - /* - ** time_t is unsigned. - */ - absolute_min_time = 0; - absolute_max_time = absolute_min_time - 1; + progname); + exit(EXIT_FAILURE); } } static time_t yeartot(const long y) { - register long myy; - register long seconds; - register time_t t; + long myy; + long seconds; + time_t t; myy = EPOCH_YEAR; t = 0; @@ -482,13 +476,13 @@ yeartot(const long y) static time_t hunt(char *name, time_t lot, time_t hit) { - time_t t; - long diff; - struct tm lotm; - register struct tm * lotmp; - struct tm tm; - register struct tm * tmp; - char loab[MAX_STRING_LENGTH]; + time_t t; + long diff; + struct tm lotm; + struct tm * lotmp; + struct tm tm; + struct tm * tmp; + char loab[MAX_STRING_LENGTH]; lotmp = my_localtime(&lot); if (lotmp != NULL) { @@ -529,8 +523,8 @@ hunt(char *name, time_t lot, time_t hit) static long delta(struct tm * newp, struct tm *oldp) { - register long result; - register int tmy; + long result; + int tmy; if (newp->tm_year < oldp->tm_year) return -delta(oldp, newp); @@ -550,7 +544,7 @@ delta(struct tm * newp, struct tm *oldp) static void show(char *zone, time_t t, int v) { - register struct tm * tmp; + struct tm * tmp; (void) printf("%-*s ", (int) longest, zone); if (v) { @@ -583,7 +577,7 @@ show(char *zone, time_t t, int v) static char * abbr(struct tm *tmp) { - register char * result; + char * result; static char nada; if (tmp->tm_isdst != 0 && tmp->tm_isdst != 1) @@ -620,7 +614,7 @@ tformat(void) } static void -dumptime(register const struct tm *timeptr) +dumptime(const struct tm *timeptr) { static const char wday_name[][3] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" @@ -629,10 +623,10 @@ dumptime(register const struct tm *timeptr) "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - register const char * wn; - register const char * mn; - register int lead; - register int trail; + const char * wn; + const char * mn; + int lead; + int trail; if (timeptr == NULL) { (void) printf("NULL"); diff --git a/zic.c b/zic.c index 64af1b2..28b2a24 100644 --- a/zic.c +++ b/zic.c @@ -440,9 +440,9 @@ static const char * yitcommand; int main(int argc, char **argv) { - register int i; - register int j; - register int c; + int i; + int j; + int c; #ifdef unix (void) umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH)); @@ -579,8 +579,8 @@ _("%s: More than one -L option specified\n"), static void dolink(const char *const fromfield, const char *const tofield) { - register char * fromname; - register char * toname; + char * fromname; + char * toname; if (fromfield[0] == '/') fromname = ecpyalloc(fromfield); @@ -614,7 +614,7 @@ dolink(const char *const fromfield, const char *const tofield) access(fromname, F_OK) == 0 && !itsdir(fromname)) { const char *s = tofield; - register char * symlinkcontents = NULL; + char *symlinkcontents = NULL; while ((s = strchr(s+1, '/')) != NULL) symlinkcontents = @@ -651,8 +651,8 @@ static const zic_t max_time = -1 - ((zic_t) -1 << (TIME_T_BITS_IN_FILE - 1)); static int itsdir(const char *const name) { - register char * myname; - register int accres; + char * myname; + int accres; myname = ecpyalloc(name); myname = ecatalloc(myname, "/."); @@ -679,10 +679,10 @@ rcomp(const void *cp1, const void *cp2) static void associate(void) { - register struct zone * zp; - register struct rule * rp; - register int base, out; - register int i, j; + struct zone * zp; + struct rule * rp; + int base, out; + int i, j; if (nrules != 0) { (void) qsort(rules, nrules, sizeof *rules, rcomp); @@ -754,14 +754,14 @@ associate(void) static void infile(const char *name) { - register FILE * fp; - register char ** fields; - register char * cp; - register const struct lookup * lp; - register int nfields; - register int wantcont; - register int num; - char buf[BUFSIZ]; + FILE * fp; + char ** fields; + char * cp; + const struct lookup * lp; + int nfields; + int wantcont; + int num; + char buf[BUFSIZ]; if (strcmp(name, "-") == 0) { name = _("standard input"); @@ -897,7 +897,7 @@ warning(_("values over 24 hours not handled by pre-2007 versions of zic")); } static void -inrule(register char **const fields, const int nfields) +inrule(char **const fields, const int nfields) { static struct rule r; @@ -923,9 +923,9 @@ inrule(register char **const fields, const int nfields) } static int -inzone(register char **const fields, const int nfields) +inzone(char **const fields, const int nfields) { - register int i; + int i; static char * buf; if (nfields < ZONE_MINFIELDS || nfields > ZONE_MAXFIELDS) { @@ -966,7 +966,7 @@ _("duplicate zone name %s (file \"%s\", line %d)"), } static int -inzcont(register char **const fields, const int nfields) +inzcont(char **const fields, const int nfields) { if (nfields < ZONEC_MINFIELDS || nfields > ZONEC_MAXFIELDS) { error(_("wrong number of fields on Zone continuation line")); @@ -976,14 +976,14 @@ inzcont(register char **const fields, const int nfields) } static int -inzsub(register char **const fields, const int nfields, const int iscont) +inzsub(char **const fields, const int nfields, const int iscont) { - register char * cp; + char * cp; static struct zone z; - register int i_gmtoff, i_rule, i_format; - register int i_untilyear, i_untilmonth; - register int i_untilday, i_untiltime; - register int hasuntil; + int i_gmtoff, i_rule, i_format; + int i_untilyear, i_untilmonth; + int i_untilday, i_untiltime; + int hasuntil; if (iscont) { i_gmtoff = ZFC_GMTOFF; @@ -1053,14 +1053,14 @@ inzsub(register char **const fields, const int nfields, const int iscont) } static void -inleap(register char ** const fields, const int nfields) +inleap(char ** const fields, const int nfields) { - register const char * cp; - register const struct lookup * lp; - register int i, j; - int year, month, day; - long dayoff, tod; - zic_t t; + const char * cp; + const struct lookup * lp; + int i, j; + int year, month, day; + long dayoff, tod; + zic_t t; if (nfields != LEAP_FIELDS) { error(_("wrong number of fields on Leap line")); @@ -1125,8 +1125,8 @@ inleap(register char ** const fields, const int nfields) tod = gethms(fields[LP_TIME], _("invalid time of day"), FALSE); cp = fields[LP_CORR]; { - register int positive; - int count; + int positive; + int count; if (strcmp(cp, "") == 0) { /* infile() turns "-" into "" */ positive = FALSE; @@ -1155,7 +1155,7 @@ inleap(register char ** const fields, const int nfields) } static void -inlink(register char **const fields, const int nfields) +inlink(char **const fields, const int nfields) { struct link l; @@ -1180,7 +1180,7 @@ inlink(register char **const fields, const int nfields) } static void -rulesub(register struct rule *const rp, +rulesub(struct rule *const rp, const char *const loyearp, const char *const hiyearp, const char *const typep, @@ -1188,10 +1188,10 @@ rulesub(register struct rule *const rp, const char *const dayp, const char *const timep) { - register const struct lookup * lp; - register const char * cp; - register char * dp; - register char * ep; + const struct lookup * lp; + const char * cp; + char * dp; + char * ep; if ((lp = byword(monthp, mon_names)) == NULL) { error(_("invalid month name")); @@ -1332,8 +1332,8 @@ rulesub(register struct rule *const rp, static void convert(const long val, char *const buf) { - register int i; - register int shift; + int i; + int shift; unsigned char *const b = (unsigned char *) buf; for (i = 0, shift = 24; i < 4; ++i, shift -= 8) @@ -1343,8 +1343,8 @@ convert(const long val, char *const buf) static void convert64(const zic_t val, char *const buf) { - register int i; - register int shift; + int i; + int shift; unsigned char *const b = (unsigned char *) buf; for (i = 0, shift = 56; i < 8; ++i, shift -= 8) @@ -1387,11 +1387,11 @@ is32(const zic_t x) static void writezone(const char *const name, const char *const string) { - register FILE * fp; - register int i, j; - register int leapcnt32, leapi32; - register int timecnt32, timei32; - register int pass; + FILE * fp; + int i, j; + int leapcnt32, leapi32; + int timecnt32, timei32; + int pass; static char * fullname; static const struct tzhead tzh0; static struct tzhead tzh; @@ -1494,15 +1494,15 @@ writezone(const char *const name, const char *const string) } } for (pass = 1; pass <= 2; ++pass) { - register int thistimei, thistimecnt; - register int thisleapi, thisleapcnt; - register int thistimelim, thisleaplim; - int writetype[TZ_MAX_TIMES]; - int typemap[TZ_MAX_TYPES]; - register int thistypecnt; - char thischars[TZ_MAX_CHARS]; - char thischarcnt; - int indmap[TZ_MAX_CHARS]; + int thistimei, thistimecnt; + int thisleapi, thisleapcnt; + int thistimelim, thisleaplim; + int writetype[TZ_MAX_TIMES]; + int typemap[TZ_MAX_TYPES]; + int thistypecnt; + char thischars[TZ_MAX_CHARS]; + char thischarcnt; + int indmap[TZ_MAX_CHARS]; if (pass == 1) { thistimei = timei32; @@ -1546,7 +1546,7 @@ writezone(const char *const name, const char *const string) ** set correctly). */ { - register int mrudst, mrustd, hidst, histd, type; + int mrudst, mrustd, hidst, histd, type; hidst = histd = mrudst = mrustd = -1; for (i = thistimei; i < thistimelim; ++i) @@ -1590,7 +1590,7 @@ writezone(const char *const name, const char *const string) indmap[i] = -1; thischarcnt = 0; for (i = 0; i < typecnt; ++i) { - register char * thisabbr; + char * thisabbr; if (!writetype[i]) continue; @@ -1647,7 +1647,7 @@ writezone(const char *const name, const char *const string) (void) fwrite(thischars, sizeof thischars[0], thischarcnt, fp); for (i = thisleapi; i < thisleaplim; ++i) { - register zic_t todo; + zic_t todo; if (roll[i]) { if (timecnt == 0 || trans[i] < ats[0]) { @@ -1690,9 +1690,9 @@ static void doabbr(char *const abbr, const char *const format, const char *const letters, const int isdst, const int doquotes) { - register char * cp; - register char * slashp; - register int len; + char * cp; + char * slashp; + int len; slashp = strchr(format, '/'); if (slashp == NULL) { @@ -1734,9 +1734,9 @@ updateminmax(const int x) static int stringoffset(char *result, long offset) { - register int hours; - register int minutes; - register int seconds; + int hours; + int minutes; + int seconds; result[0] = '\0'; if (offset < 0) { @@ -1765,11 +1765,11 @@ static int stringrule(char *result, const struct rule *const rp, const long dstoff, const long gmtoff) { - register long tod; + long tod; result = end(result); if (rp->r_dycode == DC_DOM) { - register int month, total; + int month, total; if (rp->r_dayofmonth == 29 && rp->r_month == TM_FEBRUARY) return -1; @@ -1778,7 +1778,7 @@ stringrule(char *result, const struct rule *const rp, const long dstoff, total += len_months[0][month]; (void) sprintf(result, "J%d", total + rp->r_dayofmonth); } else { - register int week; + int week; if (rp->r_dycode == DC_DOWGEQ) { if ((rp->r_dayofmonth % DAYSPERWEEK) != 1) @@ -1816,12 +1816,12 @@ stringrule(char *result, const struct rule *const rp, const long dstoff, static void stringzone(char *result, const struct zone *const zpfirst, const int zonecount) { - register const struct zone * zp; - register struct rule * rp; - register struct rule * stdrp; - register struct rule * dstrp; - register int i; - register const char * abbrvar; + const struct zone * zp; + struct rule * rp; + struct rule * stdrp; + struct rule * dstrp; + int i; + const char * abbrvar; result[0] = '\0'; zp = zpfirst + zonecount - 1; @@ -1896,24 +1896,24 @@ stringzone(char *result, const struct zone *const zpfirst, const int zonecount) static void outzone(const struct zone * const zpfirst, const int zonecount) { - register const struct zone * zp; - register struct rule * rp; - register int i, j; - register int usestart, useuntil; - register zic_t starttime, untiltime; - register long gmtoff; - register long stdoff; - register int year; - register long startoff; - register int startttisstd; - register int startttisgmt; - register int type; - register char * startbuf; - register char * ab; - register char * envvar; - register int max_abbr_len; - register int max_envvar_len; - register int prodstic; /* all rules are min to max */ + const struct zone * zp; + struct rule * rp; + int i, j; + int usestart, useuntil; + zic_t starttime, untiltime; + long gmtoff; + long stdoff; + int year; + long startoff; + int startttisstd; + int startttisgmt; + int type; + char * startbuf; + char * ab; + char * envvar; + int max_abbr_len; + int max_envvar_len; + int prodstic; /* all rules are min to max */ max_abbr_len = 2 + max_format_len + max_abbrvar_len; max_envvar_len = 2 * max_abbr_len + 5 * 9; @@ -1959,7 +1959,7 @@ outzone(const struct zone * const zpfirst, const int zonecount) */ stringzone(envvar, zpfirst, zonecount); if (noise && envvar[0] == '\0') { - register char * wp; + char * wp; wp = ecpyalloc(_("no POSIX environment variable for zone")); wp = ecatalloc(wp, " "); @@ -2037,9 +2037,9 @@ wp = ecpyalloc(_("no POSIX environment variable for zone")); rp->r_temp = rpytime(rp, year); } for ( ; ; ) { - register int k; - register zic_t jtime, ktime; - register long offset; + int k; + zic_t jtime, ktime; + long offset; INITIALIZE(ktime); if (useuntil) { @@ -2184,7 +2184,7 @@ static int addtype(const long gmtoff, const char *const abbr, const int isdst, const int ttisstd, const int ttisgmt) { - register int i, j; + int i, j; if (isdst != TRUE && isdst != FALSE) { error(_("internal error - addtype called with bad isdst")); @@ -2239,7 +2239,7 @@ addtype(const long gmtoff, const char *const abbr, const int isdst, static void leapadd(const zic_t t, const int positive, const int rolling, int count) { - register int i, j; + int i, j; if (leapcnt + (positive ? count : 1) > TZ_MAX_LEAPS) { error(_("too many leap seconds")); @@ -2269,8 +2269,8 @@ leapadd(const zic_t t, const int positive, const int rolling, int count) static void adjleap(void) { - register int i; - register long last = 0; + int i; + long last = 0; /* ** propagate leap seconds forward @@ -2314,7 +2314,7 @@ lowerit(int a) /* case-insensitive equality */ static ATTRIBUTE_PURE int -ciequal(register const char *ap, register const char *bp) +ciequal(const char *ap, const char *bp) { while (lowerit(*ap) == lowerit(*bp++)) if (*ap++ == '\0') @@ -2323,7 +2323,7 @@ ciequal(register const char *ap, register const char *bp) } static ATTRIBUTE_PURE int -itsabbr(register const char *abbr, register const char *word) +itsabbr(const char *abbr, const char *word) { if (lowerit(*abbr) != lowerit(*word)) return FALSE; @@ -2337,11 +2337,11 @@ itsabbr(register const char *abbr, register const char *word) } static ATTRIBUTE_PURE const struct lookup * -byword(register const char *const word, - register const struct lookup *const table) +byword(const char *const word, + const struct lookup *const table) { - register const struct lookup * foundlp; - register const struct lookup * lp; + const struct lookup * foundlp; + const struct lookup * lp; if (word == NULL || table == NULL) return NULL; @@ -2365,11 +2365,11 @@ byword(register const char *const word, } static char ** -getfields(register char *cp) +getfields(char *cp) { - register char * dp; - register char ** array; - register int nsubs; + char * dp; + char ** array; + int nsubs; if (cp == NULL) return NULL; @@ -2434,11 +2434,11 @@ tadd(const zic_t t1, const long t2) */ static zic_t -rpytime(register const struct rule *const rp, register const int wantedy) +rpytime(const struct rule *const rp, const int wantedy) { - register int y, m, i; - register long dayoff; /* with a nod to Margaret O. */ - register zic_t t; + int y, m, i; + long dayoff; /* with a nod to Margaret O. */ + zic_t t; if (wantedy == INT_MIN) return min_time; @@ -2474,7 +2474,7 @@ rpytime(register const struct rule *const rp, register const int wantedy) --i; dayoff = oadd(dayoff, eitol(i)); if (rp->r_dycode == DC_DOWGEQ || rp->r_dycode == DC_DOWLEQ) { - register long wday; + long wday; #define LDAYSPERWEEK ((long) DAYSPERWEEK) wday = eitol(EPOCH_WDAY); @@ -2517,11 +2517,11 @@ will not work with pre-2004 versions of zic")); static void newabbr(const char *const string) { - register int i; + int i; if (strcmp(string, GRANDPARENTED) != 0) { - register const char * cp; - const char * mp; + const char * cp; + const char * mp; /* ** Want one to ZIC_MAX_ABBR_LEN_WO_WARN alphabetics @@ -2569,8 +2569,8 @@ mp = _("time zone abbreviation differs from POSIX standard"); static int mkdirs(char *argname) { - register char * name; - register char * cp; + char * name; + char * cp; if (argname == NULL || *argname == '\0') return 0; -- 1.7.9.5

1 0