- tz - lists.iana.org

FW: Nunavut time zones - pointer to proclamation
by Olson, Arthur David (NCI) June 19, 2001

June 19, 2001

-----Original Message----- From: Mathew Englander Sent: Monday, June 18, 2001 5:33 PM To: Olson, Arthur David (NCI) Subject: Nunavut time zones - pointer to proclamation In case you aren't aware, there is a proclamation establishing 3 time zones for Nunavut in the Canada Gazette, Part II, June 6 2001, on pp. 1066-67. This is available in pdf and ascii formats on the Internet. For the pdf file, go to http://canada.gc.ca/gazette/part2/pdf/g2-13512.pdf and then scroll to page 78 of 99.

1 0

Thread-safe timezones: running code
by Jonathan Lennox June 18, 2001

June 18, 2001

I've finished a first cut (call it beta 1?) of a tzcode-based implementation of my thread-safe time zone API. The API as defined here was fairly straightforward to implement. Only a few changes were necessary. * The most noticable change is that the type representing a time zone object is now 'struct tzinfo', not 'struct timezone'. I discovered that 'struct timezone' is the type of the deprecated second argument to BSD gettimeofday(). * Other than that, I clarified some things, notably the fact that tzname and the other externs aren't defined when you're using pthread_settz(). (I could have implemented them using the trick used for thread-safe errno, but it seemed like too much trouble for a badly-defined API.) The attached patch also contains code to make the 'normal' time functions thread-safe. This is based on FreeBSD's changes to tzcode to make it thread-safe, but rather than sticking #ifdef's directly into the code, as FreeBSD does, I instead implemented them as macros. You can control your thread model based on a Makefile setting. The only part of the thread-safety API that isn't currently implemented in my patch is that the error return value of strftime_z() is still the same as that of strftime(), rather than using the snprintf() error return style. This requires annoyingly intrusive changes to tzcode's strftime(), so I've put it off for now. Attached, find two files: 1. The revised (v3) API proposal. 2. A patch to tzcode2001c implementing the proposal. Comments are very welcome! A proposal for thread-safe time zone information. A set of extensions to ISO C (99) and IEEE POSIX (200x). by Jonathan Lennox, Columbia University. Version 3. Summary: A new data type is defined, 'struct tzinfo', that represents the time zone information for a particular region. Versions of the ISO C time conversion functions are defined that take this data type as an argument. Definitions: Time zone: The set of information necessary to correctly convert bidirectionally between a time_t and a struct tm, for a particular geographic region. Wall clock time: The system's best approximation of the local time in its physical location, independent of the physical location of any user. Functions defined in this proposal: Functions manipulating struct tzinfo values: Name tz_prep -- prepare a time zone object, based on a descriptive string. Synopsis #include <time.h> int tz_prep(struct tzinfo** tz, const char *tzstring); Description The tz_prep() function creates a new time zone object, corresponding to the given time zone name. tzstring is a pointer to a string, or NULL. The two defined values of tzstring are NULL, representing the system's best approximation of its wall clock time, and the zero-length string "", representing the system's best approximation of Coordinated Universal Time (UTC). On successful completion, *tz will contain a pointer to a struct tzinfo, contains all necessary information to represent times in the specified time zone. It has no externally-visible elements. POSIX extension: In a POSIX-based environment, the syntax of tzstring is the same as that of the "TZ" environment variable, including the implementation-defined values beginning with ':'. Return Value On successful completion, tz_prep() returns a value of 0 and fills in *tz. On failure, an error number is returned and no resources are allocated. Errors The tz_prep() function shall fail if: ENOMEM Not enough memory is available to create the time zone object. ENOENT No known time zone corresponds to tzname. The tz_prep() function may fail if: * There is a problem with the system's configuration (such as an on-disk time zone database) which caused retrieval of the time zone information to fail unexpectedly. In this case any appropriate error number may be returned. Rationale and commentary Systems which define extensions beyond POSIX (such as the Olson time zone names) for the "TZ" environment variable should support the same extensions for tzstring. Under the POSIX rules, strings such as "UTC0" can also represent UTC, but the empty string "" is the portable representation. This representation is also correctly locale-independent -- "UTC0" in fr_FR generates times with the incorrect time zone abbreviation "UTC", whereas "" in that locale should use the correct time zone abbreviation "TUC" if the time zone code correctly supports locales. This interface is designed so that tz_prep(getenv("TZ")) will return an object describing the default time zone object that non-thread-aware versions of the time functions will use by default, provided TZ (if set) is set to a valid time zone name. Question for discussion: should there be an ISO C way of saying "the timezone which localtime() and mktime() would use by default"? Currently this is only possible for POSIX, using thee tz_prep(getenv("TZ")) idiom mentioned above. Name tz_free -- Free resources allocated for a time zone object Synopsis #include <time.h> void tz_free(struct tzinfo* tzobj); Description The tz_free() function frees the resources allocated for a time zone object returned by a call to tz_prep(). Return Value None. Errors None. Rationale and commentary None needed. Functions using struct tzinfo to manipulate time values: Name time_make - derive a time_t from a struct tm, in a specified time zone. Synopsis #include <time.h> int time_make(time_t *clock, struct tm *tm, const struct tzinfo *tz); Description This function interprets the broken-down time in *tm as a local time in the timezone specified in *tz, and writes the corresponding value into *clock, using the same encoding as that of the values returned by the 'time' function. The original values of the tm_wday and tm_yday components of *tm are ignored, and the original values of the other components are not restricted to their normal ranges. (A positive or zero value for tm_isdst causes time_make() to presume initially that summer time (for example, Daylight Saving Time) is or is not in effect for the specified time, respectively. A negative value for tm_isdst causes the time_make() function to attempt to divine whether summer time is in effect for the specified time.) On successful completion, the values of the tm_wday and tm_yday components of *tm are set appropriately, and the other components are set to represent the specified calendar time, but with their values forced to their normal ranges; the final value of tm_mday is not set until tm_mon and tm_year are determined. Returns time_make returns 0 on sucessful completion, sets *clock, and normalizes *tm. On failure, it returns an error number and leaves the values of *clock and *tm undefined. Errors time_make() shall fail if: ERANGE *tm does not represent a time representable by a time_t value. time_make() may fail if: EINVAL *tm does not represent a possible time in the timezone *tz. (For instance, a leap-forward interval.) Rationale and commentary This function is the generalization of the ISO C function mktime() and the BSD/tzcode function timegm(). The name and calling conventions of this function are inspired by Markus Kuhn's proposed xtime_make(). struct xtime is a much more sophisticated and better-defined representation of time than time_t; this proposal is designed to be less ambitious while still leaving room for these future improvements. Following Kuhn, this function corrects a flaw of mktime()/timegm(). Those functions use the value (time_t)-1 to represent an error return status. However, this value can also be a correct translation of a struct tm representing the time December 31, 1969, 23:59:59 GMT (assuming POSIX time_t's). This function, instead, uses an out-of-band method to indicate error conditions, leaving the entire time_t space free to represent valid values. Given an impossible time value for the time zone (e.g. one that occurs during a leap-forward interval), implemenetations have a choice of failing and returning EINVAL, or normalizing *tm to a nearby valid time. Name time_breakup - derive a struct tm from a time_t, in a specified time zone. Synopsis #include <time.h> int time_breakup(struct tm *result, const time_t *clock, const struct tzinfo *tz); Description Fill in *result with the values corresponding to *clock in the time zone *tz. Return value time_breakup() returns 0, and fills in *result, always. Errors None. Rationale and commentary This function is the generalization of the ISO C functions localtime() and gmtime(), and the POSIX functions localtime_r() and gmtime_r(). It is inspired by Markus Kuhn's xtime_breakup(). The function assumes that a 'struct tzinfo' will be able to do something reasonable over the whole range of a time_t. This isn't necessarily true; it might be sensible to define an ERANGE error return value? This function omits the localtime side effect that it sets the value of the global variable char *tzname[2]. It's not clear how best to handle the BSD/tzcode tm_zone field of struct tm. This is defined as a char*, but since there is no tm_free() function, the data it points to cannot be dynamically allocated by time_breakup(). One possibility would be to have tm_zone point into data stored within 'struct tz', but then it would be invalidated when tz_free() was called. A second possibility would be to define tm_zone as char tm_zone[TZNAME_MAX], but this would break binary compatibility. A third possibility would be to deprecate tm_zone, and have time_breakup leave it NULL. Zone names can be obtained by calling strftime with a "%Z" format string (assuming POSIX strftime). Name strftime_z - generate a text representation of a time value, in a given time zone. Synopsis #include <time.h> size_t strftime_z(char * restrict buf, size_t maxsize, const char * restrict format, const struct tm * restrict timeptr, const struct tzinfo * restrict tz); Description strftime_z() formats the information from 'timeptr' into the buffer 'buf' according to the format specified by 'format' and the system locale. The format specified by 'format' is the same as that of strftime(). POSIX note: All POSIX extensions to strftime() apply to strftime_z() as well. Return value On successful completion, strftime_z fills in 'buf' and returns the number of bytes converted. On failure, strftime_z returns the number of bytes of buffer that would be required to fully perform the conversion (including the terminating NUL), and leaves 'buf' in an indeterminate state. Errors None. Rationale and commentary This function is a generalization of strftime(). The return value of this function has changed from strftime(), however. strftime() returns 0 if the buffer is not large enough. This function, instead, follows the example of ISO C 99's snprintf(), which allows an appropriately-sized buffer to be allocated in one step after a failure, rather than requiring a binary search. The error status can be easily checked by checking (ret <= maxbuf). The formatting strings of ISO C strftime() are not affected by the time zone, so this function is strictly speaking not necessary in a pure-C environment. POSIX strftime(), however, has the '%z' and '%Z' conversions, which require knowledge of the relevant time zone. It has been argued that this function is redundant, because time_breakup() could embed time zone information into struct tm (either in extension fields or private fields), and thus the standard POSIX strftime could suffice to convert struct tm's in a thread-safe way. However, this is only true for struct tm's created from time_breakup() or the mktime() family. Creation of struct tm values "by hand" is still fairly common, and a time zone specification is needed to print these. Name strftime_zl - generate a text representation of a time value, in a given time zone and locale. Synopsis #include <time.h> size_t strftime_zl(char * restrict buf, size_t maxsize, const char * restrict format, const struct tm * restrict timeptr, const struct tzinfo * restrict tz, const locale_t * restrict l); Description (This is an extension based on Ulrich Drepper's thread-aware locale proposal; see rationale.) strftime_z() formats the information from 'timeptr' into the buffer 'buf' according to the format specified by 'format' and the locale specified by 'l'. Other than the source of locale information, this is in all ways identical to strftime_z. Rationale and commentary This function follows Ulrich Drepper's thread-safe locale proposal; it is the combination of his strftime_l and strftime_z defined above. See <http://www.cygnus.com/~drepper/tllocale.ps.bz2> for details. This function should only be implemented if the rest of Drepper's proposal is as well. The _zl suffix is ugly. More natural would be to define a single function which takes all the necessary thread-safe data as arguments, but I don't want to force implementation of this proposal to be blocked on Drepper's. Thread-support functions Name pthread_settz -- set time zone object for the current POSIX thread. Synopsis #include <time.h> #include <pthread.h> int pthread_settz(const struct tzinfo *tz); Description (This function is only relevant in a POSIX system with the Threads option.) pthread_settz() sets the time zone object to be used for time functions called from the current POSIX thread. The time zone setting for all other threads remains the same. Once pthread_settz() has been called, all calls to the functions localtime(), localtime_r(), ctime(), ctime_r(), asctime(), asctime_r(), mktime(), and strftime() in the thread from which it was called will use the specified time zone rather than the process-wide time zone. If pthread_settz() is called with a NULL pointer as its argument, the current thread will again use the global time zone object. pthread_settz() leaves the values of the global variable tzname, and the XSI global variables daylight and timezone, undefined. Return value Upon successful completion, pthread_settz() returns a value of zero. Otherwise, an error code is returned to indicate an error. Errors pthread_settz() may fail if: ENOMEM Insufficient memory exists to store the time zone information for the thread. EAGAIN The system lacked the necessary resources to associate the time zone information with the thread. Rationale and commentary This function allows existing code which uses the ISO C APIs to work correctly, unmodified, in a threaded environment. The extended parts of the POSIX APIs may not work correctly unmodified. This function would typically be implemented as a wrapper around pthread_setspecific(). It's not clear if a parallel pthread_gettz() is also needed. General rationale and commentary Thanks to many comments from the people of the tz(a)elsie.nci.nih.gov mailing list. Much inspiration for this work was drawn from Markus Kuhn's proposed extended time APIs for ISO C 200x, and from Ulrich Drepper's proposed thread-aware locale functions. Markus Kuhn's proposed time zone API defined an additional time zone manipulation function tz_jump(), which gets the next or previous discontinuity in a given time zone. This is a potentially useful function, but it was omitted here so as to keep the API definitions modest. (Additionally, it should probably wait on the proper definition of an extended time type, to avoid unnecessary redundancy.) Time zone specific versions of asctime[_r] and ctime[_r] were omitted, as they can be constructed trivially out of the functions defined here. A time zone specific version of strptime is not necessary. The only zone-aware function of strptime that I know of is the BSD extension to scan "%Z"; POSIX 200x does not define this, and it generally doesn't seem to work very well as zone abbreviations are ambiguous. (BSD strptime only recognizes the current local timezone, in standard and summer forms, and "GMT". Even this is not necessarily unambiguous: consider for example the Australian "EST" meaning both "Eastern Standard Time" and "Eastern Summer Time".) wcsftime_z and wcsftime_zl functions are needed, analogous to strftime_z and strftime_zl for wide strings. Their definitions are obvious analogies to the existing functions. Changes from Version 2: The structure was renamed to 'struct tzinfo' from 'struct timezone', because the latter structure is already defined on BSD systems. (It is the deprecated second argument to gettimeofday().) Clarified that pthread_settz() leaves the state of global variables undefined. Corrected incorrect errno value in the time_make() rationale. Changes from Version 1: The time-zone creation and destruction functions were renamed from newtz() and freetz() to tz_prep() and tz_free(). This puts them in a name space, and aligns them with Markus Kuhn's functions. (These functions are slightly different from Kuhn's, though, in that they are defined to return errno values on errors.) tzdup() was dropped as not useful. mktime_z() and localtime_z() were renamed to time_make() and time_breakup(), by analogy with Kuhn's xtime_* functions. Zone-specific versions of asctime(), ctime(), and strptime() were dropped as unnecessary. The text was greatly clarified to make clear the distinctions between ISO C extensions, POSIX extensions, and rationale and commentary. The externally-visible tz_name elements of struct tz were dropped. The strftime_zl function was defined. diff -crN -x *~ ../tzcode2001c/Makefile thread-safe-2/Makefile *** ../tzcode2001c/Makefile Tue Jun 5 13:48:21 2001 --- thread-safe-2/Makefile Mon Jun 18 15:49:47 2001 *************** *** 83,88 **** --- 83,89 ---- # Non-default libraries needed to link. # Add -lintl if you want to use `gettext' on Solaris. + # Add -lpthread if you're compiling with non-weak POSIX threads in libpthread. LDLIBS= # Add the following to the end of the "CFLAGS=" line as needed. *************** *** 211,216 **** --- 212,220 ---- CFLAGS= + # The threading model for this system. "dummy" or "posix" + THREADMODEL= dummy + # If you want zic's -s option used when installing, uncomment the next line # ZFLAGS= -s *************** *** 242,260 **** cc= cc CC= $(cc) -DTZDIR=\"$(TZDIR)\" ! TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c ! TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o ! TZDSRCS= zdump.c localtime.c asctime.c ialloc.c ! TZDOBJS= zdump.o localtime.o asctime.o ialloc.o ! DATESRCS= date.c localtime.c logwtmp.c strftime.c asctime.c ! DATEOBJS= date.o localtime.o logwtmp.o strftime.o asctime.o ! LIBSRCS= localtime.c asctime.c difftime.c ! LIBOBJS= localtime.o asctime.o difftime.o ! HEADERS= tzfile.h private.h NONLIBSRCS= zic.c zdump.c scheck.c ialloc.c NEWUCBSRCS= date.c logwtmp.c strftime.c ! SOURCES= $(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) tzselect.ksh MANS= newctime.3 newstrftime.3 newtzset.3 time2posix.3 \ tzfile.5 tzselect.8 zic.8 zdump.8 DOCS= README Theory $(MANS) date.1 Makefile PRIMARY_YDATA= africa antarctica asia australasia \ --- 246,274 ---- cc= cc CC= $(cc) -DTZDIR=\"$(TZDIR)\" ! THREADSRC= tzthread-$(THREADMODEL).c ! THREADOBJ= tzthread-$(THREADMODEL).o ! THREADHDR= tzthread-$(THREADMODEL).h ! ! CFLAGS += -DTZTHREAD_HEADER_H=\"$(THREADHDR)\" ! ! TZCSRCS= zic.c localtime.c $(THREADSRC) asctime.c scheck.c ialloc.c ! TZCOBJS= zic.o localtime.o $(THREADOBJ) asctime.o scheck.o ialloc.o ! TZDSRCS= zdump.c localtime.c $(THREADSRC) asctime.c ialloc.c ! TZDOBJS= zdump.o localtime.o $(THREADOBJ) asctime.o ialloc.o ! DATESRCS= date.c localtime.c $(THREADSRC) logwtmp.c strftime.c asctime.c ! DATEOBJS= date.o localtime.o $(THREADOBJ) logwtmp.o strftime.o asctime.o ! LIBSRCS= localtime.c $(THREADSRC) asctime.c difftime.c ! LIBOBJS= localtime.o $(THREADOBJ) asctime.o difftime.o ! HEADERS= tzfile.h private.h struct_tzinfo.h tzthread-dummy.h \ ! tzthread-posix.h tztimeext.h ! VARLIBSRCS= tzthread-dummy.c tzthread-posix.c NONLIBSRCS= zic.c zdump.c scheck.c ialloc.c NEWUCBSRCS= date.c logwtmp.c strftime.c ! SOURCES= $(HEADERS) $(LIBSRCS) $(VARLIBSRCS) $(NONLIBSRCS) \ ! $(NEWUCBSRCS) tzselect.ksh MANS= newctime.3 newstrftime.3 newtzset.3 time2posix.3 \ + tz_prep.3 time_make.3 pthread_settz.3 \ tzfile.5 tzselect.8 zic.8 zdump.8 DOCS= README Theory $(MANS) date.1 Makefile PRIMARY_YDATA= africa antarctica asia australasia \ *************** *** 353,359 **** ar r ,lib.a logwtmp.o if [ -x /usr/ucb/ranlib -o -x /usr/bin/ranlib ] ; \ then ranlib ,lib.a ; fi ! $(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \ $(LDLIBS) -lc ,lib.a -o $@ rm -f ,lib.a --- 367,373 ---- ar r ,lib.a logwtmp.o if [ -x /usr/ucb/ranlib -o -x /usr/bin/ranlib ] ; \ then ranlib ,lib.a ; fi ! $(CC) $(CFLAGS) date.o localtime.o $(THREADOBJ) asctime.o strftime.o \ $(LDLIBS) -lc ,lib.a -o $@ rm -f ,lib.a *************** *** 396,404 **** date.o: private.h difftime.o: private.h ialloc.o: private.h ! localtime.o: private.h tzfile.h scheck.o: private.h ! strftime.o: tzfile.h zic.o: private.h tzfile.h .KEEP_STATE: --- 410,419 ---- date.o: private.h difftime.o: private.h ialloc.o: private.h ! localtime.o: private.h tzfile.h tztimeext.h struct_tzinfo.h $(THREADHDR) scheck.o: private.h ! strftime.o: tzfile.h private.h struct_tzinfo.h zic.o: private.h tzfile.h + $(THREADOBJ): private.h tzfile.h struct_tzinfo.h $(THREADHDR) .KEEP_STATE: diff -crN -x *~ ../tzcode2001c/asctime.c thread-safe-2/asctime.c *** ../tzcode2001c/asctime.c Tue Jun 5 13:49:48 2001 --- thread-safe-2/asctime.c Mon Jun 18 15:46:04 2001 *************** *** 14,19 **** --- 14,21 ---- #include "private.h" #include "tzfile.h" + #include TZTHREAD_HEADER_H + /* ** A la ISO/IEC 9945-1, ANSI/IEEE Std 1003.1, Second Edition, 1996-07-12. */ *************** *** 60,74 **** asctime(timeptr) register const struct tm * timeptr; { ! /* ! ** Big enough for something such as ! ** ??? ???-2147483648 -2147483648:-2147483648:-2147483648 -2147483648\n ! ** (two three-character abbreviations, five strings denoting integers, ! ** three explicit spaces, two explicit colons, a newline, ! ** and a trailing ASCII nul). ! */ ! static char result[3 * 2 + 5 * INT_STRLEN_MAXIMUM(int) + ! 3 + 2 + 1 + 1]; return asctime_r(timeptr, result); } --- 62,68 ---- asctime(timeptr) register const struct tm * timeptr; { ! char *result = GET_ASCTIME_BUF(); return asctime_r(timeptr, result); } diff -crN -x *~ ../tzcode2001c/localtime.c thread-safe-2/localtime.c *** ../tzcode2001c/localtime.c Tue Jun 5 13:59:55 2001 --- thread-safe-2/localtime.c Mon Jun 18 16:26:37 2001 *************** *** 21,26 **** --- 21,32 ---- #include "tzfile.h" #include "fcntl.h" + #include "struct_tzinfo.h" + + #include "tztimeext.h" + + #include TZTHREAD_HEADER_H + /* ** SunOS 4.1.1 headers lack O_BINARY. */ *************** *** 70,110 **** #define TZDEFRULESTRING ",M4.1.0,M10.5.0" #endif /* !defined TZDEFDST */ - struct ttinfo { /* time type information */ - long tt_gmtoff; /* UTC offset in seconds */ - int tt_isdst; /* used to set tm_isdst */ - int tt_abbrind; /* abbreviation list index */ - int tt_ttisstd; /* TRUE if transition is std time */ - int tt_ttisgmt; /* TRUE if transition is UTC */ - }; - - struct lsinfo { /* leap second information */ - time_t ls_trans; /* transition time */ - long ls_corr; /* correction to apply */ - }; - - #define BIGGEST(a, b) (((a) > (b)) ? (a) : (b)) - - #ifdef TZNAME_MAX - #define MY_TZNAME_MAX TZNAME_MAX - #endif /* defined TZNAME_MAX */ - #ifndef TZNAME_MAX - #define MY_TZNAME_MAX 255 - #endif /* !defined TZNAME_MAX */ - - struct state { - int leapcnt; - int timecnt; - int typecnt; - int charcnt; - time_t ats[TZ_MAX_TIMES]; - unsigned char types[TZ_MAX_TIMES]; - struct ttinfo ttis[TZ_MAX_TYPES]; - char chars[BIGGEST(BIGGEST(TZ_MAX_CHARS + 1, sizeof gmt), - (2 * (MY_TZNAME_MAX + 1)))]; - struct lsinfo lsis[TZ_MAX_LEAPS]; - }; - struct rule { int r_type; /* type of rule--see below */ int r_day; /* day number of rule */ --- 76,81 ---- *************** *** 128,175 **** static const char * getsecs P((const char * strp, long * secsp)); static const char * getoffset P((const char * strp, long * offsetp)); static const char * getrule P((const char * strp, struct rule * rulep)); ! static void gmtload P((struct state * sp)); ! static void gmtsub P((const time_t * timep, long offset, ! struct tm * tmp)); ! static void localsub P((const time_t * timep, long offset, ! struct tm * tmp)); static int increment_overflow P((int * number, int delta)); static int normalize_overflow P((int * tensptr, int * unitsptr, int base)); ! static void settzname P((void)); ! static time_t time1 P((struct tm * tmp, ! void(*funcp) P((const time_t *, ! long, struct tm *)), long offset)); ! static time_t time2 P((struct tm *tmp, ! void(*funcp) P((const time_t *, ! long, struct tm*)), ! long offset, int * okayp)); ! static time_t time2sub P((struct tm *tmp, ! void(*funcp) P((const time_t *, ! long, struct tm*)), ! long offset, int * okayp, int do_norm_secs)); static void timesub P((const time_t * timep, long offset, ! const struct state * sp, struct tm * tmp)); static int tmcomp P((const struct tm * atmp, const struct tm * btmp)); static time_t transtime P((time_t janfirst, int year, const struct rule * rulep, long offset)); ! static int tzload P((const char * name, struct state * sp)); ! static int tzparse P((const char * name, struct state * sp, int lastditch)); - #ifdef ALL_STATE - static struct state * lclptr; - static struct state * gmtptr; - #endif /* defined ALL_STATE */ - - #ifndef ALL_STATE - static struct state lclmem; - static struct state gmtmem; - #define lclptr (&lclmem) - #define gmtptr (&gmtmem) - #endif /* State Farm */ #ifndef TZ_STRLEN_MAX #define TZ_STRLEN_MAX 255 --- 99,145 ---- static const char * getsecs P((const char * strp, long * secsp)); static const char * getoffset P((const char * strp, long * offsetp)); static const char * getrule P((const char * strp, struct rule * rulep)); ! static void gmtload P((struct tzinfo * sp)); ! static void nulltzsub P((const time_t * timep, ! long offset, struct tm * tmp)); ! static void tzsub P((const time_t * timep, ! const struct tzinfo *tz, ! long offset, struct tm * tmp, int)); static int increment_overflow P((int * number, int delta)); static int normalize_overflow P((int * tensptr, int * unitsptr, int base)); ! static void settzname P((const struct tzinfo * const)); ! static int time1 P((time_t * timep, ! struct tm * tmp, ! const struct tzinfo * tz, ! long offset, ! int accomodate_gap)); ! static int time2 P((time_t * timep, ! struct tm *tmp, ! const struct tzinfo * tz, long offset)); ! static int time2sub P((time_t * timep, ! struct tm *tmp, ! const struct tzinfo * tz, ! long offset, int do_norm_secs)); static void timesub P((const time_t * timep, long offset, ! const struct tzinfo * sp, struct tm * tmp)); static int tmcomp P((const struct tm * atmp, const struct tm * btmp)); static time_t transtime P((time_t janfirst, int year, const struct rule * rulep, long offset)); ! static int tzload P((const char * name, struct tzinfo * sp)); ! static int tzparse P((const char * name, struct tzinfo * sp, int lastditch)); + static void tzsetwall_basic P((struct tzinfo * const sp)); + static void tzset_basic P((struct tzinfo * const sp)); + #ifndef STD_INSPIRED + static void tzsetwall P((void)); + #endif + #ifdef STD_INSPIRED + static long leapcorr P((time_t *, const struct tzinfo *)); + #endif #ifndef TZ_STRLEN_MAX #define TZ_STRLEN_MAX 255 *************** *** 184,189 **** --- 154,164 ---- wildabbr }; + #define MIN_TIME (TYPE_SIGNED(time_t) ? \ + (((time_t) 1) << (TYPE_BIT(time_t) - 1)) : 0) + + #define MAX_TIME (~MIN_TIME) + /* ** Section 4.12.3 of X3.159-1989 requires that ** Except for the strftime function, these functions [asctime, *************** *** 192,199 **** ** Thanks to Paul Eggert (eggert(a)twinsun.com) for noting this. */ - static struct tm tm; - #ifdef USG_COMPAT time_t timezone = 0; int daylight = 0; --- 167,172 ---- *************** *** 217,225 **** } static void ! settzname P((void)) { - register struct state * const sp = lclptr; register int i; tzname[0] = wildabbr; --- 190,198 ---- } static void ! settzname(sp) ! const struct tzinfo * const sp; { register int i; tzname[0] = wildabbr; *************** *** 231,242 **** #ifdef ALTZONE altzone = 0; #endif /* defined ALTZONE */ - #ifdef ALL_STATE if (sp == NULL) { tzname[0] = tzname[1] = gmt; return; } - #endif /* defined ALL_STATE */ for (i = 0; i < sp->typecnt; ++i) { register const struct ttinfo * const ttisp = &sp->ttis[i]; --- 204,213 ---- *************** *** 269,275 **** static int tzload(name, sp) register const char * name; ! register struct state * const sp; { register const char * p; register int i; --- 240,246 ---- static int tzload(name, sp) register const char * name; ! register struct tzinfo * const sp; { register const char * p; register int i; *************** *** 698,704 **** static int tzparse(name, sp, lastditch) const char * name; ! register struct state * const sp; const int lastditch; { const char * stdname; --- 669,675 ---- static int tzparse(name, sp, lastditch) const char * name; ! register struct tzinfo * const sp; const int lastditch; { const char * stdname; *************** *** 910,921 **** static void gmtload(sp) ! struct state * const sp; { if (tzload(gmt, sp) != 0) (void) tzparse(gmt, sp, TRUE); } #ifndef STD_INSPIRED /* ** A non-static declaration of tzsetwall in a system header file --- 881,934 ---- static void gmtload(sp) ! struct tzinfo * const sp; { if (tzload(gmt, sp) != 0) (void) tzparse(gmt, sp, TRUE); } + + static void + gmtset(sp) + struct tzinfo * const sp; + { + /* + ** Fast-path the common-case (no locking needed once gmt is set). + */ + if (gmt_is_set) { + return; + } + + LOCK_GMTPTR(); + /* + ** Another thread might have set it, so check gmt_is_set again. + */ + if (!gmt_is_set) { + gmt_is_set = TRUE; + if (sp != NULL) + gmtload(sp); + } + UNLOCK_GMTPTR(); + } + + + static void + tzsetwall_basic(sp) + struct tzinfo * const sp; + { + if (lcl_is_set < 0) + return; + lcl_is_set = -1; + + if (sp == NULL) { + settzname(NULL); /* all we can do */ + return; + } + if (tzload((char *) NULL, sp) != 0) + gmtload(sp); + settzname(sp); + } + #ifndef STD_INSPIRED /* ** A non-static declaration of tzsetwall in a system header file *************** *** 926,957 **** void tzsetwall P((void)) { ! if (lcl_is_set < 0) ! return; ! lcl_is_set = -1; ! #ifdef ALL_STATE ! if (lclptr == NULL) { ! lclptr = (struct state *) malloc(sizeof *lclptr); ! if (lclptr == NULL) { ! settzname(); /* all we can do */ ! return; ! } } ! #endif /* defined ALL_STATE */ ! if (tzload((char *) NULL, lclptr) != 0) ! gmtload(lclptr); ! settzname(); } ! void ! tzset P((void)) { register const char * name; name = getenv("TZ"); if (name == NULL) { ! tzsetwall(); return; } --- 939,967 ---- void tzsetwall P((void)) { ! struct tzinfo * sp; ! int process_wide; ! LOCK_LCLPTR(); ! sp = GET_LCLPTR(&process_wide); ! if (!process_wide) { ! UNLOCK_LCLPTR(); ! return; } ! ! tzsetwall_basic(sp); ! UNLOCK_LCLPTR(); } ! static void ! tzset_basic(lclptr) ! struct tzinfo * const lclptr; { register const char * name; name = getenv("TZ"); if (name == NULL) { ! tzsetwall_basic(lclptr); return; } *************** *** 961,975 **** if (lcl_is_set) (void) strcpy(lcl_TZname, name); - #ifdef ALL_STATE if (lclptr == NULL) { ! lclptr = (struct state *) malloc(sizeof *lclptr); ! if (lclptr == NULL) { ! settzname(); /* all we can do */ ! return; ! } } - #endif /* defined ALL_STATE */ if (*name == '\0') { /* ** User wants it fast rather than right. --- 971,980 ---- if (lcl_is_set) (void) strcpy(lcl_TZname, name); if (lclptr == NULL) { ! settzname(NULL); /* all we can do */ ! return; } if (*name == '\0') { /* ** User wants it fast rather than right. *************** *** 984,995 **** } else if (tzload(name, lclptr) != 0) if (name[0] == ':' || tzparse(name, lclptr, FALSE) != 0) (void) gmtload(lclptr); ! settzname(); } /* ** The easy way to behave "as if no library function calls" localtime ! ** is to not call it--so we drop its guts into "localsub", which can be ** freely called. (And no, the PANS doesn't require the above behavior-- ** but it *is* desirable.) ** --- 989,1041 ---- } else if (tzload(name, lclptr) != 0) if (name[0] == ':' || tzparse(name, lclptr, FALSE) != 0) (void) gmtload(lclptr); ! settzname(lclptr); ! } ! ! void ! tzset P((void)) ! { ! struct tzinfo * lclptr; ! int process_wide; ! ! LOCK_LCLPTR(); ! lclptr = GET_LCLPTR(&process_wide); ! if (!process_wide) { ! UNLOCK_LCLPTR(); ! return; ! } ! ! tzset_basic(lclptr); ! UNLOCK_LCLPTR(); ! } ! ! const struct ttinfo * ! _tz_getttype(timep, sp) ! const time_t * const timep; ! const struct tzinfo * sp; ! { ! register int i; ! const time_t t = *timep; ! ! if (sp->timecnt == 0 || t < sp->ats[0]) { ! i = 0; ! while (sp->ttis[i].tt_isdst) ! if (++i >= sp->typecnt) { ! i = 0; ! break; ! } ! } else { ! for (i = 1; i < sp->timecnt; ++i) ! if (t < sp->ats[i]) ! break; ! i = sp->types[i - 1]; ! } ! return &sp->ttis[i]; } /* ** The easy way to behave "as if no library function calls" localtime ! ** is to not call it--so we drop its guts into "tzsub", which can be ** freely called. (And no, the PANS doesn't require the above behavior-- ** but it *is* desirable.) ** *************** *** 998,1045 **** /*ARGSUSED*/ static void ! localsub(timep, offset, tmp) const time_t * const timep; const long offset; struct tm * const tmp; { - register struct state * sp; register const struct ttinfo * ttisp; - register int i; const time_t t = *timep; - sp = lclptr; - #ifdef ALL_STATE if (sp == NULL) { ! gmtsub(timep, offset, tmp); return; } ! #endif /* defined ALL_STATE */ ! if (sp->timecnt == 0 || t < sp->ats[0]) { ! i = 0; ! while (sp->ttis[i].tt_isdst) ! if (++i >= sp->typecnt) { ! i = 0; ! break; ! } ! } else { ! for (i = 1; i < sp->timecnt; ++i) ! if (t < sp->ats[i]) ! break; ! i = sp->types[i - 1]; ! } ! ttisp = &sp->ttis[i]; /* ** To get (wrong) behavior that's compatible with System V Release 2.0 ** you'd replace the statement below with ! ** t += ttisp->tt_gmtoff; ** timesub(&t, 0L, sp, tmp); */ ! timesub(&t, ttisp->tt_gmtoff, sp, tmp); tmp->tm_isdst = ttisp->tt_isdst; ! tzname[tmp->tm_isdst] = &sp->chars[ttisp->tt_abbrind]; #ifdef TM_ZONE ! tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind]; #endif /* defined TM_ZONE */ } --- 1044,1089 ---- /*ARGSUSED*/ static void ! tzsub(timep, sp, offset, tmp, alter_tzname) const time_t * const timep; + const struct tzinfo * const sp; const long offset; struct tm * const tmp; + int alter_tzname; { register const struct ttinfo * ttisp; const time_t t = *timep; if (sp == NULL) { ! nulltzsub(timep, offset, tmp); return; } ! ttisp = _tz_getttype(timep, sp); /* ** To get (wrong) behavior that's compatible with System V Release 2.0 ** you'd replace the statement below with ! ** t += ttisp->tt_gmtoff + offset; ** timesub(&t, 0L, sp, tmp); + ** + ** ttisp->tt_gmtoff and offset should never both be non-zero + ** simultaneously. */ ! timesub(&t, ttisp->tt_gmtoff + offset, sp, tmp); tmp->tm_isdst = ttisp->tt_isdst; ! if (alter_tzname) { ! tzname[tmp->tm_isdst] = &sp->chars[ttisp->tt_abbrind]; ! } #ifdef TM_ZONE ! /* ! ** Could get fancy here and deliver something such as ! ** "UTC+xxxx" or "UTC-xxxx" if offset is non-zero, ! ** but this is no time for a treasure hunt. ! */ ! if (offset != 0) ! tmp->TM_ZONE = wildabbr; ! else { ! tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind]; ! } #endif /* defined TM_ZONE */ } *************** *** 1047,1055 **** localtime(timep) const time_t * const timep; { ! tzset(); ! localsub(timep, 0L, &tm); ! return &tm; } /* --- 1091,1114 ---- localtime(timep) const time_t * const timep; { ! struct tm * tm; ! struct tzinfo * tz; ! int process_wide; ! tm = GET_TM_BUF(); ! if (tm == NULL) ! return NULL; ! ! LOCK_LCLPTR(); ! tz = GET_LCLPTR(&process_wide); ! if (tz == NULL) { ! UNLOCK_LCLPTR(); ! return NULL; ! } ! if (process_wide) ! tzset_basic(tz); ! tzsub(timep, tz, 0L, tm, process_wide); ! UNLOCK_LCLPTR(); ! return tm; } /* *************** *** 1060,1088 **** const time_t * const timep; struct tm * tm; { ! localsub(timep, 0L, tm); return tm; } /* ! ** gmtsub is to gmtime as localsub is to localtime. */ static void ! gmtsub(timep, offset, tmp) const time_t * const timep; const long offset; struct tm * const tmp; { ! if (!gmt_is_set) { ! gmt_is_set = TRUE; ! #ifdef ALL_STATE ! gmtptr = (struct state *) malloc(sizeof *gmtptr); ! if (gmtptr != NULL) ! #endif /* defined ALL_STATE */ ! gmtload(gmtptr); ! } ! timesub(timep, offset, gmtptr, tmp); #ifdef TM_ZONE /* ** Could get fancy here and deliver something such as --- 1119,1150 ---- const time_t * const timep; struct tm * tm; { ! struct tzinfo * tz; ! int process_wide; ! LOCK_LCLPTR(); ! tz = GET_LCLPTR(&process_wide); ! if (tz == NULL) { ! UNLOCK_LCLPTR(); ! return NULL; ! } ! if (process_wide) ! tzset_basic(tz); ! tzsub(timep, tz, 0L, tm, process_wide); ! UNLOCK_LCLPTR(); return tm; } /* ! ** nulltzsub is a stripped-down version of tzsub used if tz is NULL. */ static void ! nulltzsub(timep, offset, tmp) const time_t * const timep; const long offset; struct tm * const tmp; { ! timesub(timep, offset, NULL, tmp); #ifdef TM_ZONE /* ** Could get fancy here and deliver something such as *************** *** 1092,1105 **** if (offset != 0) tmp->TM_ZONE = wildabbr; else { ! #ifdef ALL_STATE ! if (gmtptr == NULL) ! tmp->TM_ZONE = gmt; ! else tmp->TM_ZONE = gmtptr->chars; ! #endif /* defined ALL_STATE */ ! #ifndef ALL_STATE ! tmp->TM_ZONE = gmtptr->chars; ! #endif /* State Farm */ } #endif /* defined TM_ZONE */ } --- 1154,1160 ---- if (offset != 0) tmp->TM_ZONE = wildabbr; else { ! tmp->TM_ZONE = gmt; } #endif /* defined TM_ZONE */ } *************** *** 1108,1115 **** gmtime(timep) const time_t * const timep; { ! gmtsub(timep, 0L, &tm); ! return &tm; } /* --- 1163,1181 ---- gmtime(timep) const time_t * const timep; { ! struct tm * tm; ! struct tzinfo * tz; ! tm = GET_TM_BUF(); ! if (tm == NULL) ! return NULL; ! ! tz = GET_GMTPTR(); ! if (tz == NULL) ! return NULL; ! gmtset(tz); ! tzsub(timep, tz, 0L, tm, 0); ! ! return tm; } /* *************** *** 1120,1126 **** const time_t * const timep; struct tm * tm; { ! gmtsub(timep, 0L, tm); return tm; } --- 1186,1199 ---- const time_t * const timep; struct tm * tm; { ! struct tzinfo * tz; ! ! tz = GET_GMTPTR(); ! if (tz == NULL) ! return NULL; ! gmtset(tz); ! tzsub(timep, tz, 0L, tm, 0); ! return tm; } *************** *** 1131,1138 **** const time_t * const timep; const long offset; { ! gmtsub(timep, offset, &tm); ! return &tm; } #endif /* defined STD_INSPIRED */ --- 1204,1223 ---- const time_t * const timep; const long offset; { ! struct tm * tm; ! struct tzinfo * tz; ! ! tm = GET_TM_BUF(); ! if (tm == NULL) ! return NULL; ! ! tz = GET_GMTPTR(); ! if (tz == NULL) ! return NULL; ! gmtset(tz); ! tzsub(timep, tz, offset, tm, 0); ! ! return tm; } #endif /* defined STD_INSPIRED */ *************** *** 1141,1147 **** timesub(timep, offset, sp, tmp) const time_t * const timep; const long offset; ! register const struct state * const sp; register struct tm * const tmp; { register const struct lsinfo * lp; --- 1226,1232 ---- timesub(timep, offset, sp, tmp) const time_t * const timep; const long offset; ! register const struct tzinfo * const sp; register struct tm * const tmp; { register const struct lsinfo * lp; *************** *** 1156,1167 **** corr = 0; hit = 0; - #ifdef ALL_STATE i = (sp == NULL) ? 0 : sp->leapcnt; - #endif /* defined ALL_STATE */ - #ifndef ALL_STATE - i = sp->leapcnt; - #endif /* State Farm */ while (--i >= 0) { lp = &sp->lsis[i]; if (*timep >= lp->ls_trans) { --- 1241,1247 ---- *************** *** 1322,1336 **** return result; } ! static time_t ! time2sub(tmp, funcp, offset, okayp, do_norm_secs) struct tm * const tmp; ! void (* const funcp) P((const time_t*, long, struct tm*)); const long offset; - int * const okayp; const int do_norm_secs; { - register const struct state * sp; register int dir; register int bits; register int i, j ; --- 1402,1415 ---- return result; } ! static int ! time2sub(timep, tmp, sp, offset, do_norm_secs) ! time_t * timep; struct tm * const tmp; ! const struct tzinfo * sp; const long offset; const int do_norm_secs; { register int dir; register int bits; register int i, j ; *************** *** 1339,1366 **** time_t t; struct tm yourtm, mytm; - *okayp = FALSE; yourtm = *tmp; if (do_norm_secs) { if (normalize_overflow(&yourtm.tm_min, &yourtm.tm_sec, SECSPERMIN)) ! return WRONG; } if (normalize_overflow(&yourtm.tm_hour, &yourtm.tm_min, MINSPERHOUR)) ! return WRONG; if (normalize_overflow(&yourtm.tm_mday, &yourtm.tm_hour, HOURSPERDAY)) ! return WRONG; if (normalize_overflow(&yourtm.tm_year, &yourtm.tm_mon, MONSPERYEAR)) ! return WRONG; /* ** Turn yourtm.tm_year into an actual year number for now. ** It is converted back to an offset from TM_YEAR_BASE later. */ if (increment_overflow(&yourtm.tm_year, TM_YEAR_BASE)) ! return WRONG; while (yourtm.tm_mday <= 0) { if (increment_overflow(&yourtm.tm_year, -1)) ! return WRONG; i = yourtm.tm_year + (1 < yourtm.tm_mon); yourtm.tm_mday += year_lengths[isleap(i)]; } --- 1418,1444 ---- time_t t; struct tm yourtm, mytm; yourtm = *tmp; if (do_norm_secs) { if (normalize_overflow(&yourtm.tm_min, &yourtm.tm_sec, SECSPERMIN)) ! return ERANGE; } if (normalize_overflow(&yourtm.tm_hour, &yourtm.tm_min, MINSPERHOUR)) ! return ERANGE; if (normalize_overflow(&yourtm.tm_mday, &yourtm.tm_hour, HOURSPERDAY)) ! return ERANGE; if (normalize_overflow(&yourtm.tm_year, &yourtm.tm_mon, MONSPERYEAR)) ! return ERANGE; /* ** Turn yourtm.tm_year into an actual year number for now. ** It is converted back to an offset from TM_YEAR_BASE later. */ if (increment_overflow(&yourtm.tm_year, TM_YEAR_BASE)) ! return ERANGE; while (yourtm.tm_mday <= 0) { if (increment_overflow(&yourtm.tm_year, -1)) ! return ERANGE; i = yourtm.tm_year + (1 < yourtm.tm_mon); yourtm.tm_mday += year_lengths[isleap(i)]; } *************** *** 1368,1374 **** i = yourtm.tm_year + (1 < yourtm.tm_mon); yourtm.tm_mday -= year_lengths[isleap(i)]; if (increment_overflow(&yourtm.tm_year, 1)) ! return WRONG; } for ( ; ; ) { i = mon_lengths[isleap(yourtm.tm_year)][yourtm.tm_mon]; --- 1446,1452 ---- i = yourtm.tm_year + (1 < yourtm.tm_mon); yourtm.tm_mday -= year_lengths[isleap(i)]; if (increment_overflow(&yourtm.tm_year, 1)) ! return ERANGE; } for ( ; ; ) { i = mon_lengths[isleap(yourtm.tm_year)][yourtm.tm_mon]; *************** *** 1378,1388 **** if (++yourtm.tm_mon >= MONSPERYEAR) { yourtm.tm_mon = 0; if (increment_overflow(&yourtm.tm_year, 1)) ! return WRONG; } } if (increment_overflow(&yourtm.tm_year, -TM_YEAR_BASE)) ! return WRONG; if (yourtm.tm_year + TM_YEAR_BASE < EPOCH_YEAR) { /* ** We can't set tm_sec to 0, because that might push the --- 1456,1466 ---- if (++yourtm.tm_mon >= MONSPERYEAR) { yourtm.tm_mon = 0; if (increment_overflow(&yourtm.tm_year, 1)) ! return ERANGE; } } if (increment_overflow(&yourtm.tm_year, -TM_YEAR_BASE)) ! return ERANGE; if (yourtm.tm_year + TM_YEAR_BASE < EPOCH_YEAR) { /* ** We can't set tm_sec to 0, because that might push the *************** *** 1393,1399 **** ** which is a safer assumption than using 58 would be. */ if (increment_overflow(&yourtm.tm_sec, 1 - SECSPERMIN)) ! return WRONG; saved_seconds = yourtm.tm_sec; yourtm.tm_sec = SECSPERMIN - 1; } else { --- 1471,1477 ---- ** which is a safer assumption than using 58 would be. */ if (increment_overflow(&yourtm.tm_sec, 1 - SECSPERMIN)) ! return ERANGE; saved_seconds = yourtm.tm_sec; yourtm.tm_sec = SECSPERMIN - 1; } else { *************** *** 1412,1424 **** */ t = TYPE_SIGNED(time_t) ? 0 : (((time_t) 1) << bits); for ( ; ; ) { ! (*funcp)(&t, offset, &mytm); dir = tmcomp(&mytm, &yourtm); if (dir != 0) { ! if (bits-- < 0) ! return WRONG; ! if (bits < 0) ! --t; /* may be needed if new t is minimal */ else if (dir > 0) t -= ((time_t) 1) << bits; else t += ((time_t) 1) << bits; --- 1490,1517 ---- */ t = TYPE_SIGNED(time_t) ? 0 : (((time_t) 1) << bits); for ( ; ; ) { ! tzsub(&t, sp, offset, &mytm, 0); dir = tmcomp(&mytm, &yourtm); if (dir != 0) { ! if (bits-- < 0) { ! /* ! ** Assume that MAX_TIME and MIN_TIME aren't ! ** near a leap-forward interval. ! ** With signed 32-bit time_t, they're in ! ** January and December respectively, ! ** so it's unlikely. ! */ ! if (t == MAX_TIME || t == MIN_TIME) ! return ERANGE; ! return EINVAL; ! } ! if (bits < 0) { ! /* may be needed if new t is minimal, ! ** since we started above the median. ! */ ! if (dir > 0) ! --t; ! } else if (dir > 0) t -= ((time_t) 1) << bits; else t += ((time_t) 1) << bits; *************** *** 1435,1447 **** /* ** The (void *) casts are the benefit of SunOS 3.3 on Sun 2's. */ - sp = (const struct state *) - (((void *) funcp == (void *) localsub) ? - lclptr : gmtptr); - #ifdef ALL_STATE if (sp == NULL) ! return WRONG; ! #endif /* defined ALL_STATE */ for (i = sp->typecnt - 1; i >= 0; --i) { if (sp->ttis[i].tt_isdst != yourtm.tm_isdst) continue; --- 1528,1535 ---- /* ** The (void *) casts are the benefit of SunOS 3.3 on Sun 2's. */ if (sp == NULL) ! return EINVAL; for (i = sp->typecnt - 1; i >= 0; --i) { if (sp->ttis[i].tt_isdst != yourtm.tm_isdst) continue; *************** *** 1450,1456 **** continue; newt = t + sp->ttis[j].tt_gmtoff - sp->ttis[i].tt_gmtoff; ! (*funcp)(&newt, offset, &mytm); if (tmcomp(&mytm, &yourtm) != 0) continue; if (mytm.tm_isdst != yourtm.tm_isdst) --- 1538,1544 ---- continue; newt = t + sp->ttis[j].tt_gmtoff - sp->ttis[i].tt_gmtoff; ! tzsub(&newt, sp, offset, &mytm, 0); if (tmcomp(&mytm, &yourtm) != 0) continue; if (mytm.tm_isdst != yourtm.tm_isdst) *************** *** 1462,1524 **** goto label; } } ! return WRONG; } label: newt = t + saved_seconds; if ((newt < t) != (saved_seconds < 0)) ! return WRONG; t = newt; ! (*funcp)(&t, offset, tmp); ! *okayp = TRUE; ! return t; } ! static time_t ! time2(tmp, funcp, offset, okayp) struct tm * const tmp; ! void (* const funcp) P((const time_t*, long, struct tm*)); const long offset; - int * const okayp; { time_t t; /* ** First try without normalization of seconds ** (in case tm_sec contains a value associated with a leap second). ** If that fails, try with normalization of seconds. */ ! t = time2sub(tmp, funcp, offset, okayp, FALSE); ! return *okayp ? t : time2sub(tmp, funcp, offset, okayp, TRUE); } ! static time_t ! time1(tmp, funcp, offset) struct tm * const tmp; ! void (* const funcp) P((const time_t *, long, struct tm *)); const long offset; { ! register time_t t; ! register const struct state * sp; register int samei, otheri; ! int okay; if (tmp->tm_isdst > 1) tmp->tm_isdst = 1; ! t = time2(tmp, funcp, offset, &okay); #ifdef PCTS ! /* ! ** PCTS code courtesy Grant Sullivan (grant(a)osf.org) ! */ ! if (okay) ! return t; ! if (tmp->tm_isdst < 0) ! tmp->tm_isdst = 0; /* reset to std and try again */ ! #endif /* defined PCTS */ ! #ifndef PCTS ! if (okay || tmp->tm_isdst < 0) ! return t; #endif /* !defined PCTS */ /* ** We're supposed to assume that somebody took a time of one type ** and did some math on it that yielded a "struct tm" that's bad. --- 1550,1621 ---- goto label; } } ! return EINVAL; } label: newt = t + saved_seconds; if ((newt < t) != (saved_seconds < 0)) ! return ERANGE; t = newt; ! tzsub(&t, sp, offset, tmp, 0); ! *timep = t; ! return 0; } ! static int ! time2(timep, tmp, tz, offset) ! time_t * timep; struct tm * const tmp; ! const struct tzinfo * tz; const long offset; { time_t t; + int err; /* ** First try without normalization of seconds ** (in case tm_sec contains a value associated with a leap second). ** If that fails, try with normalization of seconds. */ ! err = time2sub(&t, tmp, tz, offset, FALSE); ! if (err == 0) { ! *timep = t; ! return 0; ! } ! return time2sub(timep, tmp, tz, offset, TRUE); } ! static int ! time1(timep, tmp, sp, offset, accomodate_gap) ! time_t * timep; struct tm * const tmp; ! const struct tzinfo * sp; const long offset; + int accomodate_gap; { ! time_t t; register int samei, otheri; ! int err; if (tmp->tm_isdst > 1) tmp->tm_isdst = 1; ! err = time2(&t, tmp, sp, offset); ! if (err == 0) { ! *timep = t; ! return 0; ! } ! if (tmp->tm_isdst < 0) { #ifdef PCTS ! /* ! ** PCTS code courtesy Grant Sullivan (grant(a)osf.org) ! */ ! if (accomodate_gap) ! /* reset to std and try again */ ! tmp->tm_isdst = 0; ! else #endif /* !defined PCTS */ + return (err != 0 ? err : EINVAL); + } /* ** We're supposed to assume that somebody took a time of one type ** and did some math on it that yielded a "struct tm" that's bad. *************** *** 1528,1539 **** /* ** The (void *) casts are the benefit of SunOS 3.3 on Sun 2's. */ - sp = (const struct state *) (((void *) funcp == (void *) localsub) ? - lclptr : gmtptr); - #ifdef ALL_STATE if (sp == NULL) ! return WRONG; ! #endif /* defined ALL_STATE */ for (samei = sp->typecnt - 1; samei >= 0; --samei) { if (sp->ttis[samei].tt_isdst != tmp->tm_isdst) continue; --- 1625,1632 ---- /* ** The (void *) casts are the benefit of SunOS 3.3 on Sun 2's. */ if (sp == NULL) ! return (err != 0 ? err : EINVAL); for (samei = sp->typecnt - 1; samei >= 0; --samei) { if (sp->ttis[samei].tt_isdst != tmp->tm_isdst) continue; *************** *** 1543,1565 **** tmp->tm_sec += sp->ttis[otheri].tt_gmtoff - sp->ttis[samei].tt_gmtoff; tmp->tm_isdst = !tmp->tm_isdst; ! t = time2(tmp, funcp, offset, &okay); ! if (okay) ! return t; tmp->tm_sec -= sp->ttis[otheri].tt_gmtoff - sp->ttis[samei].tt_gmtoff; tmp->tm_isdst = !tmp->tm_isdst; } } ! return WRONG; } time_t mktime(tmp) struct tm * const tmp; { ! tzset(); ! return time1(tmp, localsub, 0L); } #ifdef STD_INSPIRED --- 1636,1670 ---- tmp->tm_sec += sp->ttis[otheri].tt_gmtoff - sp->ttis[samei].tt_gmtoff; tmp->tm_isdst = !tmp->tm_isdst; ! err = time2(&t, tmp, sp, offset); ! if (err == 0) { ! *timep = t; ! return 0; ! } tmp->tm_sec -= sp->ttis[otheri].tt_gmtoff - sp->ttis[samei].tt_gmtoff; tmp->tm_isdst = !tmp->tm_isdst; } } ! return (err != 0 ? err : EINVAL); } time_t mktime(tmp) struct tm * const tmp; { ! time_t mktime_return_value; ! int err; ! struct tzinfo *tz; ! int process_wide; ! ! LOCK_LCLPTR(); ! tz = GET_LCLPTR(&process_wide); ! if (process_wide) ! tzset_basic(tz); ! err = time1(&mktime_return_value, tmp, tz, 0L, 1); ! UNLOCK_LCLPTR(); ! return (err == 0 ? mktime_return_value : WRONG); } #ifdef STD_INSPIRED *************** *** 1576,1583 **** timegm(tmp) struct tm * const tmp; { tmp->tm_isdst = 0; ! return time1(tmp, gmtsub, 0L); } time_t --- 1681,1692 ---- timegm(tmp) struct tm * const tmp; { + time_t timegm_return_value; + int err; + tmp->tm_isdst = 0; ! err = time1(&timegm_return_value, tmp, GET_GMTPTR(), 0L, 1); ! return (err == 0 ? timegm_return_value : WRONG); } time_t *************** *** 1585,1594 **** struct tm * const tmp; const long offset; { tmp->tm_isdst = 0; ! return time1(tmp, gmtsub, offset); } #endif /* defined STD_INSPIRED */ #ifdef CMUCS --- 1694,1811 ---- struct tm * const tmp; const long offset; { + time_t timeoff_return_value; + int err; + tmp->tm_isdst = 0; ! err = time1(&timeoff_return_value, tmp, GET_GMTPTR(), offset, 1); ! return (err == 0 ? timeoff_return_value : WRONG); ! } ! ! ! /* ! ** Thread-safety functions ! */ ! ! int ! tz_prep(tz_p, name) ! struct tzinfo** tz_p; ! const char * name; ! { ! struct tzinfo * result; ! ! result = (struct tzinfo *) malloc(sizeof(struct tzinfo)); ! if (result == NULL) { ! return errno; ! } ! ! if (name != NULL && *name == '\0') { ! /* Zero-length string. Indicates GMT. */ ! #ifdef TZCODE_GMT_USAGE ! /* ! ** Traditional tzcode usage is that the zero-length string ! ** means GMT without leap seconds. ! */ ! result->leapcnt = 0; /* so, we're off a little */ ! result->timecnt = 0; ! result->typecnt = 0; ! result->ttis[0].tt_isdst = 0; ! result->ttis[0].tt_gmtoff = 0; ! result->ttis[0].tt_abbrind = 0; ! (void) strcpy(result->chars, gmt); ! #else ! gmtload(result); ! #endif ! } ! else { ! /* ! ** 1. Try to tzload. ! ** 2. If name is non-NULL and doesn't begin with :, ! ** try to tzparse. ! ** 3. Fail ENOENT. ! */ ! if (tzload(name, result) != 0) { ! if (name != NULL && name[0] != ':') { ! if (tzparse(name, result, FALSE) != 0) { ! goto noentry; ! } ! } ! else { ! goto noentry; ! } ! } ! } ! ! *tz_p = result; ! return 0; ! ! noentry: ! free(result); ! return ENOENT; } + + void + tz_free(tz) + struct tzinfo* tz; + { + free(tz); + } + + + int + time_make(timep, tmp, tz) + time_t * timep; + struct tm *tmp; + const struct tzinfo *tz; + { + return time1(timep, tmp, tz, 0L, 0); + } + + + int time_breakup(tmp, timep, tz) + struct tm * tmp; + const time_t * timep; + const struct tzinfo * tz; + { + tzsub(timep, tz, 0L, tmp, 0); + return 0; + } + + + int + pthread_settz(tz) + const struct tzinfo * tz; + { + if (tz != NULL) { + return SET_THREAD_LCLPTR(tz); + } + else { + return CLEAR_THREAD_LCLPTR(); + } + } + + #endif /* defined STD_INSPIRED */ #ifdef CMUCS *************** *** 1626,1640 **** */ static long ! leapcorr(timep) ! time_t * timep; { ! register struct state * sp; ! register struct lsinfo * lp; register int i; ! sp = lclptr; ! i = sp->leapcnt; while (--i >= 0) { lp = &sp->lsis[i]; if (*timep >= lp->ls_trans) --- 1843,1856 ---- */ static long ! leapcorr(timep, sp) ! time_t * timep; ! const struct tzinfo * const sp; { ! register const struct lsinfo * lp; register int i; ! i = (sp == NULL ? 0 : sp->leapcnt); while (--i >= 0) { lp = &sp->lsis[i]; if (*timep >= lp->ls_trans) *************** *** 1647,1654 **** time2posix(t) time_t t; { ! tzset(); ! return t - leapcorr(&t); } time_t --- 1863,1873 ---- time2posix(t) time_t t; { ! const struct tzinfo * sp; ! ! sp = GET_GMTPTR(); ! gmtset(sp); ! return t - leapcorr(&t, sp); } time_t *************** *** 1657,1683 **** { time_t x; time_t y; - tzset(); /* ** For a positive leap second hit, the result ** is not unique. For a negative leap second ** hit, the corresponding time doesn't exist, ** so we return an adjacent second. */ ! x = t + leapcorr(&t); ! y = x - leapcorr(&x); if (y < t) { do { x++; ! y = x - leapcorr(&x); } while (y < t); if (t != y) return x - 1; } else if (y > t) { do { --x; ! y = x - leapcorr(&x); } while (y > t); if (t != y) return x + 1; --- 1876,1905 ---- { time_t x; time_t y; + const struct tzinfo * sp; + + sp = GET_GMTPTR(); + gmtset(sp); /* ** For a positive leap second hit, the result ** is not unique. For a negative leap second ** hit, the corresponding time doesn't exist, ** so we return an adjacent second. */ ! x = t + leapcorr(&t, sp); ! y = x - leapcorr(&x, sp); if (y < t) { do { x++; ! y = x - leapcorr(&x, sp); } while (y < t); if (t != y) return x - 1; } else if (y > t) { do { --x; ! y = x - leapcorr(&x, sp); } while (y > t); if (t != y) return x + 1; diff -crN -x *~ ../tzcode2001c/private.h thread-safe-2/private.h *** ../tzcode2001c/private.h Tue Jun 5 13:48:21 2001 --- thread-safe-2/private.h Mon Jun 18 15:59:54 2001 *************** *** 206,211 **** --- 206,215 ---- void ifree P((char * pointer)); char * scheck P((const char *string, const char *format)); + struct tzinfo; + const struct ttinfo * _tz_getttype P((const time_t * const timep, + const struct tzinfo * sp)); + /* ** Finally, some convenience items. *************** *** 237,242 **** --- 241,256 ---- #define INT_STRLEN_MAXIMUM(type) \ ((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + 1 + TYPE_SIGNED(type)) #endif /* !defined INT_STRLEN_MAXIMUM */ + + /* + ** Big enough for something such as + ** ??? ???-2147483648 -2147483648:-2147483648:-2147483648 -2147483648\n + ** (two three-character abbreviations, five strings denoting integers, + ** three explicit spaces, two explicit colons, a newline, + ** and a trailing ASCII nul). + */ + + #define ASCTIME_BUF_SIZE (3 * 2 + 5 * INT_STRLEN_MAXIMUM(int) + 3 + 2 + 1 + 1) /* ** INITIALIZE(x) diff -crN -x *~ ../tzcode2001c/pthread_settz.3 thread-safe-2/pthread_settz.3 *** ../tzcode2001c/pthread_settz.3 Wed Dec 31 19:00:00 1969 --- thread-safe-2/pthread_settz.3 Mon Jun 18 15:46:08 2001 *************** *** 0 **** --- 1,100 ---- + .TH PTHREAD_SETTZ 3 + .SH NAME + pthread_settz \- locally set the time zone for the current POSIX thread + .SH SYNOPSIS + .nf + .B #include <time.h> + .B #include <pthread.h> + .PP + .B int pthread_settz(tz) + .B const struct tzinfo *tz; + .PP + .B cc ... -ltz -lpthread + .fi + .SH DESCRIPTION + .B Pthread_settz() + sets the time zone object to be used for time functions called from the + current POSIX thread to the time zone object specified by + .IR tz , + if it is non-\fBNULL\fR. If + .IR tz + is + .BR NULL , + the time zone for the current POSIX thread is reset to the global time zone + object. The time zone setting for all other threads remains the same. + .PP + Once + .B pthread_settz() + has been called with a non-\fBNULL\fR value, all calls to the functions + .BR localtime(3) , + .BR localtime_r(3) , + .BR ctime(3) , + .BR ctime_r(3) , + .BR asctime(3) , + .BR asctime_r(3) , + .BR mktime(3) , + and + .BR strftime(3) + in the thread from which + .B pthread_settz() + was called will use the time zone specified by + .IR tz , + rather than the process-wide time zone. + .PP + .B pthread_settz() + does not alter the global variable + .BR tzname . + No function which normally implicitly sets + .B tzname + will do so while a thread-local time zone is in effect. + .PP + Calls to + .B tzset(3) + or + .BR tzsetwall(3) , + while a thread-local time zone is in effect, will alter the global time + zone, but will not affect the local time zone. + .PP + .B pthread_settz() + may allocate a thread-specific data key, which may count towards the number + of keys + .B PTHREAD_KEYS_MAX + that can be allocated by + .BR pthread_key_create() . + .SH RETURN VALUES + Upon successful completion, + .B pthread_settz() + function returns a value of + .BR 0 . + Otherwise, an error number is returned to indicate an error. + .SH ERRORS + .B pthread_settz() + may fail if: + .IP \fBENOMEM\fR + Insufficient memory exists to store the time zone information for the + thread. + .PP + .IP \fBEAGAIN\fR + The system lacked the necessary resources to associate the time zone + information with the thread. + .SH SEE ALSO + getenv(3), + newctime(3), + newstrftime(3), + newtzset(3), + pthread_key_create(3), + time(2), + time_make(3), + tz_prep(3), + tzfile(5) + .SH NOTES + This function allows existing code which uses the ISO C APIs to work + correctly, unmodified, in a threaded environment. However, code which uses + use the extended parts of the POSIX APIs (involving global variables, or + .BR tzset() ) + may not work correctly unmodified. + .PP + No parallel function + .B pthread_gettz() + is defined. + .\" @(#)pthread_settz.3 1.0 diff -crN -x *~ ../tzcode2001c/strftime.c thread-safe-2/strftime.c *** ../tzcode2001c/strftime.c Tue Jun 5 13:49:50 2001 --- thread-safe-2/strftime.c Mon Jun 18 16:11:40 2001 *************** *** 9,14 **** --- 9,15 ---- #endif /* !defined lint */ #include "private.h" + #include "struct_tzinfo.h" /* ** Copyright (c) 1989 The Regents of the University of California. *************** *** 37,42 **** --- 38,47 ---- #include "fcntl.h" #include "locale.h" + #include "tztimeext.h" + + #include TZTHREAD_HEADER_H + struct lc_time_T { const char * mon[MONSPERYEAR]; const char * month[MONSPERYEAR]; *************** *** 108,114 **** static char * _add P((const char *, char *, const char *)); static char * _conv P((int, const char *, char *, const char *)); ! static char * _fmt P((const char *, const struct tm *, char *, const char *, int *)); size_t strftime P((char *, size_t, const char *, const struct tm *)); --- 113,119 ---- static char * _add P((const char *, char *, const char *)); static char * _conv P((int, const char *, char *, const char *)); ! static char * _fmt P((const char *, const struct tm *, char *, const char *, int *, const struct tzinfo *)); size_t strftime P((char *, size_t, const char *, const struct tm *)); *************** *** 125,145 **** #define IN_ALL 3 size_t ! strftime(s, maxsize, format, t) char * const s; const size_t maxsize; const char * const format; const struct tm * const t; { char * p; int warn; - tzset(); #ifdef LOCALE_HOME localebuf.mon[0] = 0; #endif /* defined LOCALE_HOME */ warn = IN_NONE; ! p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize, &warn); #ifndef NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU if (warn != IN_NONE && getenv(YEAR_2000_NAME) != NULL) { (void) fprintf(stderr, "\n"); --- 130,151 ---- #define IN_ALL 3 size_t ! strftime_z(s, maxsize, format, t, tz) char * const s; const size_t maxsize; const char * const format; const struct tm * const t; + const struct tzinfo * tz; { char * p; int warn; #ifdef LOCALE_HOME localebuf.mon[0] = 0; #endif /* defined LOCALE_HOME */ warn = IN_NONE; ! p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize, &warn, ! tz); #ifndef NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU if (warn != IN_NONE && getenv(YEAR_2000_NAME) != NULL) { (void) fprintf(stderr, "\n"); *************** *** 156,174 **** (void) fprintf(stderr, "\n"); } #endif /* !defined NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU */ ! if (p == s + maxsize) return 0; *p = '\0'; return p - s; } static char * ! _fmt(format, t, pt, ptlim, warnp) const char * format; const struct tm * const t; char * pt; const char * const ptlim; int * warnp; { for ( ; *format; ++format) { if (*format == '%') { --- 162,206 ---- (void) fprintf(stderr, "\n"); } #endif /* !defined NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU */ ! if (p >= s + maxsize) ! /* XXX */ return 0; *p = '\0'; return p - s; } + + size_t + strftime(s, maxsize, format, t) + char * const s; + const size_t maxsize; + const char * const format; + const struct tm * const t; + { + struct tzinfo * lclptr; + int dummy; + size_t ret; + tzset(); + + LOCK_LCLPTR(); + lclptr = GET_LCLPTR(&dummy); + + ret = strftime_z(s, maxsize, format, t, lclptr); + UNLOCK_LCLPTR(); + + if (ret > maxsize) + ret = 0; + return ret; + } + static char * ! _fmt(format, t, pt, ptlim, warnp, tz) const char * format; const struct tm * const t; char * pt; const char * const ptlim; int * warnp; + const struct tzinfo * tz; { for ( ; *format; ++format) { if (*format == '%') { *************** *** 217,223 **** { int warn2 = IN_SOME; ! pt = _fmt(Locale->c_fmt, t, pt, ptlim, warnp); if (warn2 == IN_ALL) warn2 = IN_THIS; if (warn2 > *warnp) --- 249,255 ---- { int warn2 = IN_SOME; ! pt = _fmt(Locale->c_fmt, t, pt, ptlim, warnp, tz); if (warn2 == IN_ALL) warn2 = IN_THIS; if (warn2 > *warnp) *************** *** 225,231 **** } continue; case 'D': ! pt = _fmt("%m/%d/%y", t, pt, ptlim, warnp); continue; case 'd': pt = _conv(t->tm_mday, "%02d", pt, ptlim); --- 257,263 ---- } continue; case 'D': ! pt = _fmt("%m/%d/%y", t, pt, ptlim, warnp, tz); continue; case 'd': pt = _conv(t->tm_mday, "%02d", pt, ptlim); *************** *** 246,252 **** pt = _conv(t->tm_mday, "%2d", pt, ptlim); continue; case 'F': ! pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp); continue; case 'H': pt = _conv(t->tm_hour, "%02d", pt, ptlim); --- 278,284 ---- pt = _conv(t->tm_mday, "%2d", pt, ptlim); continue; case 'F': ! pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp, tz); continue; case 'H': pt = _conv(t->tm_hour, "%02d", pt, ptlim); *************** *** 310,319 **** pt, ptlim); continue; case 'R': ! pt = _fmt("%H:%M", t, pt, ptlim, warnp); continue; case 'r': ! pt = _fmt("%I:%M:%S %p", t, pt, ptlim, warnp); continue; case 'S': pt = _conv(t->tm_sec, "%02d", pt, ptlim); --- 342,351 ---- pt, ptlim); continue; case 'R': ! pt = _fmt("%H:%M", t, pt, ptlim, warnp, tz); continue; case 'r': ! pt = _fmt("%I:%M:%S %p", t, pt, ptlim, warnp, tz); continue; case 'S': pt = _conv(t->tm_sec, "%02d", pt, ptlim); *************** *** 336,342 **** } continue; case 'T': ! pt = _fmt("%H:%M:%S", t, pt, ptlim, warnp); continue; case 't': pt = _add("\t", pt, ptlim); --- 368,374 ---- } continue; case 'T': ! pt = _fmt("%H:%M:%S", t, pt, ptlim, warnp, tz); continue; case 't': pt = _add("\t", pt, ptlim); *************** *** 449,455 **** ** "date as dd-bbb-YYYY" ** (ado, 1993-05-24) */ ! pt = _fmt("%e-%b-%Y", t, pt, ptlim, warnp); continue; case 'W': pt = _conv((t->tm_yday + DAYSPERWEEK - --- 481,487 ---- ** "date as dd-bbb-YYYY" ** (ado, 1993-05-24) */ ! pt = _fmt("%e-%b-%Y", t, pt, ptlim, warnp, tz); continue; case 'W': pt = _conv((t->tm_yday + DAYSPERWEEK - *************** *** 462,474 **** pt = _conv(t->tm_wday, "%d", pt, ptlim); continue; case 'X': ! pt = _fmt(Locale->X_fmt, t, pt, ptlim, warnp); continue; case 'x': { int warn2 = IN_SOME; ! pt = _fmt(Locale->x_fmt, t, pt, ptlim, &warn2); if (warn2 == IN_ALL) warn2 = IN_THIS; if (warn2 > *warnp) --- 494,506 ---- pt = _conv(t->tm_wday, "%d", pt, ptlim); continue; case 'X': ! pt = _fmt(Locale->X_fmt, t, pt, ptlim, warnp, tz); continue; case 'x': { int warn2 = IN_SOME; ! pt = _fmt(Locale->x_fmt, t, pt, ptlim, &warn2, tz); if (warn2 == IN_ALL) warn2 = IN_THIS; if (warn2 > *warnp) *************** *** 490,498 **** pt = _add(t->TM_ZONE, pt, ptlim); else #endif /* defined TM_ZONE */ ! if (t->tm_isdst >= 0) ! pt = _add(tzname[t->tm_isdst != 0], pt, ptlim); /* ** C99 says that %Z must be replaced by the ** empty string if the time zone is not --- 522,539 ---- pt = _add(t->TM_ZONE, pt, ptlim); else #endif /* defined TM_ZONE */ ! if (t->tm_isdst >= 0) { ! time_t tval; ! struct tm tcopy = *t; ! const struct ttinfo * ttisp; ! ! if (time_make(&tval, &tcopy, tz) != 0) ! continue; ! ttisp = _tz_getttype(&tval, tz); ! ! pt = _add(&tz->chars[ttisp->tt_abbrind], pt, ptlim); + } /* ** C99 says that %Z must be replaced by the ** empty string if the time zone is not *************** *** 514,545 **** ** be computed by looking only at ** tm_isdst. This requirement is ** incorrect, since it means the code ! ** must rely on magic (in this case ! ** altzone and timezone), and the ** magic might not have the correct ! ** offset. Doing things correctly is ! ** tricky and requires disobeying C99; ! ** see GNU C strftime for details. ! ** For now, punt and conform to the ! ** standard, even though it's incorrect. ! ** ! ** C99 says that %z must be replaced by the ! ** empty string if the time zone is not ! ** determinable, so output nothing if the ! ** appropriate variables are not available. */ ! if (t->tm_isdst == 0) ! #ifdef USG_COMPAT ! diff = -timezone; ! #else /* defined USG_COMPAT */ ! continue; ! #endif /* !defined USG_COMPAT */ ! else ! #ifdef ALTZONE ! diff = -altzone; ! #else /* !defined ALTZONE */ ! continue; ! #endif /* !defined ALTZONE */ #endif /* !defined TM_GMTOFF */ if (diff < 0) { sign = "-"; --- 555,579 ---- ** be computed by looking only at ** tm_isdst. This requirement is ** incorrect, since it means the code ! ** must rely on magic, and the ** magic might not have the correct ! ** offset. ! ** We perform hopefully-correct magic by ! ** peeking inside the struct tzinfo ! ** structure, in an encapsulation ! ** violation, to find the appropriate ! ** transition type. */ ! { ! time_t tval; ! struct tm tcopy = *t; ! const struct ttinfo * ttisp; ! ! if (time_make(&tval, &tcopy, tz) != 0) ! continue; ! ttisp = _tz_getttype(&tval, tz); ! diff = ttisp->tt_gmtoff; ! } #endif /* !defined TM_GMTOFF */ if (diff < 0) { sign = "-"; *************** *** 553,559 **** continue; case '+': pt = _fmt(Locale->date_fmt, t, pt, ptlim, ! warnp); continue; case '%': /* --- 587,593 ---- continue; case '+': pt = _fmt(Locale->date_fmt, t, pt, ptlim, ! warnp, tz); continue; case '%': /* *************** *** 603,609 **** static const char locale_home[] = LOCALE_HOME; static const char lc_time[] = "LC_TIME"; static char * locale_buf; - static char locale_buf_C[] = "C"; int fd; int oldsun; /* "...ain't got nothin' to do..." */ --- 637,642 ---- *************** *** 664,671 **** goto bad_locale; bufsize = namesize + st.st_size; locale_buf = NULL; ! lbuf = (lbuf == NULL || lbuf == locale_buf_C) ? ! malloc(bufsize) : realloc(lbuf, bufsize); if (lbuf == NULL) goto bad_locale; (void) strcpy(lbuf, name); --- 697,703 ---- goto bad_locale; bufsize = namesize + st.st_size; locale_buf = NULL; ! lbuf = (lbuf == NULL) ? malloc(bufsize) : realloc(lbuf, bufsize); if (lbuf == NULL) goto bad_locale; (void) strcpy(lbuf, name); *************** *** 714,720 **** (void) close(fd); no_locale: localebuf = C_time_locale; ! locale_buf = locale_buf_C; return &localebuf; } #endif /* defined LOCALE_HOME */ --- 746,752 ---- (void) close(fd); no_locale: localebuf = C_time_locale; ! locale_buf = NULL; return &localebuf; } #endif /* defined LOCALE_HOME */ diff -crN -x *~ ../tzcode2001c/struct_tzinfo.h thread-safe-2/struct_tzinfo.h *** ../tzcode2001c/struct_tzinfo.h Wed Dec 31 19:00:00 1969 --- thread-safe-2/struct_tzinfo.h Mon Jun 18 15:46:07 2001 *************** *** 0 **** --- 1,58 ---- + #ifndef STRUCT_TIMEZONE_H + + #define STRUCT_TIMEZONE_H + + #include "private.h" + #include "tzfile.h" + + /* + ** This file is in the public domain, so clarified as of + ** 1996-06-05 by Arthur David Olson (arthur_david_olson(a)nih.gov) + */ + + /* + ** This header is for use ONLY with the time conversion code. + ** There is no guarantee that it will remain unchanged, + ** or that it will remain at all. + ** Do NOT copy it to any system include directory. + ** Thank you! + */ + + struct ttinfo { /* time type information */ + long tt_gmtoff; /* UTC offset in seconds */ + int tt_isdst; /* used to set tm_isdst */ + int tt_abbrind; /* abbreviation list index */ + int tt_ttisstd; /* TRUE if transition is std time */ + int tt_ttisgmt; /* TRUE if transition is UTC */ + }; + + struct lsinfo { /* leap second information */ + time_t ls_trans; /* transition time */ + long ls_corr; /* correction to apply */ + }; + + #define BIGGEST(a, b) (((a) > (b)) ? (a) : (b)) + + #ifdef TZNAME_MAX + #define MY_TZNAME_MAX TZNAME_MAX + #endif /* defined TZNAME_MAX */ + #ifndef TZNAME_MAX + #define MY_TZNAME_MAX 255 + #endif /* !defined TZNAME_MAX */ + + struct tzinfo { + int leapcnt; + int timecnt; + int typecnt; + int charcnt; + time_t ats[TZ_MAX_TIMES]; + unsigned char types[TZ_MAX_TIMES]; + struct ttinfo ttis[TZ_MAX_TYPES]; + char chars[BIGGEST(BIGGEST(TZ_MAX_CHARS + 1, sizeof "GMT"), + (2 * (MY_TZNAME_MAX + 1)))]; + struct lsinfo lsis[TZ_MAX_LEAPS]; + }; + + + + #endif /* !defined STRUCT_TIMEZONE_H */ diff -crN -x *~ ../tzcode2001c/time_make.3 thread-safe-2/time_make.3 *** ../tzcode2001c/time_make.3 Wed Dec 31 19:00:00 1969 --- thread-safe-2/time_make.3 Mon Jun 18 15:46:08 2001 *************** *** 0 **** --- 1,277 ---- + .TH TIME_MAKE 3 + .SH NAME + time_make, time_breakup, strftime_z \- manipulate time-zone-dependent + time conversions in a thread-safe manner + .SH SYNOPSIS + .nf + .B #include <time.h> + .B #include <sys/types.h> + .PP + .B int time_make(clock, tm, tz) + .B time_t *clock; + .B struct tm *tm; + .B const struct tzinfo *tz; + .PP + .B int time_breakup(result, clock, tz) + .B struct tm *result; + .B const time_t *clock; + .B const struct tzinfo *tz; + .PP + .B size_t strftime_z(buf, maxsize, format, timeptr, tz) + .B char * restrict buf; + .B size_t maxsize; + .B const char * restrict format; + .B const struct tm * restrict timeptr; + .B const struct tzinfo * restrict tz; + .PP + .B cc ... -ltz + .fi + .SH DESCRIPTION + .B Time_make() + interprets the broken-down time in + .I *tm + as a local time in the timezone specified in + .IR *tz, + and writes the corresponding value into + .IR *clock, + using the same encoding as that of the values returned by the + .I time function. + .PP + The original values of the + .B tm_wday + and + .B tm_yday + components of + .I *tm + are ignored, and the original values of the other components are not + restricted to their normal ranges. (A positive or zero value for + .B tm_isdst + causes + .B time_make() + to presume initially that summer time (for example, Daylight Saving Time) is + or is not in effect for the specified time, respectively. A negative value + for + .B tm_isdst + causes the + .B time_make() + function to attempt to divine whether summer time is in effect for the + specified time.) + .PP + On successful completion, the values of the + .B tm_wday + and + .B tm_yday + components of + .I *tm + are set appropriately, and the other components are set to represent the + specified calendar time, but with their values forced to their normal + ranges; the final value of + .B tm_mday + is not set until + .B tm_mon + and + .B tm_year + are determined. + .PP + .B Time_breakup() + converts the time value in + .I *clock + to a broken-out time for the value, which it places in + .IR *result , + after adjusting for the time zone specified in + .IR *tz . + .PP + .B Strftime_z() + formats the information from + .I timeptr + into the buffer + .I buf + according to the string pointed to by + .IR format . + The + .I format + string follows the same specification as for the function strftime(3), + except that the values for the conversion specifiers + .B %Z + and + .B %z + are obtained from the time zone + .IR tz . + If + .B strftime_z() + is passed a + .B struct tm + created by a call to + .B time_make() + or + .B time_breakup() + which was given a different time zone object than + .IR tz , + or if it is passed a + .B struct tm + created by + .BR localtime() , + .BR localtime_r() , + .BR gmtime() , + .BR gmtime_r() , + .BR mktime() , + or + .BR timegm() , + the behavior of the + .B %Z + and + .B %z + conversion specifiers is undefined. + .SH RETURN VALUES + The + .B time_make() + function returns a value of + .B 0 + on sucessful completion, sets + .IR *clock , + and normalizes + .IR *tm . + On failure, it returns an error number, and leaves + .I *clock + and + .I *tm + in an indeterminate state. + .PP + The + .B time_breakup() + function returns + .BR 0 , + and fills in + .IR *result , + always. + .PP + On successful completion, + .B strftime_z() + fills in + .I buf + and returns the number of bytes converted. On failure, + .B strftime_z() + returns the number of bytes of buffer that would be required to fully + perform the conversion (including the terminating + .BR NUL ), + and leaves + .I buf + in an indeterminate state. + .SH ERRORS + .B time_make() + shall fail if: + .IP \fBERANGE\fR + .I *tm + does not represent a time representable by a time_t value. + .PP + .B time_make() + may fail if: + .IP \fBEINVAL\fR + .I *tm + does not represent a possible time in the timezone + .IR *tz . + (For instance, it indicates a time occuring during a leap-forward interval.) + .PP + No error status codes are defined for + .BR time_breakup() . + .PP + .B Strftime_z() + does not set or return error statuses. + .SH SEE ALSO + getenv(3), + newctime(3), + newstrftime(3), + newtzset(3), + pthread_settz(3), + time(2), + tz_prep(3), + tzfile(5) + .SH NOTES + .B time_make() + is a generalization of the ISO C function + .B mktime(3) + and the BSD/tzcode function + .BR timegm(3) . + .B time_breakup() + is a generalization of the ISO C functions + .B localtime(3) + and + .BR gmtime(3) , + and the POSIX functions + .B localtime_r(3) + and + .BR gmtime_r(3) . + .B strftime_z() + is a generalization of the ISO C function + .BR strftime(3) . + .PP + Depending on how + .B tzcode + was compiled, + .B time_make() + may handle impossible time values (e.g., values that fall during a + leap-forward interval) by failing and returning + .BR EINVAL , + or by normalizing + .I *tm + to a nearby valid time. + .PP + The return value of + .B strftime_z() + on error has changed from that of + .BR strftime() . + .B Strftime() + returns + .B 0 + if + .I buf + is not large enough. + .BR Strftime_z() , + instead, follows the example of ISO C 99's + .BR snprintf(3) , + by returning the number of bytes that would be required to fully convert the + format string. This allows an appropriately-sized buffer to be allocated in + one step, rather than requiring a binary search. Error returns can be + easily detected by checking (\fIret\fR <= \fImaxbuf\fR). + .PP + The names and calling conventions of + .B time_make() + and + .B time_breakup() + are inspired by Markus Kuhn's proposed + .B xtime_make() + and + .B xtime_breakup() + functions. The + .B xtime_* + functions represent time using + .BR "struct xtime" , + which is a much more sophisticated and better-defined representation of time + than + .BR time_t . + The + .B time_* + functions are designed to be less ambitious while still leaving room + for these future improvements. + .PP + Following Kuhn, + .B time_make() + corrects a flaw of + .B mktime() + and + .BR timegm() . + Those functions use the value + .B (time_t)-1 + to represent an error return status. However, this value can also be a + correct translation of a + .B struct tm + representing the time "December 31, 1969, 23:59:59 GMT" (assuming POSIX + .B time_t + values), + and these cases are not distinguished. Instead, + .B time_make() + uses an out-of-band method to indicate error conditions, leaving + the entire + .B time_t + space free to represent valid values. + .\" @(#)time_make.3 1.0 diff -crN -x *~ ../tzcode2001c/tz_prep.3 thread-safe-2/tz_prep.3 *** ../tzcode2001c/tz_prep.3 Wed Dec 31 19:00:00 1969 --- thread-safe-2/tz_prep.3 Mon Jun 18 15:46:08 2001 *************** *** 0 **** --- 1,120 ---- + .TH TZ_PREP 3 + .SH NAME + tz_prep, tz_free \- create and destroy time zone objects + .SH SYNOPSIS + .nf + .B #include <time.h> + .B #include <sys/types.h> + .PP + .B int tz_prep(tz, tzstring) + .B struct tzinfo** tz; + .B const char *tzstring; + .PP + .B void tz_free() + .B struct tzinfo* tzobj; + .PP + .B cc ... -ltz + .fi + .SH DESCRIPTION + The + .B tz_prep() + function creates a new time zone object, corresponding to the + given time zone name + .IR tzstring . + .I tzstring + is a pointer to a string, or + .BR NULL . + .PP + If + .I tzstring + is + .BR NULL , + the returned time zone will represent the system's best approximation of its + current wall clock time. If + .I tzstring + is the zero-length string \fB""\fR, the returned time zone will represent the + system's best approximation of Coordinated Universal Time (UTC). + .PP + All other values of + .I tzstring + are interpreted in the same manner as the + .B TZ + environment variable, as specified in environ(7). + .PP + The + .B tz_free() + function frees a time zone object allocated by + .BR tz_prep() . + .SH RETURN VALUES + On successful completion, + .B tz_prep() + returns a value of + .BR 0 + and fills in + .IR *tz . + On failure, an error number is returned and no resources are allocated. + .PP + The + .B tz_free() + function returns no value. + .SH ERRORS + The + .B tz_prep() + function will fail if: + .IP \fBENOMEM\fR + Not enough memory is available to create the time zone object. + .IP \fBENOENT\fR + No known time zone corresponds to tzname. + .PP + The + .B tz_prep() + function may fail if there is a problem with the system time + zone database which caused retrieval of the time zone information to fail + unexpectedly. In this case any appropriate error number may be returned. + .PP + The + .B tz_free() + function does not return any errors. + .SH FILES + .ta \w'/usr/local/etc/zoneinfo/posixrules\0\0'u + /usr/local/etc/zoneinfo time zone information directory + .br + /usr/local/etc/zoneinfo/localtime local time zone file + .br + /usr/local/etc/zoneinfo/posixrules used with POSIX-style TZ's + .br + /usr/local/etc/zoneinfo/GMT for UTC leap seconds + .sp + If + .B /usr/local/etc/zoneinfo/GMT + is absent, + UTC leap seconds are loaded from + .BR /usr/local/etc/zoneinfo/posixrules . + .SH SEE ALSO + environ(7), + getenv(3), + newlocaltime(3), + newstrftime(3), + newtzset(3), + pthread_settz(3), + time(2), + time_make(3), + tzfile(5) + .SH NOTES + This interface is designed so that calling + \fBtz_prep\fR(\fBgetenv\fR(\fB"TZ"\fR)) + will return an object describing the default time zone object that + non-thread-aware versions of the time functions will use by default, + provided + .B TZ + (if set) is set to a valid time zone name. + .PP + .B tzset() + interprets a + .B TZ + value of the empty string \fB""\fR as meaning "UTC without leap-seconds". + .BR tz_prep() , + however, defines it to mean the standard UTC value, with whatever + leap-second support the system uses by default. On POSIX-compliant systems, + which may not use leap second support by default, these will be equivalent. + .\" @(#)tz_prep.3 1.0 diff -crN -x *~ ../tzcode2001c/tzthread-dummy.c thread-safe-2/tzthread-dummy.c *** ../tzcode2001c/tzthread-dummy.c Wed Dec 31 19:00:00 1969 --- thread-safe-2/tzthread-dummy.c Mon Jun 18 16:15:27 2001 *************** *** 0 **** --- 1,42 ---- + /* + ** This file is in the public domain. Contributed by Jonathan Lennox + ** <lennox(a)cs.columbia.edu> + */ + + #include "private.h" + #include "tzthread-dummy.h" + #include "struct_tzinfo.h" + + /* + ** "Dummy" definitions of the TZ thread-safety operations. For use in + ** a non-threaded environment. + */ + + #ifdef ALL_STATE + struct tzinfo * _tz_lclptr; + struct tzinfo * _tz_gmtptr; + + struct tzinfo * _tz_alloc_lclptr P((void)) + { + _tz_lclptr = (struct tzinfo *) malloc(sizeof *_tz_lclptr); + return _tz_lclptr; + } + + + struct tzinfo * _tz_alloc_gmtptr P((void)) + { + _tz_gmtptr = (struct tzinfo *) malloc(sizeof *_tz_gmtptr); + return _tz_gmtptr; + } + + #else /* !defined ALL_STATE */ + + struct tzinfo _tz_lclmem; + struct tzinfo _tz_gmtmem; + + #endif /* !defined ALL_STATE */ + + struct tm _tz_tm; + + char _tz_asctime_buf[ASCTIME_BUF_SIZE]; + diff -crN -x *~ ../tzcode2001c/tzthread-dummy.h thread-safe-2/tzthread-dummy.h *** ../tzcode2001c/tzthread-dummy.h Wed Dec 31 19:00:00 1969 --- thread-safe-2/tzthread-dummy.h Mon Jun 18 16:15:17 2001 *************** *** 0 **** --- 1,127 ---- + #ifndef TZTHREAD_DUMMY_H + #define TZTHREAD_DUMMY_H + + /* + ** This file is in the public domain. Contributed by Jonathan Lennox + ** <lennox(a)cs.columbia.edu> + */ + + #include "private.h" + + /* + ** Thread primitives for tzcode. TZcode requires the following primitive + ** functions to be defined (probably as macros): + ** void LOCK_LCLPTR(void) - serialize references to the process-wide or + ** thread-specific local timezone object. + ** void LOCK_GMTPTR(void) - serialize references to write to the global + ** UTC timezone object. + ** void UNLOCK_LCLPTR(void) - Unlock the local timezone object. + ** void UNLOCK_GMTPTR(void) - Unlock the UTC timezone object. + ** + ** struct tzinfo * GET_LCLPTR(int *process) + ** - Return the current local timezone object. + ** The argument 'process' is filled in with + ** a boolean value indicating whether the + ** returned object is process-wide (true) + ** or thread-specific (false). + ** This will only be called when the local + ** pointer is locked. + ** The thread primitive is not responsible for + ** filling in the value, only for assuring that + ** sizeof(struct tzinfo) bytes are available. + ** This function returns NULL on failure. + ** + ** struct tzinfo * GET_GMTPTR(void) + ** - Return the UTC timezone object. + ** This *can* be called when the GMT pointer + ** is not locked. This function is responsible + ** for any resulting serialization necessary. + ** Any attempts to write to the object *will* + ** lock the object first, however. + ** The thread primitive is not responsible for + ** filling in the value, only for assuring that + ** sizeof(struct tzinfo) bytes are available. + ** This function returns NULL on failure. + ** + ** struct tm *GET_TM_BUF(void) - Get a pointer to a struct tm, suitable for + ** use as a return value for the localtime() + ** family of functions. In a threaded + ** environment, this buffer should be thread- + ** local. + ** + ** int SET_THREAD_LCLPTR(const struct tzinfo *) + ** - Set the thread-specific local timezone + ** object to (a copy of) the argument. Calls to + ** GET_LCLPTR() from the current thread should + ** from now on return this value. + ** If a previous local pointer was set, free + ** it first. + ** Return an errno error code on failure, or 0. + ** + ** int CLEAR_THREAD_LCLPTR(void) + ** - Clear the thread-specific local timezone + ** object to the argument. Calls to + ** GET_LCLPTR() from the current thread should + ** from now on return the global pointer. + ** If a previous local pointer was set, free + ** it first. + ** Return an errno error code on failure, or 0. + */ + + /* + ** "Dummy" definitions of the TZ thread-safety operations. For use in + ** a non-threaded environment. + */ + + /* + ** There are actually two dummy TZ implementations -- one for ALL_STATE + ** (structures allocated as-needed) and one for static. + */ + + #ifdef ALL_STATE + extern struct tzinfo * _tz_lclptr; + extern struct tzinfo * _tz_gmtptr; + + #define GET_LCLPTR(_process_wide) \ + (*(_process_wide) = 1, \ + (_tz_lclptr != NULL ? _tz_lclptr : _tz_alloc_lclptr())) + #define GET_GMTPTR() \ + (_tz_gmtptr != NULL ? _tz_gmtptr : _tz_alloc_gmtptr()) + + extern struct tzinfo * _tz_alloc_lclptr P((void)); + extern struct tzinfo * _tz_alloc_gmtptr P((void)); + + #else /* !defined ALL_STATE */ + + extern struct tzinfo _tz_lclmem; + extern struct tzinfo _tz_gmtmem; + #define GET_LCLPTR(_process_wide) (*(_process_wide) = 1, &_tz_lclmem) + #define GET_GMTPTR() (&_tz_gmtmem) + + #endif /* !defined ALL_STATE */ + + /* + ** These dummy implementations apply regardless of ALL_STATE, since we're + ** non-threaded. + */ + + #define LOCK_LCLPTR() do { } while(0) + #define LOCK_GMTPTR() do { } while(0) + + #define UNLOCK_LCLPTR() do { } while(0) + #define UNLOCK_GMTPTR() do { } while(0) + + extern struct tm _tz_tm; + + #define GET_TM_BUF() (&_tz_tm) + + extern char _tz_asctime_buf[ASCTIME_BUF_SIZE]; + + #define GET_ASCTIME_BUF() (_tz_asctime_buf) + + #define SET_THREAD_LCLPTR(x) (ENOSYS) + #define CLEAR_THREAD_LCLPTR() (ENOSYS) + + #endif /* !defined TZTHREAD_DUMMY_H */ + + diff -crN -x *~ ../tzcode2001c/tzthread-posix.c thread-safe-2/tzthread-posix.c *** ../tzcode2001c/tzthread-posix.c Wed Dec 31 19:00:00 1969 --- thread-safe-2/tzthread-posix.c Mon Jun 18 16:15:47 2001 *************** *** 0 **** --- 1,282 ---- + /* + ** This file is in the public domain. Contributed by Jonathan Lennox + ** <lennox(a)cs.columbia.edu> + */ + + #include "private.h" + #include "tzthread-posix.h" + #include "struct_tzinfo.h" + + #include <pthread.h> + + /* + ** POSIX Thread versions of the TZ thread-safety operations. + */ + + static pthread_mutex_t _tz_lcl_mutex = PTHREAD_MUTEX_INITIALIZER; + static pthread_mutex_t _tz_gmt_mutex = PTHREAD_MUTEX_INITIALIZER; + + static int get_lclptr_key P((pthread_key_t *)); + + #ifdef ALL_STATE + static struct tzinfo * _tz_lclptr; + static struct tzinfo * _tz_gmtptr; + + struct tzinfo* + _tz_get_lclptr(process_wide) + int * process_wide; + { + pthread_key_t lclptr_key; + struct tzinfo *ret; + + if (get_lclptr_key(&lclptr_key) != 0) { + return NULL; + } + if ((ret = pthread_getspecific(lclptr_key)) != NULL) { + *process_wide = 0; + return ret; + } + + *process_wide = 1; + + if (_tz_lclptr == NULL) { + _tz_lclptr = (struct tzinfo *) malloc(sizeof *_tz_lclptr); + } + return _tz_lclptr; + } + + + struct tzinfo* + _tz_get_gmtptr P((void)) + { + /* + ** Fast-path the common case. Nothing sets or alters gmtptr + ** once it's set. + */ + if (_tz_gmtptr != NULL) { + return _tz_gmtptr; + } + + _tz_lock_gmtptr(); + /* + ** Check the pointer again, in case another thread just + ** allocated it. + */ + if (_tz_gmtptr != NULL) { + _tz_unlock_gmtptr(); + return _tz_gmtptr; + } + + _tz_gmtptr = (struct tzinfo *) malloc(sizeof *_tz_gmtptr); + _tz_unlock_gmtptr(); + + return _tz_gmtptr; + } + + #else /* !defined ALL_STATE */ + + static struct tzinfo _tz_lclmem; + static struct tzinfo _tz_gmtmem; + + struct tzinfo * + _tz_get_lclptr(process_wide) + int * process_wide; + { + pthread_key_t lclptr_key; + struct tzinfo *ret; + + if (get_lclptr_key(&lclptr_key) != 0) { + return NULL; + } + if ((ret = pthread_getspecific(lclptr_key)) != NULL) { + *process_wide = 0; + return ret; + } + + *process_wide = 1; + + return &_tz_lclmem; + } + + + struct tzinfo * + _tz_get_gmtptr P((void)) + { + return &_tz_gmtmem; + } + + #endif /* defined ALL_STATE */ + + void _tz_lock_lclptr P((void)) + { + pthread_mutex_lock(&_tz_lcl_mutex); + } + + + void _tz_lock_gmtptr P((void)) + { + pthread_mutex_lock(&_tz_gmt_mutex); + } + + + extern void _tz_unlock_lclptr P((void)) + { + pthread_mutex_unlock(&_tz_lcl_mutex); + } + + + extern void _tz_unlock_gmtptr P((void)) + { + pthread_mutex_unlock(&_tz_gmt_mutex); + } + + + + struct tm* + _tz_get_tm_buf P((void)) + { + static pthread_mutex_t tmbuf_mutex = PTHREAD_MUTEX_INITIALIZER; + static pthread_key_t tmbuf_key; + static int tmbuf_initialized = 0; + struct tm *p_tm; + int err; + + if (!tmbuf_initialized) { + pthread_mutex_lock(&tmbuf_mutex); + if (!tmbuf_initialized) { + if ((err = pthread_key_create(&tmbuf_key, free)) + != 0) { + errno = err; + pthread_mutex_unlock(&tmbuf_mutex); + return NULL; + } + tmbuf_initialized = 1; + } + pthread_mutex_unlock(&tmbuf_mutex); + } + + p_tm = pthread_getspecific(tmbuf_key); + if (p_tm == NULL) { + if ((p_tm = (struct tm *) malloc(sizeof(struct tm))) == NULL) { + return NULL; + } + if ((err = pthread_setspecific(tmbuf_key, p_tm)) != 0) { + errno = err; + free(p_tm); + return NULL; + } + } + return p_tm; + } + + + char* _tz_get_asctime_buf P((void)) + { + static pthread_mutex_t asctime_buf_mutex = PTHREAD_MUTEX_INITIALIZER; + static pthread_key_t asctime_buf_key; + static int asctime_buf_initialized = 0; + char *asctime_buf; + int err; + + if (!asctime_buf_initialized) { + pthread_mutex_lock(&asctime_buf_mutex); + if (!asctime_buf_initialized) { + if ((err = pthread_key_create(&asctime_buf_key, free)) + != 0) { + errno = err; + pthread_mutex_unlock(&asctime_buf_mutex); + return NULL; + } + asctime_buf_initialized = 1; + } + pthread_mutex_unlock(&asctime_buf_mutex); + } + + asctime_buf = pthread_getspecific(asctime_buf_key); + if (asctime_buf == NULL) { + if ((asctime_buf = (char *) malloc(ASCTIME_BUF_SIZE)) + == NULL) { + return NULL; + } + if ((err = pthread_setspecific(asctime_buf_key, asctime_buf)) + != 0) { + errno = err; + free(asctime_buf); + return NULL; + } + } + return asctime_buf; + } + + + int _tz_set_thread_lclptr(tz) + const struct tzinfo * tz; + { + pthread_key_t lclptr_key; + int err; + struct tzinfo *old, *new; + + if ((err = get_lclptr_key(&lclptr_key)) != 0) { + return err; + } + if ((old = pthread_getspecific(lclptr_key)) != NULL) { + free(old); + } + + new = (struct tzinfo *) malloc(sizeof(struct tzinfo)); + if (new == NULL) { + return ENOMEM; + } + + *new = *tz; + + if ((err = pthread_setspecific(lclptr_key, new)) != 0) { + free(new); + return err; + } + return 0; + } + + + int _tz_clear_thread_lclptr P((void)) + { + pthread_key_t lclptr_key; + int err; + struct tzinfo *old; + + if ((err = get_lclptr_key(&lclptr_key)) != 0) { + return err; + } + if ((old = pthread_getspecific(lclptr_key)) != NULL) { + free(old); + } + + return pthread_setspecific(lclptr_key, NULL); + } + + + static int get_lclptr_key(lclptr_key_p) + pthread_key_t * lclptr_key_p; + { + static pthread_mutex_t lclptr_key_mutex = PTHREAD_MUTEX_INITIALIZER; + static pthread_key_t lclptr_key; + static int lclptr_key_initialized = 0; + + int err; + + if (!lclptr_key_initialized) { + pthread_mutex_lock(&lclptr_key_mutex); + if (!lclptr_key_initialized) { + if ((err = pthread_key_create(&lclptr_key, free)) + != 0) { + pthread_mutex_unlock(&lclptr_key_mutex); + return err; + } + lclptr_key_initialized = 1; + } + pthread_mutex_unlock(&lclptr_key_mutex); + } + + *lclptr_key_p = lclptr_key; + return 0; + } diff -crN -x *~ ../tzcode2001c/tzthread-posix.h thread-safe-2/tzthread-posix.h *** ../tzcode2001c/tzthread-posix.h Wed Dec 31 19:00:00 1969 --- thread-safe-2/tzthread-posix.h Mon Jun 18 16:20:38 2001 *************** *** 0 **** --- 1,109 ---- + #ifndef TZTHREAD_POSIX_H + #define TZTHREAD_POSIX_H + + /* + ** This file is in the public domain. Contributed by Jonathan Lennox + ** <lennox(a)cs.columbia.edu> + */ + + /* + ** Thread primitives for tzcode. TZcode requires the following primitive + ** functions to be defined (probably as macros): + ** void LOCK_LCLPTR(void) - serialize references to the process-wide or + ** thread-specific local timezone object. + ** void LOCK_GMTPTR(void) - serialize references to write to the global + ** UTC timezone object. + ** void UNLOCK_LCLPTR(void) - Unlock the local timezone object. + ** void UNLOCK_GMTPTR(void) - Unlock the UTC timezone object. + ** + ** struct tzinfo * GET_LCLPTR(int *process) + ** - Return the current local timezone object. + ** The argument 'process' is filled in with + ** a boolean value indicating whether the + ** returned object is process-wide (true) + ** or thread-specific (false). + ** This will only be called when the local + ** pointer is locked. + ** The thread primitive is not responsible for + ** filling in the value, only for assuring that + ** sizeof(struct tzinfo) bytes are available. + ** This function returns NULL on failure. + ** + ** struct tzinfo * GET_GMTPTR(void) + ** - Return the UTC timezone object. + ** This *can* be called when the GMT pointer + ** is not locked. This function is responsible + ** for any resulting serialization necessary. + ** Any attempts to write to the object *will* + ** lock the object first, however. + ** The thread primitive is not responsible for + ** filling in the value, only for assuring that + ** sizeof(struct tzinfo) bytes are available. + ** This function returns NULL on failure. + ** + ** struct tm *GET_TM_BUF(void) - Get a pointer to a struct tm, suitable for + ** use as a return value for the localtime() + ** family of functions. In a threaded + ** environment, this buffer should be thread- + ** local. + ** + ** int SET_THREAD_LCLPTR(struct tzinfo *) + ** - Set the thread-specific local timezone + ** object to the argument. Calls to + ** GET_LCLPTR() from the current thread should + ** from now on return this value. + ** If a previous local pointer was set, free + ** it first. + ** Return an errno error code on failure, or 0. + ** + ** int CLEAR_THREAD_LCLPTR(void) + ** - Clear the thread-specific local timezone + ** object to the argument. Calls to + ** GET_LCLPTR() from the current thread should + ** from now on return the global pointer. + ** If a previous local pointer was set, free + ** it first. + ** Return an errno error code on failure, or 0. + */ + + #include "private.h" + + /* + ** POSIX Thread versions of the TZ thread-safety operations. + */ + + extern struct tzinfo * _tz_get_lclptr P((int *)); + extern struct tzinfo * _tz_get_gmtptr P((void)); + + #define GET_LCLPTR _tz_get_lclptr + #define GET_GMTPTR _tz_get_gmtptr + + extern void _tz_lock_lclptr P((void)); + extern void _tz_lock_gmtptr P((void)); + + extern void _tz_unlock_lclptr P((void)); + extern void _tz_unlock_gmtptr P((void)); + + #define LOCK_LCLPTR _tz_lock_lclptr + #define LOCK_GMTPTR _tz_lock_gmtptr + + #define UNLOCK_LCLPTR _tz_unlock_lclptr + #define UNLOCK_GMTPTR _tz_unlock_gmtptr + + extern struct tm* _tz_get_tm_buf P((void)); + + #define GET_TM_BUF _tz_get_tm_buf + + extern char* _tz_get_asctime_buf P((void)); + + #define GET_ASCTIME_BUF _tz_get_asctime_buf + + extern int _tz_set_thread_lclptr P((const struct tzinfo *)); + extern int _tz_clear_thread_lclptr P((void)); + + #define SET_THREAD_LCLPTR _tz_set_thread_lclptr + #define CLEAR_THREAD_LCLPTR _tz_clear_thread_lclptr + + #endif /* !defined TZTHREAD_POSIX_H */ + + diff -crN -x *~ ../tzcode2001c/tztimeext.h thread-safe-2/tztimeext.h *** ../tzcode2001c/tztimeext.h Wed Dec 31 19:00:00 1969 --- thread-safe-2/tztimeext.h Mon Jun 18 15:46:07 2001 *************** *** 0 **** --- 1,75 ---- + #ifndef TZTIMEEXT_H + #define TZTIMEEXT_H + + /* + ** This file is in the public domain. Contributed by Jonathan Lennox + ** <lennox(a)cs.columbia.edu> + */ + + /* + ** This is an extended version of <time.h> which provides function definitions + ** for the public functions defined by tzcode. + */ + + #include <time.h> + + #if __STDC_VERSION__ < 199901 + #undef restrict + #define restrict + #endif + + struct tzinfo; + + #if defined(__STDC__) + + extern void tzsetwall(void); + extern struct tm * offtime(const time_t *, const long); + extern time_t timelocal(struct tm * const); + extern time_t timegm(struct tm * const); + extern time_t timeoff(struct tm * const, const long); + + extern time_t time2posix(time_t); + extern time_t posix2time(time_t); + + extern int tz_prep(struct tzinfo**, const char *); + extern void tz_free(struct tzinfo*); + + extern int time_make(time_t *, struct tm *, + const struct tzinfo *); + extern int time_breakup(struct tm *, const time_t *, + const struct tzinfo *); + extern size_t strftime_z(char * restrict, size_t, + const char * restrict, + const struct tm * restrict, + const struct tzinfo * restrict); + + extern int pthread_settz(const struct tzinfo *); + + #else /* !defined(__STDC__) */ + + extern void tzsetwall(); + extern struct tm * offtime(); + extern time_t timelocal(); + extern time_t timegm(); + extern time_t timeoff(); + + extern time_t time2posix(); + extern time_t posix2time(); + + extern int tz_prep(); + extern void tz_free(); + + extern int time_make(); + extern int time_breakup(); + extern size_t strftime_z(); + + extern int pthread_settz(); + + #endif /* defined(__STDC__) */ + + + #if __STDC_VERSION__ < 199901 + #undef restrict + #endif + + #endif /* TZTIMEEXT_H */ -- Jonathan Lennox lennox(a)cs.columbia.edu

