- tz - lists.iana.org

zic tweak to warn about non-ASCII in filenames
by Arthur David Olson June 26, 2014

June 26, 2014

To help ensure that non-ASCII characters don't appear in distribution filenames, changes to zic.c so that the "-v" option warns about them. Both attached and tab-mangled below. --ado *** /tmp/,azic.c 2014-06-25 19:32:44.803874900 -0400 --- /tmp/,bzic.c 2014-06-25 19:32:44.906880800 -0400 *************** *** 134,139 **** --- 134,140 ---- static int itsdir(const char * name); static int lowerit(int c); static int mkdirs(char * filename); + static void namecheck(const char * name); static void newabbr(const char * abbr); static zic_t oadd(zic_t t1, zic_t t2); static void outzone(const struct zone * zp, int ntzones); *************** *** 621,632 **** --- 622,652 ---- return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } + #define BENIGN "+-_/" + + static void + namecheck(const char * const name) + { + register const char * cp; + + if (!noise) + return; + for (cp = name; *cp != '\0'; ++cp) + if (!isascii(*cp) || + (!isalnum(*cp) && strchr(BENIGN, *cp) == NULL)) { + warning(_("file name %s has non-ASCII-alphanumeric character other than %s"), + name, BENIGN); + return; + } + } + static void dolink(const char *const fromfield, const char *const tofield) { register char * fromname; register char * toname; + namecheck(tofield); if (fromfield[0] == '/') fromname = ecpyalloc(fromfield); else { *************** *** 1495,1500 **** --- 1515,1521 ---- void *typesptr = ats + timecnt; unsigned char *types = typesptr; + namecheck(name); /* ** Sort. */

7 15

Non-ASCII outside comments?
by Arthur David Olson June 26, 2014

June 26, 2014

Prompted by the introduction of non-ASCII into comments, I checked how zic handles a... Zone America/San_José ...line and discovered that, at least on the test system, it seems to do a right thing. Should zic permit non-ASCII characters in zone names? In time zone abbreviations? If they are permitted, should zic warn about them? --ado

7 9

[PATCH] Fix some 'zic' issues when run as root.
by Paul Eggert June 26, 2014

June 26, 2014

