June 2014 - tz - lists.iana.org

Re: [tz] [PATCH 0/2] Follow Australian common usage and update [SEC=UNOFFICIAL]
by Peter Stagg June 30, 2014

June 30, 2014

I'd like to roundly and whole-heartedly applauded the changes being made in this patch and I can't wait to see this in production. I'm going to be alerting as many developers and sys-admins etc. here at the Bureau as I can and I expect a massive sigh of relief. I could say many things about the background that has led to this point but most of that is water under the bridge. One thing I will say is that the tz db itself has contributed to the confusion over common usage in Australia. One of the methods used to survey common usage I've noted is the use of search engines to look at the frequency of terms such as EST vs EDT etc. The problem is that web developers etc. (even here at the Bureau) will use the tz db for applications without thinking about how the time will show during daylight savings periods (after all its Christmas in Australia and we're all on holiday) and thus they will show the EST abbreviation until some observant person (usually member of the public) contacts us and points out the discrepancy then we run around like chooks with our heads cut off try to find and fix the problem or throw our hands in the air and wait for daylight savings to end when the problem seems to fix itself. So you can see that web searches for common usage of these terms are likely to be skewed by the assumption inherent in the tz db to begin with. I look forward to these changes being put into production ASAP. Peter Stagg | Web Developer Radar Systems Web Systems, Platform Services, Information Technology Services, Information Systems & Services Division, Bureau of Meteorology GPO Box 1289 Melbourne VIC 3001 Level 6, 700 Collins Street, Docklands VIC 3008 Tel: +61 3 9669 4232 | p.stagg(a)bom.gov.au www.bom.gov.au > Message: 1 > Date: Mon, 30 Jun 2014 00:46:55 -0700 > From: Paul Eggert <eggert(a)cs.ucla.edu> > To: Russ Allbery <rra(a)stanford.edu>, Time Zone Mailing List > <tz(a)iana.org> > Subject: Re: [tz] [PATCH 0/2] Follow Australian common usage and > update CST/CST to CST/CDT and EST/EST to EST/EDT etc > [SEC=UNCLASSIFIED] > Message-ID: <53B115EF.3030902(a)cs.ucla.edu> > Content-Type: text/plain; charset="utf-8"; Format="flowed" > > On 2013-04-12 Russ Allbery wrote: > > I'm increasingly of the opinion that the tz database should just use > > the most unambiguous abbreviations (AEST/AEDT) even if there isn't a > > clear consensus in general usage. > > I am tempted to agree, particularly since (prompted by Rich Tibbett's proposed patch on github) I finally got around to surveying > general usage and it appears that there is a working (though by no means > universal) consensus in Australia to use abbreviations like "AEST" and "AEDT", and furthmore, we appear to have been mistaken in our > assumptions about abbreviation usage in the past. Details are in the attached proposed patch, which I've pushed into the > experimental tz version on github. I couldn't resist adding a quote about the daylight-saving preferences of "chuckleheaded > Queenslanders and straw-chewing yokels from the West". <delitia> [Peter Stagg]

1 0

[PATCH] Fix glitches with '-' and italics in man pages.
by Paul Eggert June 28, 2014

June 28, 2014