1 0

bug or feature? mktime sets tzname to historical zone names
by Jonathan Lennox June 18, 2001

June 18, 2001

I discovered, in the course of working on my thread-safe time zone changes, an interesting side-effect of mktime(). The localsub() function sets tzname[tm->tm_isdst] to the correct zone abbreviation, as of the time it calculates. This is probably correct for localsub() as called by localtime(). However, since time2sub() calls localsub() (as the funcp passed it by mktime()), mktime() *also* sets tzname, to the time zone in effect at the time of mktime()'s argument. Additionally, because of time2sub()'s binary search, the other element of tzname (tzname[!tm->tm_isdst]) is often also set, to something random. (This will usually be the other time zone abbreviation in effect at that time, but it'd probably be pretty straightforward to construct some weird cases where it's a zone abbreviation used long in the past or future.) Is this: * a bug, which should be fixed in tzcode? * a feature, and thus I need to make sure this behavior is maintained by any changes I make to the guts of tzcode when adding the thread-safe functions? * undefined behavior, since mktime() behaves "as though it called tzset()", but tzset() is poorly defined in the presence of changing time zone abbreviations? The attached C program illustrates the behavior in question. (Europe/Riga uses EET/EEST now, but used MSK/MSD in 1981.) #include "tztimeext.h" #include <stdio.h> #include <stdlib.h> #include <string.h> struct tm then = { 0, /* int tm_sec; */ 0, /* int tm_min; */ 0, /* int tm_hour; */ 1, /* int tm_mday; */ 8, /* int tm_mon; */ 81, /* int tm_year; */ }; int main() { time_t now, then_t; struct tm* a_tm; putenv("TZ=Europe/Riga"); now = time(NULL); a_tm = localtime(&now); printf("now = %ld -- %s", (long) now, asctime(a_tm)); printf("tzname = {%s, %s}\n", tzname[0], tzname[1]); then_t = mktime(&then); printf("then = %ld -- %s", (long) then_t, asctime(&then)); printf("tzname = {%s, %s}\n", tzname[0], tzname[1]); exit(0); } -- Jonathan Lennox lennox(a)cs.columbia.edu