* zic.c: Use angle brackets for <sys/stat.h>. (dolink): Don't try to link from a directory, as this can cause trouble on some systems when superuser. (dolink, itsdir): Rewrite to avoid use of 'access', which is problematic when setuid. (itsdir): If S_ISDIR is defined, use plain 'stat' and S_ISDIR; that's more reliable. Return -1 if trouble; all callers changed. (mkdirs): Simplify by using mkdir-itsdir rather than itsdir-mkdir-itsdir. Don't assume strerror preserves errno. --- zic.c | 71 +++++++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/zic.c b/zic.c index 9c22e7a..f18dba7 100644 --- a/zic.c +++ b/zic.c @@ -23,7 +23,7 @@ typedef int_fast64_t zic_t; #endif /* !defined ZIC_MAX_ABBR_LEN_WO_WARN */ #if HAVE_SYS_STAT_H -#include "sys/stat.h" +#include <sys/stat.h> #endif #ifdef S_IRUSR #define MKDIR_UMASK (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) @@ -665,6 +665,7 @@ dolink(const char *const fromfield, const char *const tofield) { register char * fromname; register char * toname; + register int fromisdir; namecheck(tofield); if (fromfield[0] == '/') @@ -685,10 +686,16 @@ dolink(const char *const fromfield, const char *const tofield) ** We get to be careful here since ** there's a fair chance of root running us. */ - if (!itsdir(toname)) + fromisdir = itsdir(fromname); + if (fromisdir) { + int err = fromisdir < 0 ? errno : EPERM; + fprintf(stderr, _("%s: link from %s failed: %s"), + progname, fromname, strerror(err)); + exit(EXIT_FAILURE); + } + if (itsdir(toname) <= 0) (void) remove(toname); - if (link(fromname, toname) != 0 - && access(fromname, F_OK) == 0 && !itsdir(fromname)) { + if (link(fromname, toname) != 0) { int result; if (mkdirs(toname) != 0) @@ -793,17 +800,24 @@ static const zic_t max_time = -1 - ((zic_t) -1 << (TIME_T_BITS_IN_FILE - 1)); static const zic_t big_bang_time = BIG_BANG; +/* Return 1 if NAME is a directory, 0 if it's something else, -1 if trouble. */ static int itsdir(const char *const name) { - register char * myname; - register int accres; - - myname = ecpyalloc(name); - myname = ecatalloc(myname, "/."); - accres = access(myname, F_OK); - free(myname); - return accres == 0; + struct stat st; + int res = stat(name, &st); + if (res != 0) + return res; +#ifdef S_ISDIR + return S_ISDIR(st.st_mode) != 0; +#else + { + char *nameslashdot = ecatalloc(ecpyalloc(name), "/."); + res = stat(nameslashdot, &st); + free(nameslashdot); + return res == 0; + } +#endif } /* @@ -1620,7 +1634,7 @@ writezone(const char *const name, const char *const string, char version) /* ** Remove old file, if any, to snap links. */ - if (!itsdir(fullname) && remove(fullname) != 0 && errno != ENOENT) { + if (itsdir(fullname) <= 0 && remove(fullname) != 0 && errno != ENOENT) { const char *e = strerror(errno); (void) fprintf(stderr, _("%s: Can't remove %s: %s\n"), @@ -2891,23 +2905,20 @@ mkdirs(char *argname) continue; } #endif - if (!itsdir(name)) { - /* - ** It doesn't seem to exist, so we try to create it. - ** Creation may fail because of the directory being - ** created by some other multiprocessor, so we get - ** to do extra checking. - */ - if (mkdir(name, MKDIR_UMASK) != 0) { - const char *e = strerror(errno); - - if (errno != EEXIST || !itsdir(name)) { - (void) fprintf(stderr, -_("%s: Can't create directory %s: %s\n"), - progname, name, e); - free(name); - return -1; - } + /* + ** Try to create it. It's OK if creation fails because + ** the directory already exists, perhaps because some + ** other process just created it. + */ + if (mkdir(name, MKDIR_UMASK) != 0) { + int err = errno; + if (itsdir(name) <= 0) { + (void) fprintf(stderr, + _("%s: Can't create directory" + " %s: %s\n"), + progname, name, strerror(err)); + free(name); + return -1; } } *cp = '/'; -- 1.9.1

1 0

[PATCH] * private.h, zdump.c (TZ_DOMAIN): Look at HAVE_GETTEXT,
by Paul Eggert June 26, 2014

June 26, 2014

not TZ_DOMAINDIR, when deciding whether to define. This fixes a recently-introduced typo. Found by compiling with -DHAVE_GETTEXT under GNU/Linux. --- private.h | 2 +- zdump.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/private.h b/private.h index e65aaad..ad22b9a 100644 --- a/private.h +++ b/private.h @@ -372,7 +372,7 @@ static time_t const time_t_max = #endif /* !HAVE_GETTEXT */ #endif /* !defined _ */ -#if !defined TZ_DOMAIN && defined TZ_DOMAINDIR +#if !defined TZ_DOMAIN && defined HAVE_GETTEXT # define TZ_DOMAIN "tz" #endif diff --git a/zdump.c b/zdump.c index bde827a..0a661d5 100644 --- a/zdump.c +++ b/zdump.c @@ -183,7 +183,7 @@ enum { SECSPER400YEARS_FITS = SECSPERLYEAR <= INTMAX_MAX / 400 }; #endif /* !HAVE_GETTEXT */ #endif /* !defined _ */ -#if !defined TZ_DOMAIN && defined TZ_DOMAINDIR +#if !defined TZ_DOMAIN && defined HAVE_GETTEXT # define TZ_DOMAIN "tz" #endif -- 1.9.1

1 0

disclaimer removals
by Arthur David Olson June 26, 2014

June 26, 2014

Neither private.h nor zic.c now need a disclaimer regarding a Certain Trademarked Term; removals are attached (and appear in tab-mangled form below). --ado *** /tmp/,aprivate.h 2014-06-25 18:56:51.027685900 -0400 --- /tmp/,bprivate.h 2014-06-25 18:56:51.099690100 -0400 *************** *** 403,410 **** #define SECSPERREPEAT_BITS 34 /* ceil(log2(SECSPERREPEAT)) */ #endif /* !defined SECSPERREPEAT_BITS */ - /* - ** UNIX was a registered trademark of The Open Group in 2003. - */ - #endif /* !defined PRIVATE_H */ --- 403,406 ---- *** /tmp/,azic.c 2014-06-25 18:57:00.521228900 -0400 --- /tmp/,bzic.c 2014-06-25 18:57:00.641235800 -0400 *************** *** 2838,2844 **** free(name); return 0; } - - /* - ** UNIX was a registered trademark of The Open Group in 2003. - */ --- 2838,2840 ----

6 9

[PATCH] A few more spelling, accent, and commentary cleanups.
by Paul Eggert June 26, 2014

June 26, 2014

--- africa | 2 +- australasia | 22 ++++++---------------- europe | 2 +- northamerica | 19 ++++++++----------- zic.c | 2 +- 5 files changed, 17 insertions(+), 30 deletions(-) diff --git a/africa b/africa index 8591141..6e4ff7a 100644 --- a/africa +++ b/africa @@ -160,7 +160,7 @@ Zone Africa/Bangui 1:14:20 - LMT 1912 # Chad # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Ndjamena 1:00:12 - LMT 1912 +Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena 1:00 - WAT 1979 Oct 14 1:00 1:00 WAST 1980 Mar 8 1:00 - WAT diff --git a/australasia b/australasia index dac2a68..045be88 100644 --- a/australasia +++ b/australasia @@ -425,7 +425,7 @@ Rule NC 1996 only - Dec 1 2:00s 1:00 S # Shanks & Pottenger say the following was at 2:00; go with IATA. Rule NC 1997 only - Mar 2 2:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Pacific/Noumea 11:05:48 - LMT 1912 Jan 13 +Zone Pacific/Noumea 11:05:48 - LMT 1912 Jan 13 # Nouméa 11:00 NC NC%sT @@ -559,22 +559,12 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5 # backwards from 1:00am to 12:00am" # From Laupue Raymond Hughes (2011-03-07): -# I believe this will be posted shortly on the website -# www.mcil.gov.ws +# [http://www.mcil.gov.ws/ftcd/daylight_saving_2011.pdf] # -# PUBLIC NOTICE ON DAYLIGHT SAVING TIME -# -# Pursuant to the Daylight Saving Act 2009 and Cabinets decision, -# businesses and the general public are hereby advised that daylight -# saving time is on the first Saturday of April 2011 (02/04/11). -# -# The public is therefore advised that when the standard time strikes -# the hour of four oclock (4.00am or 0400 Hours) on the 2nd April 2011, -# then all instruments used to measure standard time are to be -# adjusted/changed to three oclock (3:00am or 0300Hrs). -# -# Margaret Fruean ACTING CHIEF EXECUTIVE OFFICER MINISTRY OF COMMERCE, -# INDUSTRY AND LABOUR 28th February 2011 +# ... when the standard time strikes the hour of four o'clock (4.00am +# or 0400 Hours) on the 2nd April 2011, then all instruments used to +# measure standard time are to be adjusted/changed to three o'clock +# (3:00am or 0300Hrs). # From David Zülke (2011-05-09): # Subject: Samoa to move timezone from east to west of international date line diff --git a/europe b/europe index 453cf96..6ab0413 100644 --- a/europe +++ b/europe @@ -1885,7 +1885,7 @@ Rule Poland 1944 only - Oct 4 2:00 0 - Rule Poland 1945 only - Apr 29 0:00 1:00 S Rule Poland 1945 only - Nov 1 0:00 0 - # For 1946 on the source is Kazimierz Borkowski, -# Torun Center for Astronomy, Dept. of Radio Astronomy, Nicolaus Copernicus U., +# Toruń Center for Astronomy, Dept. of Radio Astronomy, Nicolaus Copernicus U., # <http://www.astro.uni.torun.pl/~kb/Artykuly/U-PA/Czas2.htm#tth_tAb1> # Thanks to Przemysław Augustyniak (2005-05-28) for this reference. # He also gives these further references: diff --git a/northamerica b/northamerica index 42a2a85..28a05ce 100644 --- a/northamerica +++ b/northamerica @@ -681,19 +681,16 @@ Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11 # From Paul Eggert (2005-08-16): # http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006. -# From Nathan Stratton Treadway (2006-03-30): -# http://www.dot.gov/affairs/dot0406.htm [3705 B] -# From Deborah Goldsmith (2006-01-18): -# http://dmses.dot.gov/docimages/pdf95/382329_web.pdf [2.9 MB] -# From Paul Eggert (2006-01-20): -# It says "DOT is relocating the time zone boundary in Indiana to move Starke, +# From Paul Eggert (2014-06-26): +# https://www.federalregister.gov/articles/2006/01/20/06-563/standard-time-zo… +# says "DOT is relocating the time zone boundary in Indiana to move Starke, # Pulaski, Knox, Daviess, Martin, Pike, Dubois, and Perry Counties from the # Eastern Time Zone to the Central Time Zone.... The effective date of -# this rule is 2:OO a.m. EST Sunday, April 2, 2006, which is the +# this rule is 2 a.m. EST Sunday, April 2, 2006, which is the # changeover date from standard time to Daylight Saving Time." -# Strictly speaking, this means the affected counties will change their -# clocks twice that night, but this obviously is in error. The intent -# is that 01:59:59 EST be followed by 02:00:00 CDT. +# Strictly speaking, this meant the affected counties changed their +# clocks twice that night, but this obviously was in error. The intent +# was that 01:59:59 EST be followed by 02:00:00 CDT. # From Gwillim Law (2007-02-10): # The Associated Press has been reporting that Pulaski County, Indiana is @@ -1527,7 +1524,7 @@ Zone America/Montreal -4:54:16 - LMT 1884 # St. Théophile Buckingham # Ontario Used generally in the cities and towns along # the southerly part of the province. Not -# used in the northwesterlhy part. +# used in the northwesterly part. # Manitoba Not used. # Saskatchewan In Regina only. # Alberta Not used. diff --git a/zic.c b/zic.c index ddf764c..fa25cd5 100644 --- a/zic.c +++ b/zic.c @@ -2413,7 +2413,7 @@ error(_("can't determine time zone abbreviation to use just after until time")); if (lastat->at < rpytime(&xr, max_year - 1)) { /* ** Create new type code for the redundant entry, - ** to prevent it being optimised away. + ** to prevent it being optimized away. */ if (typecnt >= TZ_MAX_TYPES) { error(_("too many local time types")); -- 1.9.1

1 0

[PATCH] Go back to ASCII in *.txt files, too.
by Paul Eggert June 25, 2014

June 25, 2014

For *.txt files, UTF-8 is not that important, and avoiding it is better for users with older or misconfigured manpage readers. * Makefile (check_character_set): Check that *.txt files contain only safe characters. ($(MANTXTS)): Build *.txt files in the C locale, not in en_US.utf8. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a96d0c9..ff941a0 100644 --- a/Makefile +++ b/Makefile @@ -453,7 +453,7 @@ check: check_character_set check_tables check_web check_character_set: $(ENCHILADA) LC_ALL=en_US.utf8 && export LC_ALL && \ sharp='#' && \ - ! grep -Env $(SAFE_LINE) $(MANS) date.1 \ + ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ $(MISC) $(SOURCES) $(WEB_PAGES) && \ ! grep -Env $(SAFE_SHARP_LINE) $(DATA) && \ test $$(grep -Ecv $(SAFE_SHARP_LINE) Makefile) -eq 1 && \ @@ -494,7 +494,7 @@ zdump.8.txt: zdump.8 zic.8.txt: zic.8 $(MANTXTS): workman.sh - LC_ALL=en_US.utf8 sh workman.sh `expr $@ : '$.*$\.txt$$'` >$@ + LC_ALL=C sh workman.sh `expr $@ : '$.*$\.txt$$'` >$@ # Set the time stamps to those of the git repository, if available, # and if the files have not changed since then. -- 1.9.1

1 0

usno* files
by Tim Parenti June 25, 2014

June 25, 2014

(was Further un-ASCII-fication and typos) Unfortunately, this commit (363a1be6dfb3c0e5398b28cb4f0f3778157ddbe7 <https://github.com/eggert/tz/commit/363a1be6dfb3c0e5398b28cb4f0f3778157ddbe7>) introduced changes to usno1989, which specifically says at the top that "no corrections have been made"; that is, it is unchanged from the original. This is distinct from usno1989a, which appears to be the same data, but corrected. This raises the question, why are we retaining the usno* files in the first place? Although I'm sure there was a reason originally, it seems to have faded over time, and the most recent edition is 16 years old. I would be surprised if we didn't already have all this information elsewhere. -- Tim Parenti On 25 June 2014 04:06, Paul Eggert <eggert(a)cs.ucla.edu> wrote: > Thanks for those fixes. I installed them into the experimental version on > github. That's pretty good, fixing a spelling error in French -- I would > not have caught that. You inspired me to find some more spelling mistakes, > one in Spanish, plus a few accent fixes. I applied the attached patch too. > I'm sure there are more errors like that. >

2 3

Further un-ASCII-fication and typos
by Tim Parenti June 25, 2014

June 25, 2014

Looking back through the mailing list records, I found a few more instances of names to convert (but I left things in the Latin alphabet). In doing so, I also found a bit of commentary that had some typographical issues, mostly capitalization. These are relative to commit fe8b770c2dc96576d30dc2b95783ce52417b5b90 <https://github.com/eggert/tz/commit/fe8b770c2dc96576d30dc2b95783ce52417b5b90> . -- Tim Parenti

3 4

Multiple UTC zones
by Matt Johnson June 25, 2014

June 25, 2014

Does anyone know if there is a concrete reason for why Etc/GMT, Etc/UTC and Etc/UCT are three separate zones? I would think that Etc/UTC would be the only zone entry and the others would be links. Thanks.-Matt

7 12