Using '\-' to denote ASCII minus has problems in groff output, since it generates a minus sign in the current font, and if you cut and paste from the documentation the resulting text won't work. To avoid the problem, define a string \*- that expands to ASCII minus in a constant-width font in groff. Also, change some instances of \(mi and \(pl to use plain \- and +, since we no longer need special fonts for these. Finally, remove some no-longer-needed instances of "\^" after italicized words. --- date.1 | 36 +++++++++++++----------- newctime.3 | 40 +++++++++++++------------- newstrftime.3 | 22 ++++++++------- newtzset.3 | 28 ++++++++++--------- time2posix.3 | 4 ++- tzfile.5 | 2 +- tzselect.8 | 26 +++++++++-------- zdump.8 | 30 +++++++++----------- zic.8 | 90 +++++++++++++++++++++++++---------------------------------- 9 files changed, 136 insertions(+), 142 deletions(-) diff --git a/date.1 b/date.1 index cba4e56..cbdf3b4 100644 --- a/date.1 +++ b/date.1 @@ -4,24 +4,26 @@ date \- show and set date and time .SH SYNOPSIS .if n .nh .if n .na +.ie \n(.g .ds - \f(CW-\fP +.el ds - \- .B date [ -.B \-u +.B \*-u ] [ -.B \-c +.B \*-c ] [ -.B \-r -seconds +.B \*-r +.I seconds ] [ -.B \-n +.B \*-n ] [ -.B \-d -dsttype +.B \*-d +.I dsttype ] [ -.B \-t -minutes-west +.B \*-t +.I minutes-west ] [ -\fB\-a \fR[\fB+\fR|\fB-]\fIsss\fB.\fIfff\fR +\fB\*-a \fR[\fB+\fR|\fB\*-]\fIsss\fB.\fIfff\fR ] [ .BI + format ] [ @@ -141,10 +143,10 @@ the seconds part of the new time; if no seconds are given, zero is assumed. .PP These options are available: .TP -.BR \-u " or " \-c +.BR \*-u " or " \*-c Use Universal Time when setting and showing the date and time. .TP -.BI "\-r " seconds +.BI "\*-r " seconds Output the date that corresponds to .I seconds past the epoch of 1970-01-01 00:00:00 UTC, where @@ -152,16 +154,16 @@ past the epoch of 1970-01-01 00:00:00 UTC, where should be an integer, either decimal, octal (leading 0), or hexadecimal (leading 0x), preceded by an optional sign. .TP -.B \-n +.B \*-n Do not notify other networked systems of the time change. .TP -.BI "\-d " dsttype +.BI "\*-d " dsttype Set the kernel-stored Daylight Saving Time type to the given value. (The kernel-stored DST type is used mostly by .q "old" binaries.) .TP -.BI "\-t " minutes-west +.BI "\*-t " minutes-west Set the kernel-stored .q "minutes west of UTC" value to the one given on the @@ -170,10 +172,10 @@ command line. .q "old" binaries.) .TP -.BI "\-a " adjustment +.BI "\*-a " adjustment Change the time forward (or backward) by the number of seconds (and fractions thereof) specified in the -.I adjustment\^ +.I adjustment argument. Either the seconds part or the fractions part of the argument (but not both) may be omitted. diff --git a/newctime.3 b/newctime.3 index 3904d04..2e1d937 100644 --- a/newctime.3 +++ b/newctime.3 @@ -3,6 +3,8 @@ asctime, ctime, difftime, gmtime, localtime, mktime \- convert date and time .SH SYNOPSIS .nf +.ie \n(.g .ds - \f(CW-\fP +.el ds - \- .B extern char *tzname[2]; .PP .B void tzset() @@ -30,7 +32,7 @@ asctime, ctime, difftime, gmtime, localtime, mktime \- convert date and time .B time_t mktime(tm) .B struct tm *tm; .PP -.B cc ... -ltz +.B cc ... \*-ltz .fi .SH DESCRIPTION .ie '\(en'' .ds en \- @@ -42,7 +44,7 @@ asctime, ctime, difftime, gmtime, localtime, mktime \- convert date and time .de q \\$3\*(lq\\$1\*(rq\\$2 .. -.I Ctime\^ +.I Ctime converts a long integer, pointed to by .IR clock , and returns a pointer to a @@ -77,13 +79,13 @@ and can therefore represent time stamps that predate the introduction of UTC and are some other flavor of Universal Time (UT). Some implementations support leap seconds, in contradiction to POSIX. .PP -.I Localtime\^ +.I Localtime and -.I gmtime\^ +.I gmtime return pointers to .q "tm" structures, described below. -.I Localtime\^ +.I Localtime corrects for the time zone and any time zone adjustments (such as Daylight Saving Time in the United States). After filling in the @@ -98,17 +100,17 @@ to a pointer to a string that's the time zone abbreviation to be used with .IR localtime 's return value. .PP -.I Gmtime\^ +.I Gmtime converts to Coordinated Universal Time. .PP -.I Asctime\^ +.I Asctime converts a time value contained in a .q "tm" structure to a string, as shown in the above example, and returns a pointer to the string. .PP -.I Mktime\^ +.I Mktime converts the broken-down time, expressed as local time, in the structure pointed to by @@ -153,15 +155,15 @@ is not set until and .B tm_year are determined. -.I Mktime\^ +.I Mktime returns the specified calendar time; If the calendar time cannot be represented, -it returns \(mi1. +it returns \-1. .PP -.I Difftime\^ +.I Difftime returns the difference between two calendar times, .RI ( time1 -- +\- .IR time0 ), expressed in seconds. .PP @@ -169,7 +171,7 @@ Declarations of all the functions and externals, and the .q "tm" structure, are in the -.B <time.h>\^ +.B <time.h> header file. The structure (of type) .B struct tm @@ -183,7 +185,7 @@ includes the following fields: int tm_hour; /\(** hours (0\*(en23) \(**/ int tm_mday; /\(** day of month (1\*(en31) \(**/ int tm_mon; /\(** month of year (0\*(en11) \(**/ - int tm_year; /\(** year \(mi 1900 \(**/ + int tm_year; /\(** year \- 1900 \(**/ int tm_wday; /\(** day of week (Sunday = 0) \(**/ int tm_yday; /\(** day of year (0\*(en365) \(**/ int tm_isdst; /\(** is summer time in effect? \(**/ @@ -202,7 +204,7 @@ created. There is no guarantee that these fields will continue to exist in this form in future releases of this code. .PP -.I Tm_isdst\^ +.I Tm_isdst is non-zero if summer time is in effect. .PP .I Tm_gmtoff @@ -243,18 +245,18 @@ will also be overwritten at the next call (and by calls to .IR tzset ). .PP -.I Asctime\^ +.I Asctime and -.I ctime\^ +.I ctime behave strangely for years before 1000 or after 9999. The 1989 and 1999 editions of the C Standard say -that years from \(mi99 through 999 are converted without +that years from \-99 through 999 are converted without extra spaces, but this conflicts with longstanding tradition and with this implementation. Traditional implementations of these two functions are restricted to years in the range 1900 through 2099. To avoid this portability mess, new programs should use -.I strftime\^ +.I strftime instead. .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson. diff --git a/newstrftime.3 b/newstrftime.3 index dc9a348..7dd125c 100644 --- a/newstrftime.3 +++ b/newstrftime.3 @@ -42,6 +42,8 @@ strftime \- format date and time .SH SYNOPSIS .nf +.ie \n(.g .ds - \f(CW-\fP +.el ds - \- .B #include <sys/types.h> .B #include <time.h> .PP @@ -57,16 +59,16 @@ strftime \- format date and time .ie '\(en'' .ds en \- .el .ds en \(en The -.I strftime\^ +.I strftime function formats the information from -.I timeptr\^ +.I timeptr into the buffer -.I buf\^ +.I buf according to the string pointed to by -.IR format\^ . +.IR format . .PP The -.I format\^ +.I format string consists of zero or more conversion specifications and ordinary characters. All ordinary characters are copied directly into the buffer. @@ -75,12 +77,12 @@ A conversion specification consists of a percent sign and one other character. .PP No more than -.I maxsize\^ +.I maxsize characters are placed into the array. If the total number of resulting characters, including the terminating null character, is not more than -.IR maxsize\^ , -.I strftime\^ +.IR maxsize , +.I strftime returns the number of characters in the array, not counting the terminating null. Otherwise, zero is returned. @@ -118,7 +120,7 @@ is replaced by the day of month as a decimal number (1\*(en31); single digits are preceded by a blank. .TP %F -is replaced by the date in the format %Y-%m-%d. +is replaced by the date in the format %Y\*-%m\*-%d. .TP %G is replaced by the ISO 8601 year with century as a decimal number. @@ -214,7 +216,7 @@ or by the empty string if this is not determinable. .TP %z is replaced by the offset from the Prime Meridian -in the format +HHMM or \(miHHMM as appropriate, +in the format +HHMM or \*-HHMM as appropriate, with positive values representing locations east of Greenwich, or by the empty string if this is not determinable. .TP diff --git a/newtzset.3 b/newtzset.3 index e9920b6..46410bb 100644 --- a/newtzset.3 +++ b/newtzset.3 @@ -3,9 +3,11 @@ tzset \- initialize time conversion information .SH SYNOPSIS .nf +.ie \n(.g .ds - \f(CW-\fP +.el ds - \- .B void tzset() .PP -.B cc ... -ltz +.B cc ... \*-ltz .fi .SH DESCRIPTION .ie '\(en'' .ds en \- @@ -85,9 +87,9 @@ except a leading colon digits, comma .RB ( , ), ASCII minus -.RB ( \(mi ), +.RB ( \*- ), ASCII plus -.RB ( \(pl ), +.RB ( + ), and NUL bytes are allowed. .TP .I offset @@ -118,10 +120,10 @@ summer time is assumed to be one hour ahead of standard time. One or more digits may be used; the value is always interpreted as a decimal number. The hour must be between zero and 24, and the minutes (and seconds) \*(en if present \*(en between zero and 59. If preceded by a -.q "\fB-\fP" , +.q "\*-" , the time zone shall be east of the Prime Meridian; otherwise it shall be west (which may be indicated by an optional preceding -.q "\fB+\fP" . +.q "+" . .TP .I rule Indicates when to change to and back from summer time. The @@ -189,12 +191,12 @@ The has the same format as .I offset except that POSIX does not allow a leading sign (\c -.q "\fB-\fP" +.q "\*-" or -.q "\fB+\fP" ). +.q "+" ). As an extension to POSIX, the hours part of .I time -can range from \(mi167 through 167; this allows for unusual rules such +can range from \-167 through 167; this allows for unusual rules such as .q "the Saturday before the first Sunday of March" . The default, if @@ -212,14 +214,14 @@ extensions to POSIX. stands for US Eastern Standard Time (EST), 5 hours behind UTC, without daylight saving. .TP -.B FJT-12FJST,M10.3.1/146,M1.3.4/75 +.B FJT\*-12FJST,M10.3.1/146,M1.3.4/75 stands for Fiji Time (FJT) and Fiji Summer Time (FJST), 12 hours ahead of UTC, springing forward on October's third Monday at 146:00 (i.e., 02:00 on the first Sunday on or after October 21), and falling back on January's third Thursday at 75:00 (i.e., 03:00 on the first Sunday on or after January 18). .TP -.B IST-2IDT,M3.4.4/26,M10.5.0 +.B IST\*-2IDT,M3.4.4/26,M10.5.0 stands for Israel Standard Time (IST) and Israel Daylight Time (IDT), 2 hours ahead of UTC, springing forward on March's fourth Thursday at 26:00 (i.e., 02:00 on the first Friday on or after March @@ -235,12 +237,12 @@ all year and the initial .B WART is a placeholder. .TP -.B WGT3WGST,M3.5.0/-2,M10.5.0/-1 +.B WGT3WGST,M3.5.0/\*-2,M10.5.0/\*-1 stands for Western Greenland Time (WGT) and Western Greenland Summer Time (WGST), 3 hours behind UTC, where clocks follow the EU rules of -springing forward on March's last Sunday at 01:00 UTC (\(mi02:00 local +springing forward on March's last Sunday at 01:00 UTC (\-02:00 local time) and falling back on October's last Sunday at 01:00 UTC -(\(mi01:00 local time). +(\-01:00 local time). .PP If no .I rule diff --git a/time2posix.3 b/time2posix.3 index c02b1a2..d689608 100644 --- a/time2posix.3 +++ b/time2posix.3 @@ -3,6 +3,8 @@ time2posix, posix2time \- convert seconds since the Epoch .SH SYNOPSIS .nf +.ie \n(.g .ds - \f(CW-\fP +.el ds - \- .B #include <sys/types.h> .B #include <time.h> .PP @@ -12,7 +14,7 @@ time2posix, posix2time \- convert seconds since the Epoch .B time_t posix2time(t) .B time_t t .PP -.B cc ... -ltz +.B cc ... \*-ltz .fi .SH DESCRIPTION .ie '\(en'' .ds en \- diff --git a/tzfile.5 b/tzfile.5 index 69b9e8b..f413349 100644 --- a/tzfile.5 +++ b/tzfile.5 @@ -144,7 +144,7 @@ For version-3-format time zone files, the POSIX-TZ-style string may use two minor extensions to the POSIX TZ format, as described in .IR newtzset (3). First, the hours part of its transition times may be signed and range from -\(mi167 through 167 instead of the POSIX-required unsigned values +\-167 through 167 instead of the POSIX-required unsigned values from 0 through 24. Second, DST is in effect all year if it starts January 1 at 00:00 and ends December 31 at 24:00 plus the difference between daylight saving and standard time. diff --git a/tzselect.8 b/tzselect.8 index 1dd721a..7644112 100644 --- a/tzselect.8 +++ b/tzselect.8 @@ -2,17 +2,19 @@ .SH NAME tzselect \- select a time zone .SH SYNOPSIS +.ie \n(.g .ds - \f(CW-\fP +.el ds - \- .B tzselect [ -.B \-c +.B \*-c .I coord ] [ -.B \-n +.B \*-n .I limit ] [ -.B \-\-help +.B \*-\*-help ] [ -.B \-\-version +.B \*-\*-version ] .SH DESCRIPTION The @@ -24,7 +26,7 @@ The output is suitable as a value for the TZ environment variable. All interaction with the user is done via standard input and standard error. .SH OPTIONS .TP -.BI "\-c " coord +.BI "\*-c " coord Instead of asking for continent and then country and then city, ask for selection from time zones whose largest cities are closest to the location with geographical coordinates @@ -54,19 +56,19 @@ seconds, with any trailing fractions represent fractional minutes or .I SS is present) seconds. The decimal point is that of the current locale. For example, in the (default) C locale, -.B "\-c\ +40.689\-074.045" +.B "\*-c\ +40.689\*-074.045" specifies 40.689\(de\|N, 74.045\(de\|W, -.B "\-c\ +4041.4\-07402.7" +.B "\*-c\ +4041.4\*-07402.7" specifies 40\(de\|41.4\(fm\|N, 74\(de\|2.7\(fm\|W, and -.B "\-c\ +404121\-0740240" +.B "\*-c\ +404121\*-0740240" specifies 40\(de\|41\(fm\|21\(sd\|N, 74\(de\|2\(fm\|40\(sd\|W. If .I coord is not one of the documented forms, the resulting behavior is unspecified. .TP -.BI "\-n " limit +.BI "\*-n " limit When -.B \-c +.B \*-c is used, display the closest .I limit locations (default 10). @@ -76,10 +78,10 @@ Applications should not assume that output matches the user's political preferences. .RE .TP -.B "\-\-help" +.B "\*-\*-help" Output help information and exit. .TP -.B "\-\-version" +.B "\*-\*-version" Output version information and exit. .SH "ENVIRONMENT VARIABLES" .TP diff --git a/zdump.8 b/zdump.8 index 51243fb..94de021 100644 --- a/zdump.8 +++ b/zdump.8 @@ -4,17 +4,13 @@ zdump \- time zone dumper .SH SYNOPSIS .B zdump [ -.B \-\-version -] [ -.B \-v -] [ -.B \-V -] [ -.B \-c -[loyear,]hiyear ] [ -.B \-t -[lotime,]hitime ] [ zonename ... ] +.I option +\&... ] [ +.I zonename +\&... ] .SH DESCRIPTION +.ie \n(.g .ds - \f(CW-\fP +.el ds - \- .I Zdump prints the current time in each .I zonename @@ -22,10 +18,10 @@ named on the command line. .PP These options are available: .TP -.BI "\-\-version" +.BI "\*-\*-version" Output version information and exit. .TP -.B \-v +.B \*-v For each .I zonename on the command line, @@ -41,20 +37,20 @@ if the given time is Daylight Saving Time or .B isdst=0 otherwise. .TP -.B \-V +.B \*-V Like -.BR \-v , +.BR \*-v , except omit the times relative to the extreme time values. This generates output that is easier to compare to that of implementations with different time representations. .TP -.BI "\-c " [loyear,]hiyear +.BI "\*-c " [loyear,]hiyear Cut off verbose output near the start of the given year(s). By default, the program cuts off verbose output near the starts of the years -\(mi500 and 2500. +\-500 and 2500. .TP -.BI "\-t " [lotime,]hitime +.BI "\*-t " [lotime,]hitime Cut off verbose output at the start of the given time(s), given in decimal seconds since 1970-01-01 00:00:00 UTC. .SH LIMITATIONS diff --git a/zic.8 b/zic.8 index 90f3900..9af5d1f 100644 --- a/zic.8 +++ b/zic.8 @@ -4,28 +4,8 @@ zic \- time zone compiler .SH SYNOPSIS .B zic [ -.B \-\-version -] -[ -.B \-v -] [ -.B \-d -.I directory -] [ -.B \-l -.I localtime -] [ -.B \-p -.I posixrules -] [ -.B \-L -.I leapsecondfilename -] [ -.B \-s -] [ -.B \-y -.I command -] [ +.I option +\&... ] [ .I filename \&... ] .SH DESCRIPTION @@ -40,27 +20,33 @@ zic \- time zone compiler .el .ds < \(la .ie '\(ra'' .ds > > .el .ds > \(ra -.ie \n(.g .ds : \: -.el .ds : +.ie \n(.g \{\ +. ds : \: +. ds - \f(CW-\fP +.\} +.el \{\ +. ds : +. el ds - \- +.\} .I Zic reads text from the file(s) named on the command line and creates the time conversion information files specified in this input. If a .I filename is -.BR \- , +.q "\*-" , the standard input is read. .PP These options are available: .TP -.BI "\-\-version" +.BI "\*-\*-version" Output version information and exit. .TP -.BI "\-d " directory +.BI "\*-d " directory Create time conversion information files in the named directory rather than in the standard directory named below. .TP -.BI "\-l " timezone +.BI "\*-l " timezone Use the given time zone as local time. .I Zic will act as if the input contained a link line of the form @@ -68,7 +54,7 @@ will act as if the input contained a link line of the form .ti +.5i Link \fItimezone\fP localtime .TP -.BI "\-p " timezone +.BI "\*-p " timezone Use the given time zone's rules when handling POSIX-format time zone environment variables. .I Zic @@ -77,12 +63,12 @@ will act as if the input contained a link line of the form .ti +.5i Link \fItimezone\fP posixrules .TP -.BI "\-L " leapsecondfilename +.BI "\*-L " leapsecondfilename Read leap second information from the file with the given name. If this option is not used, no leap second information appears in output files. .TP -.B \-v +.B \*-v Be more verbose, and complain about the following situations: .RS .PP @@ -120,21 +106,21 @@ A time zone abbreviation has fewer than 3 characters. POSIX requires at least 3. .PP An output file name contains a byte that is not an ASCII letter, -.q "-" , +.q "\*-" , .q "/" , or .q "_" ; or it contains a file name component that contains more than 14 bytes or that starts with -.q "-" . +.q "\*-" . .RE .TP -.B \-s +.B \*-s Limit time values stored in output files to values that are the same whether they're taken to be signed or unsigned. You can use this option to generate SVVS-compatible files. .TP -.BI "\-y " command +.BI "\*-y " command Use the given .I command rather than @@ -152,7 +138,7 @@ non-PPCS bytes. Non-PPCS characters typically occur only in comments: although output file names and time zone abbreviations can contain nearly any character, other software will work better if these are limited to the restricted syntax described under the -.B \-v +.B \*-v option. .PP Input lines are made up of fields. @@ -181,7 +167,7 @@ Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S For example: .ti +.5i .sp -Rule US 1967 1973 \- Apr lastSun 2:00 1:00 D +Rule US 1967 1973 \*- Apr lastSun 2:00 1:00 D .sp .fi The fields that make up a rule line are: @@ -221,7 +207,7 @@ Gives the type of year in which the rule applies. If .B TYPE is -.B \- +.q \*- then the rule applies in all years between .B FROM and @@ -274,7 +260,7 @@ Recognized forms include: 2:00 time in hours and minutes 15:00 24-hour format time (for times after noon) 1:28:14 time in hours, minutes, and seconds -\- equivalent to 0 +\*- equivalent to 0 .fi .in -.5i .sp @@ -323,7 +309,7 @@ or .q "EDT" ) of time zone abbreviations to be used when this rule is in effect. If this field is -.BR \- , +.q \*- , the variable part is null. .PP A zone line has the form @@ -365,7 +351,7 @@ begin the field with a minus sign if time must be subtracted from UT. The name of the rule(s) that apply in the time zone or, alternately, an amount of time to add to local standard time. If this field is -.B \- +.B \*- then standard time always applies in the time zone. .TP .B FORMAT @@ -461,7 +447,7 @@ should be .q "+" if a second was added or -.q "-" +.q "\*-" if a second was skipped. .\" There's no need to document the following, since it's impossible for more .\" than one leap second to be inserted or deleted at a time. @@ -496,20 +482,20 @@ input, intended to illustrate many of its features. .ta \w'# Rule\0\0'u +\w'NAME\0\0'u +\w'FROM\0\0'u +\w'1973\0\0'u +\w'TYPE\0\0'u +\w'Apr\0\0'u +\w'lastSun\0\0'u +\w'2:00\0\0'u +\w'SAVE\0\0'u .sp # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S -Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 - +Rule Swiss 1941 1942 \*- May Mon>=1 1:00 1:00 S +Rule Swiss 1941 1942 \*- Oct Mon>=1 2:00 0 \*- .sp .5 -Rule EU 1977 1980 - Apr Sun>=1 1:00u 1:00 S -Rule EU 1977 only - Sep lastSun 1:00u 0 - -Rule EU 1978 only - Oct 1 1:00u 0 - -Rule EU 1979 1995 - Sep lastSun 1:00u 0 - -Rule EU 1981 max - Mar lastSun 1:00u 1:00 S -Rule EU 1996 max - Oct lastSun 1:00u 0 - +Rule EU 1977 1980 \*- Apr Sun>=1 1:00u 1:00 S +Rule EU 1977 only \*- Sep lastSun 1:00u 0 \*- +Rule EU 1978 only \*- Oct 1 1:00u 0 \*- +Rule EU 1979 1995 \*- Sep lastSun 1:00u 0 \*- +Rule EU 1981 max \*- Mar lastSun 1:00u 1:00 S +Rule EU 1996 max \*- Oct lastSun 1:00u 0 \*- .sp .ta \w'# Zone\0\0'u +\w'Europe/Zurich\0\0'u +\w'GMTOFF\0\0'u +\w'RULES/SAVE\0\0'u +\w'FORMAT\0\0'u # Zone NAME GMTOFF RULES/SAVE FORMAT UNTIL -Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 - 0:29:46 - BMT 1894 Jun +Zone Europe/Zurich 0:34:08 \*- LMT 1853 Jul 16 + 0:29:46 \*- BMT 1894 Jun 1:00 Swiss CE%sT 1981 1:00 EU CE%sT .sp -- 1.9.1

1 0

[PATCH] * asctime.c, newctime.3, newtzset.3: Don't imply ASCII is required.
by Paul Eggert June 28, 2014

June 28, 2014

--- asctime.c | 2 +- newctime.3 | 5 ++--- newtzset.3 | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/asctime.c b/asctime.c index 152b0db..e057711 100644 --- a/asctime.c +++ b/asctime.c @@ -55,7 +55,7 @@ ** ??? ???-2147483648 -2147483648:-2147483648:-2147483648 -2147483648\n ** (two three-character abbreviations, five strings denoting integers, ** seven explicit spaces, two explicit colons, a newline, -** and a trailing ASCII nul). +** and a trailing NUL byte). ** The values above are for systems where an int is 32 bits and are provided ** as an example; the define below calculates the maximum for the system at ** hand. diff --git a/newctime.3 b/newctime.3 index 1353869..3904d04 100644 --- a/newctime.3 +++ b/newctime.3 @@ -1,6 +1,6 @@ .TH NEWCTIME 3 .SH NAME -asctime, ctime, difftime, gmtime, localtime, mktime \- convert date and time to ASCII +asctime, ctime, difftime, gmtime, localtime, mktime \- convert date and time .SH SYNOPSIS .nf .B extern char *tzname[2]; @@ -94,8 +94,7 @@ sets the .BR tm_isdst 'th element of .B tzname -to a pointer to an -ASCII string that's the time zone abbreviation to be used with +to a pointer to a string that's the time zone abbreviation to be used with .IR localtime 's return value. .PP diff --git a/newtzset.3 b/newtzset.3 index 4af938b..e9920b6 100644 --- a/newtzset.3 +++ b/newtzset.3 @@ -88,7 +88,7 @@ ASCII minus .RB ( \(mi ), ASCII plus .RB ( \(pl ), -and ASCII NUL are allowed. +and NUL bytes are allowed. .TP .I offset Indicates the value one must add to the local time to arrive at -- 1.9.1

1 0

[PATCH] More spelling and accent fixes.
by Paul Eggert June 27, 2014

June 27, 2014

Plus, update a now-obsolete source for Samoa's late-2011 change to the International Date Line. --- Makefile | 2 +- NEWS | 4 ++-- Theory | 2 +- asia | 22 +++++++++++----------- australasia | 44 +++++++------------------------------------- europe | 8 ++++---- northamerica | 4 ++-- southamerica | 4 ++-- 8 files changed, 30 insertions(+), 60 deletions(-) diff --git a/Makefile b/Makefile index ff941a0..8de640a 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,7 @@ LDLIBS= # year 2000 grief # -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t # -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" -# -TTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; +# -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified # DST transitions if the time zone files cannot be accessed diff --git a/NEWS b/NEWS index 789f955..162a113 100644 --- a/NEWS +++ b/NEWS @@ -1184,7 +1184,7 @@ Release data2009m - 2009-09-03 10:23:43 -0400 Release data2009l - 2009-08-14 09:13:07 -0400 - Samao (comments only) and Egypt + Samoa (comments only) and Egypt Release 2009k - 2009-07-20 09:46:08 -0400 @@ -1512,7 +1512,7 @@ Release 2005o - 2005-11-28 10:55:26 -0500 Release 2005n - 2005-10-03 09:44:09 -0400 - changes by Paul Eggert (both the Uruguary changes and the Kyrgyzstan + changes by Paul Eggert (both the Uruguay changes and the Kyrgyzstan et al. changes) diff --git a/Theory b/Theory index ef26751..a956d85 100644 --- a/Theory +++ b/Theory @@ -655,7 +655,7 @@ Gregorian calendar: 14/25 Dec 1583 - Steiermark 06/17 Jan 1584 - Austria and Bohemia -11/22 Jan 1584 - Luzern, Uri, Schwyz, Zug, Freiburg, Solothurn +11/22 Jan 1584 - Lucerne, Uri, Schwyz, Zug, Freiburg, Solothurn 12/23 Jan 1584 - Silesia and the Lausitz 22 Jan/ 02 Feb 1584 - Hungary (legally on 21 Oct 1587) diff --git a/asia b/asia index 5f76ab7..54a8dc7 100644 --- a/asia +++ b/asia @@ -281,7 +281,7 @@ Zone Asia/Phnom_Penh 6:59:40 - LMT 1906 Jun 9 # No they don't. See TIME mag, 1986-02-17 p.52. Even though # China is across 4 physical time zones, before Feb 1, 1986 only the # Peking (Beijing) time zone was recognized. Since that date, China -# has two of 'em - Peking's and Urumqi (named after the capital of +# has two of 'em - Peking's and Ürümqi (named after the capital of # the Xinjiang Uyghur Autonomous Region). I don't know about DST for it. # # . . .I just deleted the DST table and this editor makes it too @@ -342,7 +342,7 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1:00 D # separately: daylight savings (which, you're correct, wasn't # implemented until the 1980s) and the unified time zone centered near # Beijing (which was implemented in 1949). Briefly, there was also a -# "Lhasa Time" in Tibet and "Urumqi Time" in Xinjiang. The first was +# "Lhasa Time" in Tibet and "Ürümqi Time" in Xinjiang. The first was # ceased, and the second eventually recognized (again, in the 1980s). # # From Paul Eggert (2008-06-30): @@ -383,7 +383,7 @@ Zone Asia/Chongqing 7:06:20 - LMT 1928 # or Chungking # Wusu, Qiemo, Xinyan, Wulanwusu, Jinghe, Yumin, Tacheng, Tuoli, Emin, # Shihezi, Changji, Yanqi, Heshuo, Tuokexun, Tulufan, Shanshan, Hami, # Fukang, Kuitun, Kumukuli, Miquan, Qitai, and Turfan. -Zone Asia/Urumqi 5:50:20 - LMT 1928 # Ürümqi or Urumchi +Zone Asia/Urumqi 5:50:20 - LMT 1928 # Ürümqi or Ürümchi 6:00 - URUT 1980 May # Ürümqi Time 8:00 PRC C%sT # Kunlun Time @@ -403,9 +403,9 @@ Zone Asia/Urumqi 5:50:20 - LMT 1928 # Ürümqi or Urumchi # population of Xinjiang, typically use "Xinjiang time" which is two # hours behind Beijing time, or UTC +0600. The government of the Xinjiang # Uyghur Autonomous Region, (XAUR, or just Xinjiang for short) as well as -# local governments such as the Urumqi city government use both times in +# local governments such as the Ürümqi city government use both times in # publications, referring to what is popularly called Xinjiang time as -# "Urumqi time." When Uyghurs make an appointment in the Uyghur language +# "Ürümqi time." When Uyghurs make an appointment in the Uyghur language # they almost invariably use Xinjiang time. # # (Their ethnic Han compatriots would typically have no clue of its @@ -418,17 +418,17 @@ Zone Asia/Urumqi 5:50:20 - LMT 1928 # Ürümqi or Urumchi # time. Some areas remained on standard Xinjiang time or Beijing time and # others moving their clocks ahead.) # -# ...an example of an official website using of Urumqi time. +# ...an example of an official website using of Ürümqi time. # # The first few lines of the Google translation of # http://www.fjysgl.gov.cn/show.aspx?id=2379&cid=39 # (retrieved 2009-10-13) -# > Urumqi fire seven people are missing the alleged losses of at least +# > Ürümqi fire seven people are missing the alleged losses of at least # > 500 million yuan # > -# > (Reporter Dong Liu) the day before 20:20 or so (Urumqi Time 18:20), -# > Urumqi City Department of International Plaza Luther Qiantang River -# > burst fire. As of yesterday, 18:30, Urumqi City Fire officers and men +# > (Reporter Dong Liu) the day before 20:20 or so (Ürümqi Time 18:20), +# > Ürümqi City Department of International Plaza Luther Qiantang River +# > burst fire. As of yesterday, 18:30, Ürümqi City Fire officers and men # > have worked continuously for 22 hours... # From Luther Ma (2009-11-19): @@ -440,7 +440,7 @@ Zone Asia/Urumqi 5:50:20 - LMT 1928 # Ürümqi or Urumchi # 3. Urumqi... # 4. Kashgar... # ... -# 5. It seems that Uyghurs in Urumqi has been using Xinjiang since at least the +# 5. It seems that Uyghurs in Ürümqi has been using Xinjiang since at least the # 1960's. I know of one Han, now over 50, who grew up in the surrounding # countryside and used Xinjiang time as a child. # diff --git a/australasia b/australasia index 045be88..1cb34a3 100644 --- a/australasia +++ b/australasia @@ -571,42 +571,12 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5 # # http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963 -# From Mark Sim-Smith (2011-08-17): -# I have been in contact with Leilani Tuala Warren from the Samoa Law -# Reform Commission, and she has sent me a copy of the Bill that she -# confirmed has been passed...Most of the sections are about maps rather -# than the time zone change, but I'll paste the relevant bits below. But -# the essence is that at midnight 29 Dec (UTC-11 I suppose), Samoa -# changes from UTC-11 to UTC+13: -# -# International Date Line Bill 2011 -# -# AN ACT to provide for the change to standard time in Samoa and to make -# consequential amendments to the position of the International Date -# Line, and for related purposes. -# -# BE IT ENACTED by the Legislative Assembly of Samoa in Parliament -# assembled as follows: -# -# 1. Short title and commencement-(1) This Act may be cited as the -# International Date Line Act 2011. (2) Except for section 5(3) this Act -# commences at 12 o'clock midnight, on Thursday 29th December 2011. (3) -# Section 5(3) commences on the date of assent by the Head of State. -# -# [snip] -# -# 3. Interpretation - [snip] "Samoa standard time" in this Act and any -# other statute of Samoa which refers to 'Samoa standard time' means the -# time 13 hours in advance of Co-ordinated Universal Time. -# -# 4. Samoa standard time - (1) Upon the commencement of this Act, Samoa -# standard time shall be set at 13 hours in advance of Co-ordinated -# Universal Time for the whole of Samoa. (2) All references to Samoa's -# time zone and to Samoa standard time in Samoa in all legislation and -# instruments after the commencement of this Act shall be references to -# Samoa standard time as provided for in this Act. (3) Nothing in this -# Act affects the provisions of the Daylight Saving Act 2009, except that -# it defines Samoa standard time.... +# From Paul Eggert (2014-06-27): +# The International Date Line Act 2011 +# http://www.parliament.gov.ws/images/ACTS/International_Date_Line_Act__2011_… +# changed Samoa from UTC-11 to UTC+13, effective "12 o'clock midnight, on +# Thursday 29th December 2011". The International Date Line was adjusted +# accordingly. # From Laupue Raymond Hughes (2011-09-02): # http://www.mcil.gov.ws/mcil_publications.html @@ -649,7 +619,7 @@ Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:00 - WST 2010 Sep 26 -11:00 1:00 WSDT 2011 Apr 2 4:00 -11:00 - WST 2011 Sep 24 3:00 - -11:00 1:00 WSDT 2011 Dec 30 + -11:00 1:00 WSDT 2011 Dec 29 24:00 13:00 1:00 WSDT 2012 Apr Sun>=1 4:00 13:00 WS WS%sT diff --git a/europe b/europe index 6ab0413..5ef94b0 100644 --- a/europe +++ b/europe @@ -880,7 +880,7 @@ Zone Europe/Copenhagen 0:50:20 - LMT 1890 1:00 C-Eur CE%sT 1945 Apr 2 2:00 1:00 Denmark CE%sT 1980 1:00 EU CE%sT -Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Torshavn +Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn 0:00 - WET 1981 0:00 EU WE%sT # @@ -1855,7 +1855,7 @@ Zone Europe/Oslo 0:43:00 - LMT 1895 Jan 1 # <http://home.no.net/janmayen/history.htm> says that the meteorologists # burned down their station in 1940 and left the island, but returned in # 1941 with a small Norwegian garrison and continued operations despite -# frequent air ttacks from Germans. In 1943 the Americans established a +# frequent air attacks from Germans. In 1943 the Americans established a # radiolocating station on the island, called "Atlantic City". Possibly # the UT offset changed during the war, but I think it unlikely that # Jan Mayen used German daylight-saving rules. @@ -2808,7 +2808,7 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. # Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got # approval from 266 deputies. # -# Ukraine abolishes transter back to the winter time (in Russian) +# Ukraine abolishes transfer back to the winter time (in Russian) # http://news.mail.ru/politics/6861560/ # # The Ukrainians will no longer change the clock (in Russian) @@ -2874,7 +2874,7 @@ Zone Europe/Kiev 2:02:04 - LMT 1880 2:00 E-Eur EE%sT 1995 2:00 EU EE%sT # Ruthenia used CET 1990/1991. -# "Uzhhorod" is the transliteration of the Ukrainian name, but +# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but # "Uzhgorod" is more common in English. Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct 1:00 - CET 1940 diff --git a/northamerica b/northamerica index 28a05ce..66f362b 100644 --- a/northamerica +++ b/northamerica @@ -659,7 +659,7 @@ Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11 # with the following exceptions: # # - Gibson, Jasper, Lake, LaPorte, Newton, Porter, Posey, Spencer, -# Vandenburgh, and Warrick counties have been like America/Chicago. +# Vanderburgh, and Warrick counties have been like America/Chicago. # # - Dearborn and Ohio counties have been like America/New_York. # @@ -2688,7 +2688,7 @@ Zone America/Costa_Rica -5:36:13 - LMT 1890 # San José # web site, the Granma. Please check out # http://www.granma.cubaweb.cu/2008/03/13/nacional/artic10.html # -# Basically as expected after Steffen Thorsens information, the change +# Basically as expected after Steffen Thorsen's information, the change # will take place midnight between Saturday and Sunday. # From Arthur David Olson (2008-03-12): diff --git a/southamerica b/southamerica index 4016306..de1f15e 100644 --- a/southamerica +++ b/southamerica @@ -682,7 +682,7 @@ Zone America/La_Paz -4:32:36 - LMT 1890 # From Paul Schulze (2008-06-24): # ...by law number 11.662 of April 24, 2008 (published in the "Diario -# Oficial da Uniao"...) in Brazil there are changes in the timezones, +# Oficial da União"...) in Brazil there are changes in the timezones, # effective today (00:00am at June 24, 2008) as follows: # # a) The timezone UTC+5 is e[x]tinguished, with all the Acre state and the @@ -1314,7 +1314,7 @@ Link America/Curacao America/Kralendijk # Caribbean Netherlands # Ecuador # -# Milne says the Sentral and South American Telegraph Company used -5:24:15. +# Milne says the Central and South American Telegraph Company used -5:24:15. # # From Paul Eggert (2007-03-04): # Apparently Ecuador had a failed experiment with DST in 1992. -- 1.9.1

1 0

[PATCH] * leap-seconds.list: Copy from current NIST version.
by Paul Eggert June 27, 2014

June 27, 2014

--- leap-seconds.list | 66 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/leap-seconds.list b/leap-seconds.list index 7df3de6..607fa7d 100644 --- a/leap-seconds.list +++ b/leap-seconds.list @@ -15,12 +15,17 @@ # are transmitted by almost all time services. # # The first column shows an epoch as a number of seconds -# since 1900.0 and the second column shows the number of -# seconds that must be added to UTC to compute TAI for -# any timestamp at or after that epoch. The value on -# each line is valid from the indicated initial instant -# until the epoch given on the next one or indefinitely -# into the future if there is no next line. +# since 1 January 1900, 00:00:00 (1900.0 is also used to +# indicate the same epoch.) Both of these time stamp formats +# ignore the complexities of the time scales that were +# used before the current definition of UTC at the start +# of 1972. (See note 3 below.) +# The second column shows the number of seconds that +# must be added to UTC to compute TAI for any timestamp +# at or after that epoch. The value on each line is +# valid from the indicated initial instant until the +# epoch given on the next one or indefinitely into the +# future if there is no next line. # (The comment on each line shows the representation of # the corresponding initial epoch in the usual # day-month-year format. The epoch always begins at @@ -44,9 +49,9 @@ # by the International Bureau of Weights and Measures # (BIPM). See www.bipm.fr for more information. # -# 3. The current defintion of the relationship between UTC +# 3. The current definition of the relationship between UTC # and TAI dates from 1 January 1972. A number of different -# time scales were in use before than epoch, and it can be +# time scales were in use before that epoch, and it can be # quite difficult to compute precise timestamps and time # intervals in those "prehistoric" days. For more information, # consult: @@ -59,16 +64,11 @@ # July, 1991. # # 4. The insertion of leap seconds into UTC is currently the -# responsibility of the International Earth Rotation Service, -# which is located at the Paris Observatory: -# -# Central Bureau of IERS -# 61, Avenue de l'Observatoire -# 75014 Paris, France. +# responsibility of the International Earth Rotation Service. # # Leap seconds are announced by the IERS in its Bulletin C # -# See hpiers.obspm.fr or www.iers.org for more details. +# See www.iers.org for more details. # # All national laboratories and timing centers use the # data from the BIPM and the IERS to construct their @@ -126,7 +126,7 @@ # Time and Frequency Division # NIST # Boulder, Colorado -# jlevine(a)boulder.nist.gov +# Judah.Levine(a)nist.gov # # Last Update of leap second values: 11 January 2012 # @@ -139,18 +139,19 @@ #$ 3535228800 # # The NTP timestamps are in units of seconds since the NTP epoch, -# which is 1900.0. The Modified Julian Day number corresponding -# to the NTP time stamp, X, can be computed as +# which is 1 January 1900, 00:00:00. The Modified Julian Day number +# corresponding to the NTP time stamp, X, can be computed as # # X/86400 + 15020 # # where the first term converts seconds to days and the second -# term adds the MJD corresponding to 1900.0. The integer portion -# of the result is the integer MJD for that day, and any remainder -# is the time of day, expressed as the fraction of the day since 0 -# hours UTC. The conversion from day fraction to seconds or to -# hours, minutes, and seconds may involve rounding or truncation, -# depending on the method used in the computation. +# term adds the MJD corresponding to the time origin defined above. +# The integer portion of the result is the integer MJD for that +# day, and any remainder is the time of day, expressed as the +# fraction of the day since 0 hours UTC. The conversion from day +# fraction to seconds or to hours, minutes, and seconds may involve +# rounding or truncation, depending on the method used in the +# computation. # # The data in this file will be updated periodically as new leap # seconds are announced. In addition to being entered on the line @@ -163,10 +164,11 @@ # is announced. # # The following entry specifies the expiration date of the data -# in this file in units of seconds since 1900.0. This expiration date -# will be changed at least twice per year whether or not a new leap -# second is announced. These semi-annual changes will be made no -# later than 1 June and 1 December of each year to indicate what +# in this file in units of seconds since the origin at the instant +# 1 January 1900, 00:00:00. This expiration date will be changed +# at least twice per year whether or not a new leap second is +# announced. These semi-annual changes will be made no later +# than 1 June and 1 December of each year to indicate what # action (if any) is to be taken on 30 June and 31 December, # respectively. (These are the customary effective dates for new # leap seconds.) This expiration date will be identified by a @@ -182,10 +184,10 @@ # current -- the update time stamp, the data and the name of the file # will not change. # -# Updated through IERS Bulletin C46 -# File expires on: 28 June 2014 +# Updated through IERS Bulletin C47 +# File expires on: 28 December 2014 # -#@ 3612902400 +#@ 3628713600 # 2272060800 10 # 1 Jan 1972 2287785600 11 # 1 Jul 1972 @@ -228,4 +230,4 @@ # the hash line is also ignored in the # computation. # -#h 1151a8f e85a5069 9000fcdb 3d5e5365 1d505b37 +#h 9195bac3 a050810e e85fc815 e752446a 76ade206 -- 1.9.1

1 0

More Javascript Libraries
by Matt Johnson June 27, 2014

June 27, 2014

For consideration in tz-link.html. Feel free to adjust wording. http://momentjs.com/timezone Moment-Timezone is a time zone plugin for Moment.js, a feature-rich JavaScript library for parsing, validation, manipulation and display of dates. It includes a data-builder utility that parses the tz source files. It is freely available under the MIT License. http://github.com/sproutsocial/walltime-js Walltime-js is a JavaScript library that performs simple time zone conversions. It includes a grunt script that parses the tz source files. It is freely available under the MIT License. http://github.com/bigeasy/timezone Timezone is a JavaScript library that offers an API for time zone conversions, time zone aware date math, and time zone and locale aware date formatting. It includes a makefile that reads the binary output of zic to create data files that can be read by the script. It is freely available under the MIT License. Thanks, Matt Johnson

2 1

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

June 27, 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 27, 2014

June 27, 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 27, 2014

June 27, 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