3 2

New Time for Argentina
by Carlos Alberto Barcenilla June 17, 2001

June 17, 2001

Hi! Next week (24-jun-2001 0:00), Argentina is changin the time zone adopting the DST method. This time we are moving from the current standard time (GMT-3) to the geographical time zone (GMT-4 new and historical Standard Time). The new schema will be: 1st Sunday of March: GMT-4 (Standard Time - WinterTime) ART 1st Sunday of October: GMT-3 (DST - Summer Time) ARST I'm attaching the patched southamerica files I took form glibc. Hope you find it useful. Regards. Carlos Barcenilla

1 0

RE: bug in tzcode2001c: strftime locale cache
by Olson, Arthur David (NCI) June 15, 2001

June 15, 2001

> The strftime locale code attempts to read the locale cache even if the > cache wasn't set up correctly. This leads to bogus output on your program's > second (and subsequent) call to strftime(), if lookup failed. > ... > This patch fixes this. An alternate fix appears below. --ado *** 7.62/strftime.c Fri Jun 15 13:00:07 2001 --- 7.63/strftime.c Fri Jun 15 13:00:07 2001 *************** *** 603,609 **** static const char locale_home[] = LOCALE_HOME; static const char lc_time[] = "LC_TIME"; static char * locale_buf; - static char locale_buf_C[] = "C"; int fd; int oldsun; /* "...ain't got nothin' to do..." */ --- 603,608 ---- *************** *** 664,671 **** goto bad_locale; bufsize = namesize + st.st_size; locale_buf = NULL; ! lbuf = (lbuf == NULL || lbuf == locale_buf_C) ? ! malloc(bufsize) : realloc(lbuf, bufsize); if (lbuf == NULL) goto bad_locale; (void) strcpy(lbuf, name); --- 663,669 ---- goto bad_locale; bufsize = namesize + st.st_size; locale_buf = NULL; ! lbuf = (lbuf == NULL) ? malloc(bufsize) : realloc(lbuf, bufsize); if (lbuf == NULL) goto bad_locale; (void) strcpy(lbuf, name); *************** *** 714,720 **** (void) close(fd); no_locale: localebuf = C_time_locale; ! locale_buf = locale_buf_C; return &localebuf; } #endif /* defined LOCALE_HOME */ --- 712,718 ---- (void) close(fd); no_locale: localebuf = C_time_locale; ! locale_buf = NULL; return &localebuf; } #endif /* defined LOCALE_HOME */

1 0

bug in tzcode2001c: strftime locale cache
by Jonathan Lennox June 14, 2001

June 14, 2001

The strftime locale code attempts to read the locale cache even if the cache wasn't set up correctly. This leads to bogus output on your program's second (and subsequent) call to strftime(), if lookup failed. I discovered this because lookup failed for me on Solaris and FreeBSD -- on Solaris because locales are kept as .so's, and on FreeBSD because the "C" locale is left implicit and not stored on disk. This patch fixes this. --- tzcode2001c/strftime.c Tue Jun 5 13:49:50 2001 +++ tzcode2001c-Sun5/strftime.c Thu Jun 14 14:27:35 2001 @@ -604,6 +604,7 @@ static const char lc_time[] = "LC_TIME"; static char * locale_buf; static char locale_buf_C[] = "C"; + static int cache_good; int fd; int oldsun; /* "...ain't got nothin' to do..." */ @@ -629,7 +630,7 @@ ** If the locale name is the same as our cache, use the cache. */ lbuf = locale_buf; - if (lbuf != NULL && strcmp(name, lbuf) == 0) { + if (cache_good && lbuf != NULL && strcmp(name, lbuf) == 0) { p = lbuf; for (ap = (const char **) &localebuf; ap < (const char **) (&localebuf + 1); @@ -705,6 +706,7 @@ ** Record the successful parse in the cache. */ locale_buf = lbuf; + cache_good = 1; return &localebuf; @@ -715,6 +717,7 @@ no_locale: localebuf = C_time_locale; locale_buf = locale_buf_C; + cache_good = 0; return &localebuf; } #endif /* defined LOCALE_HOME */ -- Jonathan Lennox lennox(a)cs.columbia.edu

1 0

Proposal: API for thread-safe time zone functions
by Jonathan Lennox June 13, 2001

June 13, 2001

One of the major shortcomings of the current time zone API defined by ISO C and POSIX is that they rely on global data to define the current time zone. If you're writing a server program which needs to talk to people all over the world in their local time zones, this can lead to remarkable difficulties. Therefore, I've written up a proposal (attached) for a thread-safe API for time zone functions. These extend (I think) the current time API in a natural way. There are two forms: one purely re-entrant, and another one that specifies thread-local timezone data to be used by the existing time functions. I've drawn a lot of inspiration for this work from Ulrich Drepper's work on thread-aware POSIX locales (http://www.cygnus.com/~drepper/tllocale.ps.bz2) * Are people interested in this? * Do people think that my proposal is a sensible API? * Would people be interested in seeing the resulting code? * Would people be interested in helping write the code? * Would the resulting code (assuming it's written sensibly) be acceptable/appropriate for incorporation into tzcode? Comments very welcome! A proposal for thread-safe time zone information. Three functions manipulate a struct tz: Name newtz -- create a time zone object Synopsis #include <time.h> struct tz* newtz(const char *tzname); Description The newtz() function creates a new time zone object, corresponding to the given time zone name. tzname is a pointer to a string representing the name of the allocated time zone. It has the same syntax as the "TZ" environment variable, both the POSIX forms and locally-defined symbolic names. The allocated struct tz contains all necessary information to represent times in the specified time zone. It has one externally-visible element: tz_name, an array of two ASCII strings containing the time zone abbreviations for standard and daylight time in the current time zone. struct tz { const char *tz_name[2]; (private data) }; If tzname is NULL, the returned struct tz describes the local wall-clock time, as best as it is known by the local system. If tzname is the empty string "", the returned struct tz describes Coordinated Universal Time (UTC). (The POSIX rules also allow UTC to be represented with the string "GMT0".) This interface is designed so that newtz(getenv("TZ")) will return an object describing the default time zone object that non-thread-aware versions of the time functions will use by default, provided TZ (if set) is set to a valid time zone name. Return Value If the function call succeeds, the return value is a pointer to a time zone object, which should be released by a call to freetz(). If it fails, it returns NULL and sets errno. Errors The newtz() function shall fail if: ENOMEM Not enough memory is available to create the time zone object. ENOENT No known time zone corresponds to tzname. newtz() may also fail with other errno values if there is a problem with the system time zone database. Name freetz -- Free resources allocated for a time zone object Synopsis #include <time.h> void freetz(struct tz* tzobj); Description The freetz() function frees the resources allocated for a time zone object returned by a call to newtz() or duptz(). If the system defines the tm_zone field of struct tm, this function invalidates the strings pointed to by the tm_zone field of all struct tm values created by localtime_z called with this tzobj. Return Value None. Errors None. Name duptz -- Duplicate a time zone object Synopsis #include <time.h> struct tz* duptz(const struct tz* tzobj); Description The duptz() function can be used to duplicate an existing time zone object. A time zone object can be used at any time in multiple places but if the lifetime can possibly end before all uses are finished one has to create a duplicate. Return Value If the function succeeds it returns a pointer to a time zone object identical to the one represented by the pointer passed in tzobj. If it fails it returns NULL. Errors The duptz() function shall fail if: ENOMEM Not enough memory is available to create the duplicated time zone object. The duptz() function may fail if: EINVAL tzobj does not point to a valid time zone object. Modified time-zone-aware time manipulation functions: struct tm * localtime_z(const time_t *clock, struct tm *result, const struct tz *tz); Equivalent to localtime_r() or gmtime_r(), in the time zone represented by tz, except that tz->tz_name is not modified. (The return value's tm_zone value is set correctly, if the system has tm_zone.) char * ctime_z(const time_t *clock, char *buf, const struct tz *tz); Equivalent to ctime_r(), in the time zone represented by tz. char * asctime_z(const struct tm *tm, char *buf, const struct tz *tz); Equivalent to asctime_r(), in the time zone represented by tz. time_t mktime_z(struct tm* tm, const struct tz *tz); Equivalent to mktime() or timegm(), in the time zone represented by tz. size_t strftime_z(char *buf, size_t maxsize, const char *format, const struct tm* timeptr, const struct tz *tz); Equivalent to strftime(), in the time zone represented by tz. char * strptime_z(const char *buf, const char *format, struct tm *timeptr, const struct tz *tz); Equivalent to strptime(), in the time zone represented by tz. (This affects only the interpretation of the %Z format specifier.) Thread-support functions Name tzuse -- use time zone object in current thread. Synopsis #include <time.h> void tzuse(const struct tz *tz); Description The tzuze() function is similar to the tzset() function, but it does not affect the global time zone. Instead it selects the new time zone only for the current thread. The time zone setting for all other threads remains the same. Once tzuse() has been called, all calls to the functions localtime(), localtime_r(), ctime(), ctime_r(), asctime(), asctime_r(), mktime(), strftime(), and strptime() in the current thread will use the current thread's define time zone. If tzuse() is called with a NULL pointer as its argument, the current thread will again use the global time zone object. -- Jonathan Lennox lennox(a)cs.columbia.edu

9 33

Re: Russian cities
by Oscar van Vlijmen June 13, 2001

June 13, 2001

How to prove that Volgograd (Russia) is in the same timezone as Moscow? Well now, I have tried some more search phrases and found at last a couple of Russian pages with lists of all major Russian cities. It seems that there are only let's say one or two originals and many copies of them at several sites. I found the following URLs. http://www.bereg.ru/sprav_info/inform/time.shtml http://newhouse.ru/help/timezone.html http://real.businesstime.ru/trip/sprav/timez.html http://www.mark-itt.ru/Collection/Russia/tz_rus.html and more with the same list. The table heading appearing in most lists reads (literally) translated: Table of corrections of time of cities of the Russian Federation and of states of neighbouring foreign countries relative to the city of Moscow. All lists tell us that Volgograd is in the same timezone as Moscow (UTC+3). But also Saratov and very likely the whole Saratovskaya oblast' is in the Moscow timezone! Ul'yanovsk, Samara and Astrakhan' are in UTC+4 according to these lists. Oscar van Vlijmen 13-Jun-2001

1 0

Question about Zone/Rule semantics
by Damon Chaplin June 13, 2001

June 13, 2001

I have a question about how to interpret Zone/Rule data. I'm unsure about this zone: Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40 -7:00 - MST 1927 Jun 10 23:00 -6:00 - CST 1930 Nov 15 -7:00 - MST 1931 May 1 23:00 -6:00 - CST 1931 Oct -7:00 - MST 1932 Apr 1 -6:00 - CST 1996 -6:00 Mexico C%sT 1998 -6:00 - CST 1998 Apr Sun>=1 3:00 -7:00 Mexico M%sT The corresponding Rule lines are: Rule Mexico 1996 2000 - Apr Sun>=1 2:00 1:00 D Rule Mexico 1996 2000 - Oct lastSun 2:00 0 S What is the wall-clock offset from UTC on April 10th 1998? The last UNTIL value is "1998 Apr Sun>=1 3:00", which is just after the April Rule came into effect ("Apr Sun>=1 2:00"). So I'm unsure if the Rule is supposed to still be in effect or not. i.e. I don't know if it should be -7:00 (standard time) or -6:00 (daylight time). It makes more sense if it is daylight time, but then why didn't the UNTIL value just use "Apr Sun>=1 2:00" and make it obvious. My general question is: do Rules apply to a particular period within a Zone (i.e. one line in the Zone description) even when they happened before the Zone period started? Damon (I'm working on a program to convert the timezone database to the format needed by the iCalendar specification, for use by calendaring apps etc.)

1 0

Changes in Argentina (or not)
by Mariano Absatz June 12, 2001

June 12, 2001

Hi, one of the major newspapers here in Argentina said that the 1999 Timezone Law (which never was effectively applied) will (would?) be in effect starting Sunday, June 17th (yeah, in the middle of winter, down here). The article is at http://ar.clarin.com/diario/2001-06-06/e-01701.htm for those that can read Spanish. The only verifiable Law applying is Murphy's Law applies since tzdata2001c was published YESTERDAY. The Law itself is "Ley N° 25155", sanctioned on 25-Aug-1999, enacted 17-Sep-1999 and published 21-Sep-1999. The official publication is at: http://www.boletin.jus.gov.ar/BON/Primera/1999/09-Septiembre/21/PDF/BO21-09 -99LEG.PDF Regretfully, you have to subscribe (and pay) for the on-line version of the Boletin Oficial at http://www.jus.gov.ar/servi/boletin/ to be able to access it. There's another (paid) service where you can get all the Argentine Laws at http://std.saij.jus.gov.ar/ which lawyers prefer. Not paying, I only could see the Summary at: http://www1.hcdn.gov.ar/folio-cgi- bin/om_isapi.dll?clientID=1622813&advquery=Huso%20Horario&infobase=leyes.nfo&record= {844}&softpage=Document42&x=22&y=19&zz= Since I don't trust it's quite valid 'cause it has a very "dynamic" look, I got there from http://www.diputados.gov.ar/ pressed the "BASES de DATOS" button, followed the "Leyes Nacionales" link, entered "Huso Horario" and pressed "BUSCAR". There you get to the summary (alas in Spanish). I'll attempt a rough translation here: ==================================================================================== Title: Official Time. Summary: Time zone four (4) hours to the west of the Greenwich Meridian is established as the Official Time in all of the Country territory, according to the correspondig place of the Argentine Republic in the International Time Zone System. Starting at zero hour of the first Sunday of October every year, the time zone three (3) [west] of the Greenwich Meridian will be adopted up until the zero hour of the first Sunday of March in the following year. Updates: Decree 186/2000, enacted 2-Mar-2000, published 3-Mar-2000: The change of the Official Time enacted by Article 2 of Law # 25155 is prorrogated until the first Sunday in March, 2001. ==================================================================================== Anyway, considering the problems that arised when the Law was published, the general ignorance surrounding the subject in general (and especially in National and Provincial Authorities), mixed with the will to confront anything the government attempts (for good or for bad), I would wait a week before commiting changes. Recent history is on my side :-) In fact, I saw no Decree published in the last few days. I attach a tentative 'diff -c' against the latest (tzdata2001c) southamerica file. I'll keep the list informed of news regarding this. -- Mariano Absatz - El Baby mailto:baby@baby.com.ar http://www.baby.com.ar/ PGP KEYS: http://www.baby.com.ar/datos/personales.html#claves_pgp |\ _ _\\/'> Powered by Pegasus Mail /|__) http://www.pmail.com ) )\ *** southamerica Wed Jun 6 09:58:19 2001 --- southamerica.new Wed Jun 6 10:11:23 2001 *************** *** 115,120 **** --- 115,127 ---- Rule Arg 1999 only - Oct Sun>=1 0:00 1:00 S Rule Arg 2000 only - Mar Sun>=1 0:00 0 - # + # Mariano Absatz (2001-06-06): + # Though the Decree hasn't been published yet, apparently, Law #25155 from + # 1999 would be implemented starting Sunday, June 17th in 2001. + Rule Arg 2001 only - Jun Sun>=17 0:00 0 - + Rule Arg 2001 max - Oct Sun>=1 0:00 1:00 S + Rule Arg 2002 max - Mar Sun>=1 0:00 0 - + # # From Peter Gradelski via Steffen Thorsen (2000-03-01): # We just checked with our Sao Paulo office and they say the government of # Argentina decided not to become one of the countries that go on or off DST. *************** *** 135,141 **** -4:00 Arg AR%sT 1969 Oct 5 -3:00 Arg AR%sT 1999 Oct 3 0:00 -4:00 Arg AR%sT 2000 Mar 3 0:00 ! -3:00 - ART # # Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC), # Formosa (FM), La Pampa (LP), Chubut (CH) --- 142,149 ---- -4:00 Arg AR%sT 1969 Oct 5 -3:00 Arg AR%sT 1999 Oct 3 0:00 -4:00 Arg AR%sT 2000 Mar 3 0:00 ! -3:00 - ART 2001 Jun 17 0:00 ! -4:00 Arg AR%sT # # Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC), # Formosa (FM), La Pampa (LP), Chubut (CH) *************** *** 146,152 **** -3:00 Arg AR%sT 1991 Jul -3:00 - ART 1999 Oct 3 0:00 -4:00 Arg AR%sT 2000 Mar 3 0:00 ! -3:00 - ART # # Cordoba (CB), Santiago del Estero (SE), Salta (SA), Tucuman (TM), La Rioja (LR), San Juan (SJ), San Luis (SL), # Neuquen (NQ), Rio Negro (RN) --- 154,161 ---- -3:00 Arg AR%sT 1991 Jul -3:00 - ART 1999 Oct 3 0:00 -4:00 Arg AR%sT 2000 Mar 3 0:00 ! -3:00 - ART 2001 Jun 17 0:00 ! -4:00 Arg AR%sT # # Cordoba (CB), Santiago del Estero (SE), Salta (SA), Tucuman (TM), La Rioja (LR), San Juan (SJ), San Luis (SL), # Neuquen (NQ), Rio Negro (RN) *************** *** 157,163 **** -3:00 Arg AR%sT 1990 Jul -3:00 - ART 1999 Oct 3 0:00 -4:00 Arg AR%sT 2000 Mar 3 0:00 ! -3:00 - ART # # Jujuy (JY) Zone America/Jujuy -4:21:12 - LMT 1894 Nov --- 166,173 ---- -3:00 Arg AR%sT 1990 Jul -3:00 - ART 1999 Oct 3 0:00 -4:00 Arg AR%sT 2000 Mar 3 0:00 ! -3:00 - ART 2001 Jun 17 0:00 ! -4:00 Arg AR%sT # # Jujuy (JY) Zone America/Jujuy -4:21:12 - LMT 1894 Nov *************** *** 170,176 **** -4:00 - WART 1992 Oct 18 -3:00 - ART 1999 Oct 3 0:00 -4:00 Arg AR%sT 2000 Mar 3 0:00 ! -3:00 - ART # # Catamarca (CT) Zone America/Catamarca -4:23:08 - LMT 1894 Nov --- 180,187 ---- -4:00 - WART 1992 Oct 18 -3:00 - ART 1999 Oct 3 0:00 -4:00 Arg AR%sT 2000 Mar 3 0:00 ! -3:00 - ART 2001 Jun 17 0:00 ! -4:00 Arg AR%sT # # Catamarca (CT) Zone America/Catamarca -4:23:08 - LMT 1894 Nov *************** *** 182,188 **** -3:00 Arg AR%sT 1992 Jul -3:00 - ART 1999 Oct 3 0:00 -4:00 Arg AR%sT 2000 Mar 3 0:00 ! -3:00 - ART # # Mendoza (MZ) Zone America/Mendoza -4:35:16 - LMT 1894 Nov --- 193,200 ---- -3:00 Arg AR%sT 1992 Jul -3:00 - ART 1999 Oct 3 0:00 -4:00 Arg AR%sT 2000 Mar 3 0:00 ! -3:00 - ART 2001 Jun 17 0:00 ! -4:00 Arg AR%sT # # Mendoza (MZ) Zone America/Mendoza -4:35:16 - LMT 1894 Nov *************** *** 195,201 **** -4:00 - WART 1992 Oct 18 -3:00 - ART 1999 Oct 3 0:00 -4:00 Arg AR%sT 2000 Mar 3 0:00 ! -3:00 - ART # Aruba # Zone NAME GMTOFF RULES FORMAT [UNTIL] --- 207,214 ---- -4:00 - WART 1992 Oct 18 -3:00 - ART 1999 Oct 3 0:00 -4:00 Arg AR%sT 2000 Mar 3 0:00 ! -3:00 - ART 2001 Jun 17 0:00 ! -4:00 Arg AR%sT # Aruba # Zone NAME GMTOFF RULES FORMAT [UNTIL]

1 1

strftime("%Z") invalidated by TZ change: is this a fair restriction?
by Jonathan Lennox June 12, 2001

June 12, 2001

This is an issue that occured to me in the process of converting tzcode to support my proposed thread-safe API. I think the following restriction is necessary to the POSIX 200x spec. If a 'struct tm' broken-down time structure is created by localtime() or localtime_r(), or modified by mktime(), and the value of the "TZ" environment variable is subsequently modified, the results of the %Z and %z strftime() and wcsftime() conversion specifiers are undefined, when strftime() or wcsftime() is called with such a broken-down time structure. If the broken-down time structure is subsequently modified by a successful call to mktime(), the results of these conversion specifiers are once again defined. If a 'struct tm' broken-down time structure is modified by gmtime(), it is implementation-defined whether the result of the %Z and %z strftime() and wcsftime() conversion specifiers shall refer to UTC or the current local time zone, when strftime() or wcsftime() is called with such a broken-down time structure. I think it's too late to get this restriction into the Austin Group revised POSIX spec, but some version of it probably ought to go into the tzcode man pages (along with documentation of what tzcode does for the second case, which is dependent on the value of TM_ZONE and TM_GMTOFF at compile-time). The motivating example for the first two paragraphs is the code attached below (test-tzchange.c). It produces the following output on FreeBSD 4.3 (which uses a slightly old version of tzcode, with some local changes that shouldn't affect this; it defines TM_ZONE and TM_GMTOFF): $ ./test-tzchange Fri 04 May 11:11:00 2001 EDT Fri 04 May 11:11:00 2001 PPT Fri 04 May 11:11:00 2001 PDT This occurs because lclptr->chars has a different value for the two time zones; since test_tm->tm_zone is a pointer into lclptr->chars, it ends up pointing somewhere bogus, and thus claiming that "Pacific Peace Time" was used in 2001. I don't think it's possible to fix this in tzcode without either breaking binary compatibility of 'struct tm', leaking memory on a TZ change, or breaking %Z for non-current time zones. The motivating example for the third paragraph is that System V (at least Solaris) and tzcode do different things, and I don't think either one is about to change. (System V always gets its %Z from tzname[i], I think.) The underlying motivation for all this is that I don't see any sensible way to set tm_zone, for struct tm's produced by reentrant timezone functions, that doesn't end up leading to free pointer dereferences following tz_free(). However, if the analogous operation for process-wide timezones is *already* undefined, it's clearly not nearly as much of a problem. What do people think about this? #include <stdio.h> #include <time.h> #include <stdlib.h> /* #define OLD_NAMES */ #ifdef OLD_NAMES /* Define this on Solaris */ #define FIRST_NAME "US/Eastern" #define SECOND_NAME "US/Pacific" #else /* Proper Olson tzdata names. */ #define FIRST_NAME "America/New_York" #define SECOND_NAME "America/Los_Angeles" #endif int main() { struct tm* test_tm; time_t then = 988989060; char buf[256]; /* Compatibility names are used, rather than new Olson names, so as to * test on Solaris. */ if (putenv("TZ=" FIRST_NAME) != 0) { fprintf(stderr, "putenv failed (1)\n"); exit(1); } if ((test_tm = localtime(&then)) == NULL) { fprintf(stderr, "localtime failed\n"); exit(1); } if (strftime(buf, sizeof(buf), "%a %d %h %H:%M:%S %Y %Z", test_tm) == 0) { fprintf(stderr, "strftime failed (1)\n"); exit(1); } printf("%s\n", buf); if (putenv("TZ=" SECOND_NAME) != 0) { fprintf(stderr, "putenv failed (2)\n"); exit(1); } tzset(); if (strftime(buf, sizeof(buf), "%a %d %h %H:%M:%S %Y %Z", test_tm) == 0) { fprintf(stderr, "strftime failed (2)\n"); exit(1); } printf("%s\n", buf); test_tm->tm_isdst = -1; if (mktime(test_tm) == -1) { fprintf(stderr, "mktime failed\n"); exit(1); } if (strftime(buf, sizeof(buf), "%a %d %h %H:%M:%S %Y %Z", test_tm) == 0) { fprintf(stderr, "strftime failed (3)\n"); exit(1); } printf("%s\n", buf); exit(0); } -- Jonathan Lennox lennox(a)cs.columbia.edu

2 1

Minimap of russian cities
by Jesper Nørgaard June 10, 2001

June 10, 2001

I thought you might like to have a mini-map of how the russian cities I mentioned, appears on the map of World Time Explorer: Regards, Jesper Nørgaard Welen Email: jnorgard(a)Prodigy.Net.mx Programador/Analista CIMMYT - Centro Internacional de Mejoramiento de Maíz y Trigo Dirección: CIMMYT Int. c/o Jesper Nørgaard Km. 45, Carretera México-Veracruz El Batán Texcoco, Edo. de México CP 56130 MEXICO Tel.: +52 (5) 58-04-20-04 ext. 1374 Fax: +52 (5) 58-04-75-58 Tel. Casa: 53-10-05-95 ó 53-10-97-78 CIMMYT home page: http://cimmyt.cgiar.org Check out my free program World Time Explorer: http://www20.Brinkster.com/timezone50/index.htm http://members.theglobe.com/timezone50/index.htm

1 0

Re: Proposal: API for thread-safe time zone functions
by Russ Allbery June 9, 2001

June 9, 2001

Garrett Wollman <wollman(a)khavrinen.lcs.mit.edu> writes: > (In the FreeBSD Project, and probably many other places, our coding > standard is very explicit: don't use typedefs for structures. This > deficiency in C is precisely the reason for making that requirement.) I'm completely with Garrett on this. Pointers to incomplete structs make *great* opaque datatypes in C; typedefs have considerably more problems and are really annoying to deal with. It's really a shame that FILE wasn't instead defined as a pointer to an incomplete struct, since the way it works right now, lots of headers that have no need whatsoever of all the crap in stdio.h have to include it solely because there's one function (which many callers may not even use) that takes a FILE * as an argument. -- Russ Allbery (rra(a)stanford.edu) <http://www.eyrie.org/~eagle/>

1 0

(no subject)
by Kim McGarghan June 8, 2001

June 8, 2001

unsubscribe

1 0

Change in DST for Argentina
by Syed Sajjath June 7, 2001

June 7, 2001

Hi, Is anyone aware of changes in Argentina to add Daylight Savings. One of my contacts sent the following information. From TZ database, Argentina is GMT -3 and no DST. >> With this, timezone for Argentina will be modified as follows: >> from 1st Sunday October until first Saturday March: GMT -3 >> from 1st Sunday Martch until first Saturday October: GMT -4 Thanks -Syed

2 1

Dave Wilson: Drowning in a Sea of Clocks
by Paul Eggert June 7, 2001

June 7, 2001

In yesterday's Los Angeles Times, Dave Wilson wrote a humorous piece "Drowning in a Sea of Clocks" complaining about the number of clocks he has to change every spring and fall. He goes on: Like all good paranoid fantasies, mine has a villain: the Japanese. Japanese electronics designers have been deliberately building clocks into everything in hopes of weakening our industrial might. Now, you might say, "Dave, that's crazy talk. The Japanese have a lot more of these gadgets than we do. They're gadget freaks, man. They'd be hurt by this as much as we are, or even more." Which shows how much you know, pal. The Japanese don't have daylight saving time. He finally resolves to disable all his clocks that serve no function. (His oven clock now blinks 00:00.) See: http://www.latimes.com/business/cutting/20010405/t000029080.html

2 1

Additional Greenland time zone
by Gwillim Law June 6, 2001

June 6, 2001

Does anyone out there speak Norwegian or Danish? The tz database lists only three time zones for Greenland, with standard time equal to UTC-1, UTC-3, and UTC-4. Some recent time zone maps (e.g. <http://www.hammondmap.com/timezone/maintz.html>) show a fourth time zone in northeast Greenland with UTC as its standard time. Doing some Internet research, I found a document, "Notices to Mariners", in Norwegian and English, at <http://www.statkart.no/efs/efshefter/2001/efs5-2001.pdf>. The following excerpt obviously has a good deal of useful information, but appears in Norwegian only. "220. (T). Grønland. Sommertid 2001. Sommertiden begjynner den 24. mars 2001. Grønland har 4 lokale tider, og i relasjon til UTC gjelder følgende tidslinje: Forsvarsområdetved Thule UTC-4 Grønlandsk normaltid UTC-3 Scoresby-sund UTC-1 Danmarks-havn UTC Danmark (Mellem-europæisk tid) UTC+1 Sommertid innføres som følger: 1. Grønlandsk normaltid: Den 24. mars 2001 kl. 2200 stilles uret frem til kl. 2300. 2. Scoresbysund: Den 25. mars 2001 kl. 0000 stilles uret frem til kl. 0100. 3. I forsvarsområdet ved Thule samt i Danmarkshavn innføres det ikke sommertid." What I make of this is: Greenland Summer time begins on 24 March 2001. Greenland has four local times, and the relation to UTC is according to the following time line: [the following five items are aligned horizontally] Thule and environs [?] UTC-4 Standard Greenland time UTC-3 Scoresbysund UTC-1 Danmarkshavn UTC Denmark (Central European Time) UTC+1 Summer time [...?] 1. Standard Greenland time: on 24 March 2001 at 22:00 change the clock to 23:00 [?] 2. Scoresbysund: on 25 March 2001 at 00:00 change the clock to 01:00 3. In the environs of Thule together with Danmarkshavn [...?]." Here's an excerpt from another page <http://www.gh.gl/kn/news/govern/ukiunalun.htm>, probably in Danish: "Vintertid fra på søndag den 31. oktober Uret stilles en time tilbage Natten mellem lørdag og søndag den 31. oktober 1999 slutter sommertiden. Der skiftes officielt lørdag den 30. oktober 1999 kl. 23:00. Det betyder, at vi kl. 23:00 stiller klokken en time tilbage til kl. 22:00. For Ittoqqortoormiit slutter sommertiden søndag den 31. oktober 1999 kl. 01:00, hvor klokken stilles een time tilbage til kl. 00:00. For Danmarkshavn og i forsvarsområdet i Pituffik er der ikke indført sommertid/vintertid." It looks as if this means that in most of Greenland, the clock turned back from 30 October 1999 23:00 to 22:00. In Ittoqqortoormiit (= Scoresbysund), it went from 31 October 1999 01:00 to 00:00. In Danmarkshavn and Pituffik (= Thule), something else happened, but I can't tell what. There are similar texts on <http://www.statkart.no/efs/efshefter/2000/efs5-2000.pdf>, <http://www.gh.gl/dk/nyheder/regering/2000/meddelt1610-2.htm>, and <http://www.epr.gl/government/dk_pressrel/160301_sommertid.html>. It looks as if they're all paraphrased from official Greenland press releases. Can anyone translate the rest, or fill in any more details? Gwillim Law

2 1

RE: [akr@m17n.org: bin/27630: mktime problem.]
by Olson, Arthur David (NCI) June 5, 2001

June 5, 2001

Garrett's analysis of the cause of the Africa/Monrovia problem is accurate (see the end of this message). The conservative approach to fixing the problem would be as shown just below. The more radical approach would be to ditch the saved_seconds hackery completely; it predates the conditional normalize_overflow(&yourtm.tm_min, &yourtm.tm_sec, SECSPERMIN) call that now appears in the code, which should do what the saved_seconds hackery was designed to do. --ado *** 7.73/localtime.c Tue Jun 5 14:04:57 2001 --- 7.74/localtime.c Tue Jun 5 14:04:57 2001 *************** *** 1383,1389 **** } if (increment_overflow(&yourtm.tm_year, -TM_YEAR_BASE)) return WRONG; ! if (yourtm.tm_year + TM_YEAR_BASE < EPOCH_YEAR) { /* ** We can't set tm_sec to 0, because that might push the ** time below the minimum representable time. --- 1383,1391 ---- } if (increment_overflow(&yourtm.tm_year, -TM_YEAR_BASE)) return WRONG; ! if (yourtm.tm_sec >= 0 && yourtm.tm_sec < SECSPERMIN) ! saved_seconds = 0; ! else if (yourtm.tm_year + TM_YEAR_BASE < EPOCH_YEAR) { /* ** We can't set tm_sec to 0, because that might push the ** time below the minimum representable time. -----Original Message----- From: Garrett Wollman [mailto:wollman@khavrinen.lcs.mit.edu] Sent: Friday, May 25, 2001 2:01 PM To: tz(a)elsie.nci.nih.gov Subject: [akr(a)m17n.org: bin/27630: mktime problem.] A FreeBSD user submitted the following bug report. I'm curious as to whether the current tzcode still has this problem. My analysis follows at the end. -GAWollman ... For example, TZ=Africa/Monrovia, 1972/05/01 00:44:30 cannot be converted to time_t. Since this example is taken from `zdump -v Africa/Monrovia' and it is after Epoch, there is no reason to fail. ... This problem appears to result from the `saved_seconds' hackery in time2(): saved_seconds = yourtm.tm_sec; yourtm.tm_sec = 0; time2() then goes on to attempt to find (in this example) 1972-05-01T00:44:00, which does not exist in this time zone, and returns failure.

1 0

tzcode2001c.tar.gz and tzdata2001.tar.gz
by Olson, Arthur David (NCI) June 5, 2001

June 5, 2001

The files ftp://elsie.nci.nih.gov/pub/tzcode2001c.tar.gz and ftp://elsie.nci.nih.gov/pub/tzdata2001c.tar.gz are now available. These incorporate the changes circulated last week on the time zone mailing list by Paul Eggert and Andrew Brown. --ado

1 0

[The Times 2001-06-02] Timezone cheats using Net for exams
by Joseph S. Myers June 2, 2001

June 2, 2001

From Saturday's Times: SATURDAY JUNE 02 2001 Timezone cheats using Net for exams BY GLEN OWEN, EDUCATION CORRESPONDENT, AND LAURA PEEK IN WASHINGTON A GLOBAL network of timezone cheats has been established on the Internet to pass examination secrets between candidates. Overseas students, who start the same papers at staggered intervals because of international time differences, are corresponding with candidates who have already finished their exams. The English examination boards alerted to the scam by The Times, have promised to review procedures, and warn that any candidate found cheating will be disqualified. One board admitted that the growth of Internet use and mobile text messaging presented a significant twist to an old problem. Schools in Brazil, Bermuda, the USA and Canada, also contacted by The Times yesterday, said they would be reviewing examination procedures to prevent time-zone cheating. [ ... - for full article see Times website: ] http://www.thetimes.co.uk/article/0,,2-2001190449,00.html http://www.thetimes.co.uk/article/0,,59-2001190216,00.html -- Joseph S. Myers jsm28(a)cam.ac.uk

1 0

(no subject)
by USMCGRANDMOTHER＠aol.com June 2, 2001

June 2, 2001

1 0

RE: proposed tz changes for Mongolia, Jan Mayen, Chagos, Indonesia, etc.
by Jesper Nørgaard June 1, 2001

June 1, 2001

A few comments on the proposed tz changes ... Check out my free program World Time Explorer: http://www20.Brinkster.com/timezone50/index.htm ---------- From: Paul Eggert[SMTP:eggert@twinsun.com] Sent: Jueves 31 de Mayo de 2001 3:00 To: tz(a)elsie.nci.nih.gov Subject: proposed tz changes for Mongolia, Jan Mayen, Chagos, Indonesia, etc. >Here are proposed changes to the tz code and data. The most pressing >ones are those for Mongolia, Jan Mayen, and Chagos, as the current UTC >offsets are incorrect. Also, these changes affect the current time >zone abbreviations for Indonesia. >* Jan Mayen observes Oslo time, not -01:00. Also, add commentary about > time in Svalbard and Jan Mayen since 1925. > (Thanks to Steffen Thorsen for this.) Actually I would have liked to take credit for that, at least the first part, but I don't deny that Steffen is the expert (by birth, I presume) of norwegian issues :-) ... >* Southwest Borneo switched from +08:00 to +07:00 on 1988-01-01. > This entails a new zone 'Asia/Pontianak'. > (Thanks to Gwillim Law for this.) Funny, I had it all along right under my nose without noticing it. I send a screenshot from my program World Time Explorer which shows the region. And the line down the middle of Borneo from Malaysia actually *is* a time zone border - I just hadn't realized it, since the line towards Malaysia is a country border, not a time zone border. Can anyone confirm that Palangkaray (with population 148,700 latitude -2.19 and longitude 113.82) is also on GMT+7 just like Pontianak, and that Bandjarmasin (with population 534,600 and latitude -3.34, longitude 114.57) is on GMT+8? The screenshot I send is BorneoSouthWest.gif. The map was developed by Manifold, check out http://www.manifold.net/download/freemaps.html. >* Time Zone Converter has moved. The new name will be World Time Explorer 1.6 further down on page http://www20.brinkster.com/timezone50/index.htm you can find 3 download buttons for this program, which has maps included from which the graphic that I attach to the mail were taken. Note that it's a beta version, mainly because I want to put some more functionality into the program before releasing it officially, but also because the help file is not up-to-date at all. But the existing functions should work. Note that you can take a snapshot of world time from all distinct time zones in Time Calculator. And by the way, you need a Windows computer to use it ... Regards Jesper Nørgaard Welen

2 1

proposed tz changes for Mongolia, Jan Mayen, Chagos, Indonesia, etc.
by Paul Eggert May 31, 2001

May 31, 2001

Here are proposed changes to the tz code and data. The most pressing ones are those for Mongolia, Jan Mayen, and Chagos, as the current UTC offsets are incorrect. Also, these changes affect the current time zone abbreviations for Indonesia. The other changes cover historical data, minor porting glitches for the code, and the web page describing tz. As usual, thanks to everyone who wrote in; it couldn't be done without you! Code changes * Add support for non-POSIX systems that lack sys/stat.h. * Add instructions for OSF1 V5.0 cc (which mishandles 'const'). Data changes * Mongolia observes DST this year, from 04-27 02:00 to 09-28 03:00. (Thanks to Rives McDow for this.) * Jan Mayen observes Oslo time, not -01:00. Also, add commentary about time in Svalbard and Jan Mayen since 1925. (Thanks to Steffen Thorsen for this.) * The British Indian Ocean Territory (Indian/Chagos) seems to have switched from +05:00 to +06:00; for lack of better info, we'll guess that it occurred on 1996-01-01. * The English abbreviations for the current time zones in Indonesia are WIT, CIT, and EIT (not JAVT, BORT, JAYT which were purely guesswork on my part). Thanks to Gwillim Law for pointing me at a web page that had an (incorrect) translation about this. * Southwest Borneo switched from +08:00 to +07:00 on 1988-01-01. This entails a new zone 'Asia/Pontianak'. (Thanks to Gwillim Law for this.) * Shanks now says that Mongolia didn't introduce DST until 1983. * Chile introduced DST in 1966, not 1969. (Thanks to Gwillim Law for this.) * Fixes for legal time in the Netherlands before 1938: - From 1918 through 1921 DST ended the last Monday in September, not the last Sunday. - Amsterdam Mean Time was +00:19:32.13 until 1937-07-01. The tz database can't represent the ".13", unfortunately. - Add commentary about legal time in the Netherlands before 1937. (Thanks to Robert H. van Gent for this.) * Fixes for legal time in Sweden before 1917: - Sweden adopted standard time on 1879-01-01, not 1878-05-31. - Standard time was +1:00:14, not +1:12:12. - The switch to +1:00 occurred on 1900-01-01 at 00:00, not at 01:00. - 1916 DST was from 05-14 23:00 to 10-01 01:00, not from 04-14 23:00 to 10-01 00:00. (Thanks to Ivan Nilsson for this.) * Change zone.tab entry to say that Sala y Gomez is like Easter Island, while the other Chilean locations are all like Santiago. (Thanks to Gwillim Law for this.) Changes that affect commentary only. * Add brief instructions for how to retrieve, build and test tz. * Add more commentary for Choibalsan, Mongolia, which may or may not be in a different time zone from Ulaanbaatar. (Thanks to Rives McDow for this.) * Add more commentary about why the Antarctica/Vostok entry is guesswork. (Thanks to Lee Hotz for this.) * Fix the spelling of "Attlee". (Thanks to Mark Brader for this.) * Add commentary for Villa Las Estrellas, the only town in the Antarctic. * Add commentary for the islands of Aldabra, Farquhar, and Desroches, which were transferred from the British Indian Ocean Territory to the Seychelles in 1976. * Add remarks about why Alaska's switch from Julian to Gregorian is somewhat notional, as none of the locations currently in the tz database were permanently inhabited in 1867 by anyone using either calendar. * Remove commentary about Brad Sherman's attempt to let California operate on Denver time, as it's too hard to keep track of all the legislative proposals right now. * Navassa is now administered by the US Fish and Wildlife Service. Changes that affect the web page tz-link.htm only. * Use family name first in the Dublin Core metadata, as the standard recommends. * Mention Tru64, which uses tz too. * Change <samp> to <code> in tz-link.htm, as that better matches what's being represented. * Time Zone Converter has moved. * World Time Server no longer publishes maps (that I could see, anyway). * Mention http://www.dstc.qut.edu.au/DST/marg/daylight.html, which is more useful than the official page http://www.lawlink.nsw.gov.au/crd.nsf/pages/time2 for Australia. * Mention http://www.nrc.ca/inms/time/tze.html for Canada. * Translate the title of http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm from Dutch to English. (Thanks to Robert H. van Gent for this.) * Mention the SOFA code. (Thanks to Markus Kuhn for this.) * The International Earth Rotation Service's web site has moved. * ISO 8601 has been updated; the current version is ISO 8601:2000. (Thanks to Markus Kuhn for this.) * Mention Internet RFC 2822 and draft-ietf-impp-datetime-03.txt. =================================================================== RCS file: RCS/README,v retrieving revision 1997.7 retrieving revision 1997.7.0.1 diff -pu -r1997.7 -r1997.7.0.1 --- README 1997/09/04 20:55:54 1997.7 +++ README 2001/05/31 00:59:05 1997.7.0.1 @@ -33,8 +33,22 @@ Since POSIX frowns on correct leap secon the "zic" command (in the absence of a "-L" option) has been changed to omit leap second information from its output files. -Be sure to read the comments in "Makefile" and make any changes -needed to make things right for your system. +Here is a recipe for acquiring, building, installing, and testing the +tz distribution on a GNU/Linux or similar host. + + mkdir tz + cd tz + wget 'ftp://elsie.nci.nih.gov/pub/tz*.tar.gz' + gzip -dc tzcode*.tar.gz | tar -xf - + gzip -dc tzdata*.tar.gz | tar -xf - + +Be sure to read the comments in "Makefile" and make any changes needed +to make things right for your system, especially if you are using some +platform other than GNU/Linux. Then run the following commands, +substituting your desired installation directory for "$HOME/tzdir": + + make TOPDIR=$HOME/tzdir install + $HOME/tzdir/etc/zdump -v America/Los_Angeles To use the new functions, use a "-ltz" option when compiling or linking. =================================================================== RCS file: RCS/tz-link.htm,v retrieving revision 2001.2 retrieving revision 2001.2.0.2 diff -pu -r2001.2 -r2001.2.0.2 --- tz-link.htm 2001/04/05 20:43:41 2001.2 +++ tz-link.htm 2001/05/31 03:53:40 2001.2.0.2 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="US-ASCII"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> @@ -7,9 +7,9 @@ <title>Sources for Time Zone and Daylight Saving Time Data</title> <link rel="schema.DC" href="http://purl.org/DC/elements/1.1/" /> <meta http-equiv="Content-type" content='text/html; charset="US-ASCII"' /> -<meta name="DC.Creator" content="Paul Eggert" /> -<meta name="DC.Contributor" content="Arthur David Olson" /> -<meta name="DC.Date" content="2000/10/03" /> +<meta name="DC.Creator" content="Eggert, Paul" /> +<meta name="DC.Contributor" content="Olson, Arthur David" /> +<meta name="DC.Date" content="2001-05-30" /> <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" /> @@ -25,14 +25,14 @@ Please send corrections to this web page to the <a href="mailto:tz@elsie.nci.nih.gov">time zone mailing list</a>. </p> -<h2>The <samp>tz</samp> database</h2> +<h2>The <code>tz</code> database</h2> <p> The public-domain time zone database contains code and data that represent the history of local time for many representative locations around the globe. It is updated periodically to reflect changes made by political bodies to UTC offsets and daylight-saving rules. -This database (often called <samp>tz</samp> or <samp>zoneinfo</samp>) +This database (often called <code>tz</code> or <code>zoneinfo</code>) is used by several implementations, including <a href="http://www.linux.org/">GNU/Linux</a>, @@ -43,17 +43,30 @@ including <a href="http://unix.hp.com/operating/">HP-UX</a>, <a href="http://www.sgi.com/developers/technology/irix.html">IRIX</a>, <a href="http://www.sco.com/products/openserver/">SCO OpenServer</a>, -<a href="http://www.sun.com/solaris/">Solaris</a>, and -<a href="http://www.sco.com/unixware/">UnixWare</a>. -In the <samp>tz</samp> database's +<a href="http://www.sun.com/solaris/">Solaris</a>, +<a href="http://www.tru64unix.compaq.com/">Tru64</a>, and +<a href="http://www.sco.com/unixware/">UnixWare</a>.</p> +<p> +In the <code>tz</code> database's <a href="ftp://elsie.nci.nih.gov/pub/">FTP distribution</a>, -the code is in the file <samp>tzcode<var>C</var>.tar.gz</samp>, -where <samp><var>C</var></samp> is the code's version; -similarly, the data are in <samp>tzdata<var>D</var>.tar.gz</samp>, -where <samp><var>D</var></samp> is the data's version. -The code lets you compile the <samp>tz</samp> source files into +the code is in the file <code>tzcode<var>C</var>.tar.gz</code>, +where <code><var>C</var></code> is the code's version; +similarly, the data are in <code>tzdata<var>D</var>.tar.gz</code>, +where <code><var>D</var></code> is the data's version. +The following shell commands use <a +href="http://www.gnu.org/software/wget/">GNU wget</a> to download +these files to a GNU/Linux or similar host; see the downloaded +<code>README</code> file for what to do next.</p> +<pre style="margin-left: 2em"><code>mkdir tz +cd tz +wget 'ftp://elsie.nci.nih.gov/pub/tz*.tar.gz' +gzip -dc tzcode*.tar.gz | tar -xf - +gzip -dc tzdata*.tar.gz | tar -xf - +</code></pre> +<p> +The code lets you compile the <code>tz</code> source files into machine-readable binary files, one for each location. It also lets -you read a <samp>tz</samp> binary file and interpret time stamps for that +you read a <code>tz</code> binary file and interpret time stamps for that location.</p> <p> The data are by no means authoritative. If you find errors, please @@ -68,7 +81,7 @@ format).</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. </p> -<h2>Web pages using recent versions of the <samp>tz</samp> database</h2> +<h2>Web pages using recent versions of the <code>tz</code> database</h2> <ul> <li><a href="http://www.bsdi.com/date/">Date and Time Gateway</a> is a text-based point-and-click interface to tables of current time @@ -91,19 +104,19 @@ time zone converter</a> is a multilingua holidays.</li> <li><a href="http://www.timeanddate.com/worldclock/">The World Clock</a> is a web interface to a time zone database derived from -<samp>tz</samp>'s.</li> +<code>tz</code>'s.</li> </ul> -<h2>Other <samp>tz</samp> compilers</h2> +<h2>Other <code>tz</code> compilers</h2> <ul> <li><a href="http://www.karuna.freeserve.co.uk/vzic.tgz">Vzic</a> -compiles <samp>tz</samp> source into VTIMEZONE text as specified by +compiles <code>tz</code> source into VTIMEZONE text as specified by the <a href="ftp://ftp.isi.edu/in-notes/rfc2445.txt">iCalendar</a> specification published by the <a href="http://www.ietf.org/html.charters/calsch-charter.html">IETF Calendaring and Scheduling Working Group</a>. Vzic is freely available under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License (GPL)</a>.</li> -<li>Possible XML schemata for the <samp>tz</samp> data include <a +<li>Possible XML schemata for the <code>tz</code> data include <a href="http://www.w3.org/2000/01/foo">one</a> sketched out by <a href="http://www.w3.org/People/Berners-Lee/">Tim Berners-Lee</a> and <a @@ -112,27 +125,27 @@ used by the <a href="http://www.iplanet.com/products/iplanet_calendar/">iPlanet Calendar Server</a>.</li> </ul> -<h2>Other <samp>tz</samp> binary file readers</h2> +<h2>Other <code>tz</code> binary file readers</h2> <ul> <li>The <a href="http://www.gnu.org/software/libc/">GNU C Library</a> has an independent, thread-safe implementation of -a <samp>tz</samp> binary file reader. +a <code>tz</code> binary file reader. This library is freely available under the <a href="http://www.gnu.org/copyleft/lesser.html"> GNU Lesser General Public License (LGPL)</a>, and is widely used in GNU/Linux systems.</li> <li><a href="http://www.bmsi.com/java/#TZ">ZoneInfo.java</a> -is a <samp>tz</samp> binary file reader written in Java. +is a <code>tz</code> binary file reader written in Java. It is freely available under the GNU LGPL.</li> </ul> -<h2>Other <samp>tz</samp>-based time zone conversion software</h2> +<h2>Other <code>tz</code>-based time zone conversion software</h2> <ul> <li><a href="http://www1.tip.nl/~t876506/AboutTimeZonesHC.html">HyperCard time zones calculator</a> is a HyperCard stack.</li> <li><a -href="http://timezone50.homepage.com/">Time Zone Converter</a> is a -Microsoft Windows 95/98/NT4 program.</li> +href="http://www20.Brinkster.com/timezone50/">Time Zone Converter</a> is a +Microsoft Windows program.</li> </ul> <h2>Other time zone databases</h2> <ul> @@ -146,10 +159,12 @@ href="http://astrocom.com/">Astro Commun time info, public holidays</a> contains information on local time, sunrise and sunset, and public holidays in several hundred cities around the world.</li> +<li><a href="http://www.worldtimeserver.com/">World Time Server</a> +is another time zone database.</li> <li><a href="http://tycho.usno.navy.mil/tzones.html">World Time Zones</a> contains data from the Time Service Department of the US Naval Observatory (USNO), used as the source -for the <samp>usno*</samp> files in the <samp>tz</samp> distribution.</li> +for the <code>usno*</code> files in the <code>tz</code> distribution.</li> <li>The <a href="http://www.iata.org/">International Air Transport Association</a> publishes the <a href="http://www.iata.org/sked/ssim.htm">Standard @@ -166,7 +181,7 @@ zone map</a>; the <a href="http://www.lib.utexas.edu/Libs/PCL/Map_collection/world_maps.html"> Perry-Castañeda Library Map Collection</a> of the University of Texas at Austin has copies of -recent editions. +recent editions. The pictorial quality is good, but the maps do not indicate summer time, and parts of the data are a few years out of date.</li> @@ -175,9 +190,6 @@ current time</a> has several fancy time zone maps; it covers Russia particularly well. The maps' pictorial quality is not quite as good as the CIA's but the maps are more up to date.</li> -<li><a href="http://www.worldtimeserver.com/">World Time Server</a> -has a separate little outline map for each region of each country that -currently observes a different time.</li> </ul> <h2>Time zone boundaries</h2> <ul> @@ -210,15 +222,20 @@ time zone boundary.</li> <li>A few countries have well-documented histories of legal time. <dl> <dt>Australia</dt> -<dd>The Community Relations Division of the NSW Attorney General's -Department maintains a history of <a -href="http://www.lawlink.nsw.gov.au/crd.nsf/pages/time2">daylight -saving in New South Wales</a>.</dd> +<dd><a +href="http://www.dstc.qut.edu.au/DST/marg/daylight.html#more">Australia's +Daylight Saving Times</a> contains pointers to government records and to +histories of daylight saving.</dd> <dt>Brazil</dt> <dd>The Time Service Department of the National Observatory 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 +and some older information about <a +href="http://www.nrc.ca/inms/time/tze.html">Time Zones and Daylight +Saving Time</a>.</dd> <dt>Germany</dt> <dd>The National Institute for Science and Technology maintains the <a href="http://www.ptb.de/english/org/4/43/432/lega.htm">Realisation of @@ -234,7 +251,7 @@ href="http://www.cddhcu.gob.mx/bibliot/p hreflang="es">history of Mexican local time (in Spanish)</a>.</dd> <dt>Netherlands</dt> <dd><a href="http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm" -hreflang="nl">De wettelijke tijdregeling in Nederland (in Dutch)</a> +hreflang="nl">Legal time in the Netherlands (in Dutch)</a> covers the history of local time in the Netherlands from ancient times.</dd> <dt>United Kingdom</dt> <dd><a @@ -259,22 +276,28 @@ answers questions like "What is the diff href="http://sadira.gb.nrao.edu/~rfisher/Ephemerides/times.html">Astronomical Times</a> explains more abstruse astronomical time scales like TT, TCG, and TDB.</li> +<li>The <a href="http://www.iau.org/">IAU</a>'s <a +href="http://www.iau-sofa.rl.ac.uk/">Standards Of Fundamental +Astronomy</a> (SOFA) initiative publishes Fortran code for converting +among time scales like TAI, TDB, TT and UTC.</li> <li><a href="http://www.jpl.nasa.gov/basics/bsf2-3.htm">Basics of Space Flight - Reference Systems - Time Conventions</a> briefly explains interplanetary space flight timekeeping.</li> -<li><a href="http://hpiers.obspm.fr/webiers/results/bul/README.html">Bulletins -of IERS</a> contains official publications of the +<li><a +href="http://hpiers.obspm.fr/eop-pc/products/bulletins.html">Bulletins +maintained by the IERS EOP (PC)</a> contains official publications of +the Earth Orientation Parameters Product Center of the International Earth Rotation Service, the committee that decides when leap seconds occur.</li> <li>The <a href="http://clockdev.usno.navy.mil/archives/leapsecs.html">Leap Second Discussion List</a> covers <a href="http://clockdev.usno.navy.mil/cgi-bin/wa.exe?A3=ind00&L=leapsecs&P=…">McCarthy -and Klepczynski's proposal to remove leap seconds</a> +and Klepczynski's proposal to discontinue leap seconds</a> (which requires discussion list membership to read). This proposal is being studied by the URSI Commission J <a href="http://space.mit.edu/URSI/leapsecond.html">Working Group on the -Leap Second</a>, and the <a href="http://www.iau.org/">IAU</a> +Leap Second</a>, and the IAU has plans to report on this proposal by 2003.</li> </ul> <h2>Time notation</h2> @@ -284,7 +307,18 @@ has plans to report on this proposal by the International Standard Date and Time Notation</a> is a good summary of <a href="http://www.iso.ch/markete/8601.pdf">ISO 8601:1988 - Data elements and interchange formats - Information interchange -- Representation of dates and times</a>.</li> +- Representation of dates and times</a> (which has been superseded by +<a href="http://www.iso.ch/cate/d26780.html">ISO 8601:2000</a>).</li> +<li> +Section 3.3 of <a +href="ftp://ftp.isi.edu/in-notes/rfc2822.txt">Internet RFC 2822</a> +specifies the time notation used in email and <a +href="ftp://ftp.isi.edu/in-notes/rfc2616.txt">HTTP</a> headers.</li> +<li> +<a +href="ftp://ftp.isi.edu/internet-drafts/draft-ietf-impp-datetime-03.txt">Date +and Time on the Internet: Timestamps</a> proposes an ISO 8601 profile +for use in new Internet protocols.</li> </ul> <h2>Related indexes</h2> <ul> =================================================================== RCS file: RCS/Makefile,v retrieving revision 2001.2 retrieving revision 2001.2.0.1 diff -pu -r2001.2 -r2001.2.0.1 --- Makefile 2001/04/05 20:43:41 2001.2 +++ Makefile 2001/05/31 00:59:05 2001.2.0.1 @@ -86,6 +86,7 @@ YEARISTYPE= ./yearistype LDLIBS= # Add the following to the end of the "CFLAGS=" line as needed. +# -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc) # -DHAVE_ADJTIME=0 if `adjtime' does not exist (SVR0?) # -DHAVE_GETTEXT=1 if `gettext' works (GNU, Linux, Solaris); also see LDLIBS # -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares @@ -97,6 +98,7 @@ LDLIBS= # -DHAVE_SETTIMEOFDAY=3 if settimeofday ignores 2nd arg (4.4BSD) # -DHAVE_STRERROR=0 if your system lacks the strerror function # -DHAVE_SYMLINK=0 if your system lacks the symlink function +# -DHAVE_SYS_STAT_H=0 if your compiler lacks a "sys/stat.h" # -DHAVE_SYS_WAIT_H=0 if your compiler lacks a "sys/wait.h" # -DLOCALE_HOME=\"path\" if locales are in "path", not "/usr/lib/locale" # -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?) =================================================================== RCS file: RCS/private.h,v retrieving revision 2000.5 retrieving revision 2000.5.0.1 diff -pu -r2000.5 -r2000.5.0.1 --- private.h 2000/07/31 13:27:54 2000.5 +++ private.h 2001/05/31 00:59:05 2000.5.0.1 @@ -54,6 +54,10 @@ static char privatehid[] = "@(#)private. #define HAVE_SYMLINK 1 #endif /* !defined HAVE_SYMLINK */ +#ifndef HAVE_SYS_STAT_H +#define HAVE_SYS_STAT_H 1 +#endif /* !defined HAVE_SYS_STAT_H */ + #ifndef HAVE_SYS_WAIT_H #define HAVE_SYS_WAIT_H 1 #endif /* !defined HAVE_SYS_WAIT_H */ @@ -123,16 +127,6 @@ static char privatehid[] = "@(#)private. */ /* -** SunOS 4.1.1 cc lacks const. -*/ - -#ifndef const -#ifndef __STDC__ -#define const -#endif /* !defined __STDC__ */ -#endif /* !defined const */ - -/* ** SunOS 4.1.1 cc lacks prototypes. */ =================================================================== RCS file: RCS/zic.c,v retrieving revision 2000.6 retrieving revision 2000.6.0.1 diff -pu -r2000.6 -r2000.6.0.1 --- zic.c 2000/08/10 13:31:47 2000.6 +++ zic.c 2001/05/31 00:59:05 2000.6.0.1 @@ -7,9 +7,15 @@ static char elsieid[] = "@(#)zic.c 7.101 #include "private.h" #include "locale.h" #include "tzfile.h" -#ifdef unix -#include "sys/stat.h" /* for umask manifest constants */ -#endif /* defined unix */ + +#if HAVE_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) +#else +#define MKDIR_UMASK 0755 +#endif /* ** On some ancient hosts, predicates like `isspace(C)' are defined @@ -613,7 +619,7 @@ const char * const tofile; (void) exit(EXIT_FAILURE); result = link(fromname, toname); -#if (HAVE_SYMLINK - 0) +#if (HAVE_SYMLINK - 0) if (result != 0) { const char *s = tofile; register char * symlinkcontents = NULL; @@ -2187,7 +2193,7 @@ char * const argname; ** created by some other multiprocessor, so we get ** to do extra checking. */ - if (mkdir(name, S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) != 0) { + if (mkdir(name, MKDIR_UMASK) != 0) { const char *e = strerror(errno); if (errno != EEXIST || !itsdir(name)) { =================================================================== RCS file: RCS/africa,v retrieving revision 2000.7 retrieving revision 2000.7.0.1 diff -pu -r2000.7 -r2000.7.0.1 --- africa 2000/10/10 15:35:14 2000.7 +++ africa 2001/05/31 00:59:05 2000.7.0.1 @@ -481,6 +481,12 @@ Zone Africa/Dakar -1:09:44 - LMT 1912 # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Indian/Mahe 3:41:48 - LMT 1906 Jun # Victoria 4:00 - SCT # Seychelles Time +# From Paul Eggert (2001-05-30): +# Aldabra, Farquhar, and Desroches, originally dependencies of the +# Seychelles, were transferred to the British Indian Ocean Territory +# in 1965 and returned to Seychelles control in 1976. We don't know +# whether this affected their time zone, so omit this for now. +# Possibly the islands were uninhabited. # Sierra Leone # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S =================================================================== RCS file: RCS/antarctica,v retrieving revision 2001.2 retrieving revision 2001.2.0.1 diff -pu -r2001.2 -r2001.2.0.1 --- antarctica 2001/04/05 20:43:40 2001.2 +++ antarctica 2001/05/31 00:59:05 2001.2.0.1 @@ -39,8 +39,8 @@ Rule ArgAQ 1974 only - Jan 23 0:00 1:00 Rule ArgAQ 1974 only - May 1 0:00 0 - Rule ArgAQ 1974 1976 - Oct Sun<=7 0:00 1:00 S Rule ArgAQ 1975 1977 - Apr Sun<=7 0:00 0 - -Rule ChileAQ 1969 1997 - Oct Sun>=9 0:00 1:00 S -Rule ChileAQ 1970 1998 - Mar Sun>=9 0:00 0 - +Rule ChileAQ 1966 1997 - Oct Sun>=9 0:00 1:00 S +Rule ChileAQ 1967 1998 - Mar Sun>=9 0:00 0 - Rule ChileAQ 1998 only - Sep 27 0:00 1:00 S Rule ChileAQ 1999 only - Apr 4 0:00 0 - Rule ChileAQ 1999 max - Oct Sun>=9 0:00 1:00 S @@ -92,11 +92,13 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb # Brazil - year-round base # Ferraz, King George Island, since 1983/4 -# Chile - year-round bases +# Chile - year-round bases and towns # Escudero, South Shetland Is, -621157-0585735, since 1994 -# Frei, King George Is, -6214-05848, since 1969 +# Frei, King George Island, -6214-05848, since 1969-03-07 # O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02 # Prat, -6230-05941 +# Villa Las Estrellas (a town), King George Island, since 1984-04-09 +# These locations have always used Santiago time; use TZ='America/Santiago'. # China - year-round bases # Great Wall, King George Island, since 1985-02-20 @@ -219,6 +221,15 @@ Rule NZAQ 1990 max - Mar Sun>=15 2:00s 0 # of GMT). This is a time zone I think two hours east of Moscow. The # natural time zone is in between the two: 8 hours ahead of GMT.'' # +# From Paul Eggert (2001-05-04): +# This seems to be hopelessly confusing, so I asked Lee Hotz about it +# in person. He said that some Antartic locations set their local +# time so that noon is the warmest part of the day, and that this +# changes during the year and does not necessarily correspond to mean +# solar noon. So the Vostok time might have been whatever the clocks +# happened to be during their visit. So we still don't really know what time +# it is at Vostok. But we'll guess UTC+6. +# Zone Antarctica/Vostok 0 - zzz 1957 Dec 16 6:00 - VOST # Vostok time =================================================================== RCS file: RCS/asia,v retrieving revision 2001.2 retrieving revision 2001.2.0.1 diff -pu -r2001.2 -r2001.2.0.1 --- asia 2001/04/05 20:43:40 2001.2 +++ asia 2001/05/31 00:59:05 2001.2.0.1 @@ -37,8 +37,11 @@ # 4:00 GST Gulf* # 5:30 IST India # 7:00 ICT Indochina* +# 7:00 WIT west Indonesia +# 8:00 CIT central Indonesia # 8:00 CST China # 9:00 CJT Central Japanese Time (1896/1937)* +# 9:00 EIT east Indonesia # 9:00 JST Japan # 9:00 KST Korea # 9:30 CST (Australian) Central Standard Time @@ -131,9 +134,11 @@ Zone Asia/Thimphu 5:58:36 - LMT 1947 Aug 6:00 - BTT # Bhutan Time # British Indian Ocean Territory -# From Whitman: +# Whitman and the 1995 CIA time zone map say 5:00, but the +# 1997 and later maps say 6:00. Assume the switch occurred in 1996. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Chagos 5:00 - IOT # BIOT Time +Zone Indian/Chagos 5:00 - IOT 1996 # BIOT Time + 6:00 - IOT # Brunei # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -357,7 +362,7 @@ Zone Asia/Dili 8:22:20 - LMT 1912 8:00 - TPT 1942 Feb 21 23:00 # E Timor Time 9:00 - JST 1945 Aug 9:00 - TPT 1976 May 3 - 8:00 - TPT 2000 Sep 17 00:00 + 8:00 - CIT 2000 Sep 17 00:00 9:00 - TPT # India @@ -374,27 +379,43 @@ Zone Asia/Calcutta 5:53:28 - LMT 1880 # Nicobar Is # Indonesia +# +# From Gwillim Law (2001-05-28), overriding Shanks: +# <http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime> +# says that Indonesia's time zones changed on 1988-01-01. Looking at some +# time zone maps, I think that must refer to Western Borneo (Kalimantan Barat +# and Kalimantan Tengah) switching from UTC+8 to UTC+7. +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug 10 # Shanks says the next transition was at 1924 Jan 1 0:13, # but this must be a typo. 7:07:12 - JMT 1923 Dec 31 23:47:12 # Jakarta 7:20 - JAVT 1932 Nov # Java Time - 7:30 - JAVT 1942 Mar 23 + 7:30 - WIT 1942 Mar 23 9:00 - JST 1945 Aug - 7:30 - JAVT 1948 May - 8:00 - JAVT 1950 May - 7:30 - JAVT 1964 - 7:00 - JAVT + 7:30 - WIT 1948 May + 8:00 - WIT 1950 May + 7:30 - WIT 1964 + 7:00 - WIT +Zone Asia/Pontianak 7:17:20 - LMT 1908 May + 7:17:20 - PMT 1932 Nov # Pontianak MT + 7:30 - WIT 1942 Jan 29 + 9:00 - JST 1945 Aug + 7:30 - WIT 1948 May + 8:00 - WIT 1950 May + 7:30 - WIT 1964 + 8:00 - CIT 1988 Jan 1 + 7:00 - WIT Zone Asia/Ujung_Pandang 7:57:36 - LMT 1920 7:57:36 - MMT 1932 Nov # Macassar MT - 8:00 - BORT 1942 Feb 9 # Borneo Time + 8:00 - CIT 1942 Feb 9 9:00 - JST 1945 Aug - 8:00 - BORT + 8:00 - CIT Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov - 9:00 - JAYT 1944 # Jayapura Time + 9:00 - EIT 1944 9:30 - CST 1964 - 9:00 - JAYT + 9:00 - EIT # Iran # From Paul Eggert (2000-06-12), following up a suggestion by Rich Wales: @@ -960,38 +981,52 @@ Zone Indian/Maldives 4:54:00 - LMT 1880 # Suhbaatar, and possibly Khentij. # From Paul Eggert (1999-12-15): -# For now, we'll comment out the east zone (Choybalsan) -# and use Shanks's and the IATA's data for the daylight-saving rules. # Naming and spelling is tricky in Mongolia. # We'll use Hovd (also spelled Chovd and Khovd) to represent the west zone; # the capital of the Hovd province is sometimes called Hovd, sometimes Dund-Us, # and sometimes Jirgalanta (with variant spellings), but the name Hovd # is good enough for our purposes. -# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Mongol 1981 1984 - Apr 1 0:00 1:00 S -Rule Mongol 1981 1984 - Oct 1 0:00 0 - -Rule Mongol 1985 1990 - Mar lastSun 2:00 1:00 S -Rule Mongol 1985 1990 - Sep lastSun 3:00 0 - -Rule Mongol 1991 1998 - Mar lastSun 0:00 1:00 S -Rule Mongol 1991 1995 - Sep lastSun 0:00 0 - -# IATA SSIM (1996-09) says 1996-10-25; go with Shanks. -Rule Mongol 1996 only - Oct lastSun 0:00 0 - -Rule Mongol 1997 1998 - Sep lastSun 0:00 0 - +# From Rives McDow (2001-05-13): +# In addition to Mongolia starting daylight savings as reported earlier +# (adopted DST on 2001-04-27 02:00 local time, ending 2001-09-28), +# there are three time zones. +# +# Provinces [at 7:00]: Bayan-ulgii, Uvs, Khovd, Zavkhan, Govi-Altai +# Provinces [at 8:00]: Khovsgol, Bulgan, Arkhangai, Khentii, Tov, +# Bayankhongor, Ovorkhangai, Dundgovi, Dornogovi, Omnogovi +# Provinces [at 9:00]: Dornod, Sukhbaatar +# +# [The province of Selenge is omitted from the above lists.] + +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule Mongol 1983 1984 - Apr 1 0:00 1:00 S +Rule Mongol 1983 only - Oct 1 0:00 0 - +# IATA SSIM says 1990s switches occurred at 00:00, but Shanks (1995) lists +# them at 02:00s, and McDow says the 2001 switches also occurred at 02:00. +# Also, IATA SSIM (1996-09) says 1996-10-25. Go with Shanks through 1998. +Rule Mongol 1985 1998 - Mar lastSun 2:00s 1:00 S +Rule Mongol 1984 1998 - Sep lastSun 2:00s 0 - # IATA SSIM (1999-09) says Mongolia no longer observes DST. +Rule Mongol 2001 only - Apr 27 2:00s 1:00 S +Rule Mongol 2001 only - Sep 28 2:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] +# Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta Zone Asia/Hovd 6:06:36 - LMT 1905 Aug 6:00 - HOVT 1978 # Hovd Time 7:00 Mongol HOV%sT +# Ulaanbaatar, a.k.a. Ulan Bataar, Ulan Bator, Urga Zone Asia/Ulaanbaatar 7:07:32 - LMT 1905 Aug 7:00 - ULAT 1978 # Ulaanbaatar Time 8:00 Mongol ULA%sT -# We're not sure about this entry yet, so we'll omit it for now. -#Zone Asia/Choybalsan 7:38:00 - LMT 1905 Aug -# 8:00 - CHOT 1978 # Choybalsan Time -# 9:00 Mongol CHO%sT 19?? -# 8:00 Mongol ULA%sT +# Choibalsan, a.k.a. Bajan Tuemen, Bajan Tumen, Chojbalsan, +# Choybalsan, Sanbejse, Tchoibalsan +# We're still not sure about this data, so we'll omit it for now. +#Zone Asia/Choibalsan 7:38:00 - LMT 1905 Aug +# 7:00 - ULAT 1978 +# 8:00 Mongol ULA%sT 1983 Apr +# 9:00 Mongol CHO%sT # Choibalsan Time # Nepal # Zone NAME GMTOFF RULES FORMAT [UNTIL] =================================================================== RCS file: RCS/europe,v retrieving revision 2001.2 retrieving revision 2001.2.0.1 diff -pu -r2001.2 -r2001.2.0.1 --- europe 2001/04/05 20:43:41 2001.2 +++ europe 2001/05/31 00:59:05 2001.2.0.1 @@ -41,7 +41,10 @@ # 0:00 GMT BST Greenwich, British Summer # 0:00 GMT IST Greenwich, Irish Summer # 0:00 WET WEST Western Europe +# 0:19:32 AMT NST Amsterdam, Netherlands Summer (1835-1937)* +# 0:20 NET NEST Netherlands (1937-1940)* # 1:00 CET CEST Central Europe +# 1:00:14 SET Swedish (1879-1899)* # 2:00 EET EEST Eastern Europe # 3:00 MSK MSD Moscow # @@ -1371,22 +1374,59 @@ Zone Europe/Monaco 0:29:32 - LMT 1891 Ma 1:00 EU CE%sT # Netherlands + # Howse writes that the Netherlands' railways used GMT between 1892 and 1940, # but for other purposes the Netherlands used Amsterdam mean time. -# The data before 1945 is taken from + +# However, Robert H. van Gent writes (2001-04-01): +# Howse's statement is only correct up to 1909. From 1909-05-01 (00:00:00 +# Amsterdam mean time) onwards, the whole of the Netherlands (including +# the Dutch railways) was required by law to observe Amsterdam mean time +# (19 minutes 32.13 seconds ahead of GMT). This had already been the +# common practice (except for the railways) for many decades but it was +# not until 1909 when the Dutch government finally defined this by law. +# On 1937-07-01 this was changed to 20 minutes (exactly) ahead of GMT and +# was generally known as Dutch Time ("Nederlandse Tijd"). +# +# (2001-04-08): +# 1892-05-01 was the date when the Dutch railways were by law required to +# observe GMT while the remainder of the Netherlands adhered to the common +# practice of following Amsterdam mean time. +# +# (2001-04-09): +# In 1835 the authorities of the province of North Holland requested the +# municipal authorities of the towns and cities in the province to observe +# Amsterdam mean time but I do not know in how many cases this request was +# actually followed. +# +# From 1852 onwards the Dutch telegraph offices were by law required to +# observe Amsterdam mean time. As the time signals from the observatory of +# Leiden were also distributed by the telegraph system, I assume that most +# places linked up with the telegraph (and railway) system automatically +# adopted Amsterdam mean time. +# +# Although the early Dutch railway companies initially observed a variety +# of times, most of them had adopted Amsterdam mean time by 1858 but it +# was not until 1866 when they were all required by law to observe +# Amsterdam mean time. + +# The data before 1945 are taken from # <http://www.phys.uu.nl/~vgent/wettijd/wettijd.htm>. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Neth 1916 only - May 1 0:00 1:00 NST # Netherlands Summer Time Rule Neth 1916 only - Oct 1 0:00 0 AMT # Amsterdam Mean Time Rule Neth 1917 only - Apr 16 2:00s 1:00 NST Rule Neth 1917 only - Sep 17 2:00s 0 AMT Rule Neth 1918 1921 - Apr Mon>=1 2:00s 1:00 NST -Rule Neth 1918 1921 - Sep lastSun 2:00s 0 AMT +Rule Neth 1918 1921 - Sep lastMon 2:00s 0 AMT Rule Neth 1922 only - Mar lastSun 2:00s 1:00 NST Rule Neth 1922 1936 - Oct Sun>=2 2:00s 0 AMT Rule Neth 1923 only - Jun Fri>=1 2:00s 1:00 NST Rule Neth 1924 only - Mar lastSun 2:00s 1:00 NST Rule Neth 1925 only - Jun Fri>=1 2:00s 1:00 NST +# From 1926 through 1939 DST began 05-15, except that it was delayed by a week +# in years when 05-15 fell in the Pentecost weekend. Rule Neth 1926 1931 - May 15 2:00s 1:00 NST Rule Neth 1932 only - May 22 2:00s 1:00 NST Rule Neth 1933 1936 - May 15 2:00s 1:00 NST @@ -1396,10 +1436,13 @@ Rule Neth 1937 1939 - Oct Sun>=2 2:00s 0 Rule Neth 1938 1939 - May 15 2:00s 1:00 S Rule Neth 1945 only - Apr 2 2:00s 1:00 S Rule Neth 1945 only - Sep 16 2:00s 0 - +# +# Amsterdam Mean Time was +00:19:32.13 exactly, but the .13 is omitted +# below because the current format requires GMTOFF to be an integer. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Europe/Amsterdam 0:19:28 - LMT 1892 May - 0:19:28 Neth %s 1937 Jul - 0:20 Neth NE%sT 1940 May 17 0:00 +Zone Europe/Amsterdam 0:19:32 - LMT 1835 + 0:19:32 Neth %s 1937 Jul 1 + 0:20 Neth NE%sT 1940 May 17 0:00 # Dutch Time 1:00 C-Eur CE%sT 1945 Apr 2 2:00 1:00 Neth CE%sT 1977 1:00 EU CE%sT @@ -1417,17 +1460,62 @@ Rule Norway 1959 1964 - Mar Sun>=15 2:00 Rule Norway 1959 1965 - Sep Sun>=15 2:00s 0 - Rule Norway 1965 only - Apr 25 2:00s 1:00 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Europe/Oslo 0:43:00 - LMT 1895 +Zone Europe/Oslo 0:43:00 - LMT 1895 Jan 1 1:00 Norway CE%sT 1940 Aug 10 23:00 1:00 C-Eur CE%sT 1945 Apr 2 2:00 1:00 Norway CE%sT 1980 1:00 EU CE%sT # Svalbard & Jan Mayen + +# From Steffen Thorsen (2001-05-01): +# Although I could not find it explicitly, it seems that Jan Mayen and +# Svalbard have been using the same time as Norway at least since the +# time they were declared as parts of Norway. Svalbard was declared +# as a part of Norway by law of 1925-07-17 no 11, section 4 and Jan +# Mayen by law of 1930-02-27 no 2, section 2. (From +# http://www.lovdata.no/all/nl-19250717-011.html and +# http://www.lovdata.no/all/nl-19300227-002.html) The law/regulation +# for normal/standard time in Norway is from 1894-06-29 no 1 (came +# into operation on 1895-01-01) and Svalbard/Jan Mayen seem to be a +# part of this law since 1925/1930. (From +# http://www.lovdata.no/all/nl-18940629-001.html ) I have not been +# able to find if Jan Mayen used a different time zone (e.g. -0100) +# before 1930. Jan Mayen has only been "inhabitated" since 1921 by +# Norwegian meteorologists and maybe used the same time as Norway ever +# since 1921. Svalbard (Arctic/Longyearbyen) has been inhabited since +# before 1895, and therefore probably changed the local time somewhere +# between 1895 and 1925 (inclusive). + +# From Paul Eggert (2001-05-01): +# +# Actually, Jan Mayen was never occupied by Germany during World War II, +# so it must have diverged from Oslo time during the war, as Olso was +# keeping Berlin time. +# +# <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 +# radiolocating station on the island, called "Atlantic City". Possibly +# the UTC offset changed during the war, but I think it unlikely that +# Jan Mayen used German daylight-saving rules. +# +# Svalbard is more complicated, as it was raided in August 1941 by an +# Allied party that evacuated the civilian population to England (says +# <http://www.bartleby.com/65/sv/Svalbard.html>). The Svalbard FAQ +# <http://www.svalbard.com/SvalbardFAQ.html> says that the Germans were +# expelled on 1942-05-14. However, small parties of Germans did return, +# and according to Wilhelm Dege's book "War North of 80" (1954) +# <http://www.utpress.utoronto.ca/publishing/rights/dege_warnorthof80.htm> +# the German armed forces at the Svalbard weather station code-named +# Haudegen did not surrender to the Allies until September 1945. +# +# All these events predate our cutoff date of 1970. Unless we can +# come up with more definitive info about the timekeeping during the +# war years it's probably best just do do the following for now: Link Europe/Oslo Arctic/Longyearbyen -# From Whitman: -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Atlantic/Jan_Mayen -1:00 - EGT +Link Europe/Oslo Atlantic/Jan_Mayen # Poland # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -1638,7 +1726,7 @@ Zone Europe/Bucharest 1:44:24 - LMT 1891 # enforcing curfew at the wrong time. # # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Europe/Kaliningrad 1:22:00 - LMT 1893 Apr +Zone Europe/Kaliningrad 1:22:00 - LMT 1893 Apr 1:00 C-Eur CE%sT 1945 2:00 Poland CE%sT 1946 3:00 Russia MSK/MSD 1991 Mar 31 2:00s @@ -1795,11 +1883,56 @@ Zone Atlantic/Canary -1:01:36 - LMT 1922 # Ignore this for now, as the Canaries are part of the EU. # Sweden -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Europe/Stockholm 1:12:12 - LMT 1878 May 31 - 1:12:12 - SMT 1900 Jan 1 1:00 # Stockholm MT - 1:00 - CET 1916 Apr 14 23:00s - 1:00 1:00 CEST 1916 Sep 30 23:00s + +# From Ivan Nilsson (2001-04-13), superseding Shanks: +# +# The law "Svensk forfattningssamling 1878, no 14" about standard time in 1879: +# From the beginning of 1879 (that is 01-01 00:00) the time for all +# places in the country is "the mean solar time for the meridian at +# three degrees, or twelve minutes of time, to the west of the +# meridian of the Observatory of Stockholm". The law is dated 1878-05-31. +# +# The observatory at that time had the meridian 18 degrees 03' 30" +# eastern longitude = 01:12:14 in time. Less 12 minutes gives the +# national standard time as 01:00:14 ahead of GMT.... +# +# About the beginning of CET in Sweden. The lawtext ("Svensk +# forfattningssamling 1899, no 44") states, that "from the beginning +# of 1900... ... the same as the mean solar time for the meridian at +# the distance of one hour of time from the meridian of the English +# observatory at Greenwich, or at 12 minutes 14 seconds to the west +# from the meridian of the Observatory of Stockholm". The law is dated +# 1899-06-16. In short: At 1900-01-01 00:00:00 the new standard time +# in Sweden is 01:00:00 ahead of GMT. +# +# 1916: The lawtext ("Svensk forfattningssamling 1916, no 124") states +# that "1916-05-15 is considered to begin one hour earlier". It is +# pretty obvious that at 05-14 23:00 the clocks are set to 05-15 00:00.... +# Further the law says, that "1916-09-30 is considered to end one hour later". +# +# The laws regulating [DST] are available on the site of the Swedish +# Parliament beginning with 1985 - the laws regulating 1980/1984 are +# not available on the site (to my knowledge they are only available +# in Swedish): <http://www.riksdagen.se/english/work/sfst.asp> (type +# "sommartid" without the quotes in the field "Fritext" and then click +# the Sok-button). +# +# (2001-05-13): +# +# I have now found a newspaper stating that at 1916-10-01 01:00 +# summertime the church-clocks etc were set back one hour to show +# 1916-10-01 00:00 standard time. The article also reports that some +# people thought the switch to standard time would take place already +# at 1916-10-01 00:00 summer time, but they had to wait for another +# hour before the event took place. +# +# Source: The newspaper "Dagens Nyheter", 1916-10-01, page 7 upper left. + +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Europe/Stockholm 1:12:12 - LMT 1879 Jan 1 + 1:00:14 - SET 1900 Jan 1 # Swedish Time + 1:00 - CET 1916 May 14 23:00 + 1:00 1:00 CEST 1916 Oct 1 01:00 1:00 - CET 1980 1:00 EU CE%sT =================================================================== RCS file: RCS/northamerica,v retrieving revision 2001.2 retrieving revision 2001.2.0.1 diff -pu -r2001.2 -r2001.2.0.1 --- northamerica 2001/04/05 20:44:38 2001.2 +++ northamerica 2001/05/31 00:59:05 2001.2.0.1 @@ -81,12 +81,12 @@ # From Joseph Gallant <notquite(a)hotmail.com>, citing # George H. Douglas, _The Early Days of Radio Broadcasting_ (1987): # At 7 P.M. (Eastern War Time) [on 1945-08-14], the networks were set -# to switch to London for Atlee's address, but the American people +# to switch to London for Attlee's address, but the American people # never got to hear his speech live. According to one press account, # CBS' Bob Trout was first to announce the word of Japan's surrender, # but a few seconds later, NBC, ABC and Mutual also flashed the word # of surrender, all of whom interrupting the bells of Big Ben in -# London which were to precede Mr. Atlee's speech. +# London which were to precede Mr. Attlee's speech. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule US 1918 1919 - Mar lastSun 2:00 1:00 D @@ -185,13 +185,6 @@ Rule US 1987 max - Apr Sun>=1 2:00 1:00 # "Chamorro Standard Time" for time in Guam and the Northern Marianas. # See the file "australasia". -# From Ryan Alessi of the Thousand Oaks Star (2001-02-15) via Rives McDow: -# Brad Sherman, D-Sherman Oaks, introduced a bill in Congress on -# Wednesday that could have California operating on Denver time as -# early as this summer.... The options include keeping -# daylight-saving time all year long, or setting clocks back two hours -# -- instead of just one -- during the existing daylight-saving time. - # US Eastern time, represented by New York @@ -280,7 +273,7 @@ Zone America/Los_Angeles -7:52:58 - LMT # Alaska # AK%sT is the modern abbreviation for -9:00 per USNO. # -# From Paul Eggert (2001-04-01): +# From Paul Eggert (2001-05-30): # Howse writes that Alaska switched from the Julian to the Gregorian calendar, # and from east-of-GMT to west-of-GMT days, when the US bought it from Russia. # This was on 1867-10-18, a Friday; the previous day was 1867-10-06 Julian, @@ -288,6 +281,13 @@ Zone America/Los_Angeles -7:52:58 - LMT # ignoring the switch from Julian to Gregorian, since we can't represent # the Julian calendar. # +# As far as we know, none of the exact locations mentioned below were +# permanently inhabited in 1867 by anyone using either calendar. +# (Yakutat was colonized by the Russians in 1799, but the settlement +# was destroyed in 1805 by a Yakutat-kon war party.) However, there +# were nearby inhabitants in some cases and for our purposes perhaps +# it's best to simply use the official transition. +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Juneau 15:02:19 - LMT 1867 Oct 18 -8:57:41 - LMT 1900 Aug 20 12:00 @@ -407,7 +407,7 @@ Zone America/Boise -7:44:49 - LMT 1883 N # Pam Belluck reported in the New York Times (2001-01-31) that the # Indiana Legislature is considering a bill to adopt DST statewide. # Her article mentioned Vevay, whose post office observes a different -# time zone than Danner's Hardware across the street. +# time zone from Danner's Hardware across the street. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D @@ -589,10 +589,11 @@ Zone America/Menominee -5:50:27 - LMT 18 -6:00 US C%sT # Navassa +# administered by the US Fish and Wildlife Service # claimed by US under the provisions of the 1856 Guano Islands Act # also claimed by Haiti # occupied 1857/1900 by the Navassa Phosphate Co -# US lighthouse 1917/1997-01 +# US lighthouse 1917/1996-09 # currently uninhabited # see Mark Fineman, ``An Isle Rich in Guano and Discord'', # _Los Angeles Times_ (1998-11-10), A1, A10; it cites =================================================================== RCS file: RCS/southamerica,v retrieving revision 2001.1 retrieving revision 2001.1.0.1 diff -pu -r2001.1 -r2001.1.0.1 --- southamerica 2001/03/13 17:57:40 2001.1 +++ southamerica 2001/05/31 00:59:05 2001.1.0.1 @@ -493,16 +493,26 @@ Zone America/Rio_Branco -4:31:12 - LMT 1 # Because of the same drought, the government decided to end DST later, # on April 3, (one-time change). -# From Gwillim Law (2001-02-20): -# I came across a Chilean on-line newspaper, La Tercera. Its -# <a href="http://www.tercera.cl/diario/1998/03/13/extras.html"> -# 1998-03-13 issue -# </a>, says (my translation): -# "At 24:00 (midnight) tomorrow (Saturday) - 22:00 in the insular -# territory [Easter Island, Juan Fernandez, etc.] - winter time will -# begin in the entire country." +# From Gwillim Law (2001-05-04): +# I came across another article in "La Tercera" about Chilean DST. +# <http://www.tercera.cl/diario/2000/10/13/t-extras.html> +# It clearly confirms my earlier suggestion, that DST begins at 22:00 +# on Easter Island.... But it also seems to be saying that the +# observance of DST in Chile began in 1966, rather than 1969 as +# ... [Shanks] has it.... +# +# My translation: +# +# "The Chilean Army has announced that summer time will begin tomorrow, +# Saturday, October 14 in continental Chile, insular Chile, and +# Antarctica, as provided by Supreme Decree 25 of January 11, 1966. +# By the preceding, official time in continental Chile and Chilean +# Antarctic, and official time in Western Insular Chile, which applies +# to Easter Island and Sala y Gomez Island, will be set forward at +# midnight and at 22:00, respectively, by 20 minutes." -# From Paul Eggert (2001-02-21): +# From Paul Eggert (2001-05-04): +# Go with this article in preference to Shanks's 1969 date for modern DST. # Assume this rule has been used since DST was introduced in the islands. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -510,8 +520,8 @@ Rule Chile 1918 only - Sep 1 0:00 1:00 Rule Chile 1919 only - Jul 2 0:00 0 - Rule Chile 1927 1931 - Sep 1 0:00 1:00 S Rule Chile 1928 1932 - Apr 1 0:00 0 - -Rule Chile 1969 1997 - Oct Sun>=9 4:00u 1:00 S -Rule Chile 1970 1998 - Mar Sun>=9 3:00u 0 - +Rule Chile 1966 1997 - Oct Sun>=9 4:00u 1:00 S +Rule Chile 1967 1998 - Mar Sun>=9 3:00u 0 - Rule Chile 1998 only - Sep 27 4:00u 1:00 S Rule Chile 1999 only - Apr 4 3:00u 0 - Rule Chile 1999 max - Oct Sun>=9 4:00u 1:00 S @@ -528,10 +538,9 @@ Zone Pacific/Easter -7:17:28 - LMT 1890 -7:00 Chile EAS%sT 1982 Mar 14 # Easter I Time -6:00 Chile EAS%sT # -# Whitman says Juan Fernandez Is are like America/Santiago. -# San Ambrosio, San Felix -# no information; probably like America/Santiago - +# Sala y Gomez Island is like Pacific/Easter. +# Other Chilean locations, including Juan Fernandez Is, San Ambrosio, +# San Felix, and Antarctic bases, are like America/Santiago. # Colombia # Shanks specifies 24:00 for 1992 transition times; go with IATA, =================================================================== RCS file: RCS/zone.tab,v retrieving revision 2001.1 retrieving revision 2001.1.0.1 diff -pu -r2001.1 -r2001.1.0.1 --- zone.tab 2001/03/13 17:57:42 2001.1 +++ zone.tab 2001/05/31 00:59:05 2001.1.0.1 @@ -12,7 +12,7 @@ # first latitude (+ is north), then longitude (+ is east). # 3. Zone name used in value of TZ environment variable. # 4. Comments; present if and only if the country has multiple rows. -# +# # Columns are separated by a single tab. # The table is sorted first by country, then an order within the country that # (1) makes some geographical sense, and @@ -120,8 +120,8 @@ CG -0416+01517 Africa/Brazzaville CH +4723+00832 Europe/Zurich CI +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga -CL -3327-07040 America/Santiago mainland -CL -2710-10927 Pacific/Easter Easter Island +CL -3327-07040 America/Santiago most locations +CL -2710-10927 Pacific/Easter Easter Island & Sala y Gomez CM +0403+00942 Africa/Douala CN +4545+12641 Asia/Harbin north Manchuria CN +3114+12128 Asia/Shanghai China coast @@ -187,7 +187,8 @@ HR +4548+01558 Europe/Zagreb HT +1832-07220 America/Port-au-Prince HU +4730+01905 Europe/Budapest ID -0610+10648 Asia/Jakarta Java & Sumatra -ID -0507+11924 Asia/Ujung_Pandang Borneo & Celebes +ID -0002+10920 Asia/Pontianak west & central Borneo +ID -0507+11924 Asia/Ujung_Pandang east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor ID -0232+14042 Asia/Jayapura Irian Jaya & the Moluccas IE +5320-00615 Europe/Dublin IL +3146+03514 Asia/Jerusalem @@ -237,7 +238,8 @@ ML +1239-00800 Africa/Bamako southwest M ML +1446-00301 Africa/Timbuktu northeast Mali MM +1647+09610 Asia/Rangoon MN +4755+10653 Asia/Ulaanbaatar most locations -MN +4801+09139 Asia/Hovd Bayan-Olgiy, Hovd, Uvs +MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan +#MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar (unsure about this) MO +2214+11335 Asia/Macao MP +1512+14545 Pacific/Saipan MQ +1436-06105 America/Martinique

2 1

IERS Message No. 10
by central_bureau＠iers.org May 30, 2001

May 30, 2001

*************************************************************************** IERS Message No. 10 May 30, 2001 *************************************************************************** CHAMP Announcement of Opportunity Release The GeoForschungsZentrum Potsdam (GFZ) has released on May 28, 2001 electronically an Announcement of Opportunity for conducting basic scientific research and application oriented projects using data and data products from its georesearch mission CHAMP. Individuals or parties interested in proposing a CHAMP mission investigation in response to this AO are requested to contact the Newsletter No. 3 at http://op.gfz-potsdam.de/champ/ for further details. Christoph Reigber (CHAMP Project Director) ---------------------------------------------------- Univ.-Prof. Dr.-Ing. Dr.-Ing. E.h. Christoph Reigber GeoForschungsZentrum Potsdam (GFZ) Division 1: Kinematics & Dynamics of the Earth Telegrafenberg A 17, D-14473 Potsdam, Germany phone: +49 (0)331 288-1100, -1101 (secr.) fax: +49 (0)331 288-1111 e-mail: reigber(a)gfz-potsdam.de www: http://www.gfz-potsdam.de/ ***************************************************************************

1 0

Year Round Daylight Saving Time?
by Martin Smoot May 29, 2001

May 29, 2001

the latest energy problems have prompted Massacuhsetts to consider year round Daylight saving time. cnn.com (under US) has an article: http://www.cnn.com/2001/US/05/29/daylight.saving.ap/index.html there is also a reference on the wmal.com web page (WMAL is a washington area radio station). I have not found any other references although I have not really looked very hard. -- Martin Smoot Network Storage Solutions 703-834-2242 msmoot(a)nssolutions.com www.nssolutions.com

2 1