2009-03-04 04:28:35 +01:00
|
|
|
/*
|
|
|
|
** This file is in the public domain, so clarified as of
|
|
|
|
** 1996-06-05 by Arthur David Olson.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Leap second handling from Bradley White.
|
|
|
|
** POSIX-style TZ environment variable handling from Guy Harris.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*LINTLIBRARY*/
|
|
|
|
|
|
|
|
#include "private.h"
|
|
|
|
#include "tzfile.h"
|
|
|
|
#include "fcntl.h"
|
|
|
|
|
|
|
|
#ifndef TZ_ABBR_MAX_LEN
|
2009-03-19 06:20:24 +01:00
|
|
|
#define TZ_ABBR_MAX_LEN 16
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* !defined TZ_ABBR_MAX_LEN */
|
|
|
|
|
|
|
|
#ifndef TZ_ABBR_CHAR_SET
|
|
|
|
#define TZ_ABBR_CHAR_SET \
|
2009-03-19 06:20:24 +01:00
|
|
|
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 :+-._"
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* !defined TZ_ABBR_CHAR_SET */
|
|
|
|
|
|
|
|
#ifndef TZ_ABBR_ERR_CHAR
|
2009-03-19 06:20:24 +01:00
|
|
|
#define TZ_ABBR_ERR_CHAR '_'
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* !defined TZ_ABBR_ERR_CHAR */
|
|
|
|
|
|
|
|
/*
|
|
|
|
** SunOS 4.1.1 headers lack O_BINARY.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef O_BINARY
|
2009-03-19 06:20:24 +01:00
|
|
|
#define OPEN_MODE (O_RDONLY | O_BINARY)
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined O_BINARY */
|
|
|
|
#ifndef O_BINARY
|
2009-03-19 06:20:24 +01:00
|
|
|
#define OPEN_MODE O_RDONLY
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* !defined O_BINARY */
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
# define XLOG(xx) printf xx , fflush(stdout)
|
|
|
|
#else
|
|
|
|
# define XLOG(x) do{}while (0)
|
|
|
|
#endif
|
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
/* BEGIN android-added: thread-safety. */
|
|
|
|
#include <pthread.h>
|
|
|
|
static pthread_mutex_t _tzMutex = PTHREAD_MUTEX_INITIALIZER;
|
|
|
|
static inline void _tzLock(void) { pthread_mutex_lock(&_tzMutex); }
|
|
|
|
static inline void _tzUnlock(void) { pthread_mutex_unlock(&_tzMutex); }
|
|
|
|
/* END android-added */
|
2009-09-10 02:41:59 +02:00
|
|
|
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifndef WILDABBR
|
|
|
|
/*
|
|
|
|
** Someone might make incorrect use of a time zone abbreviation:
|
2009-03-19 06:20:24 +01:00
|
|
|
** 1. They might reference tzname[0] before calling tzset (explicitly
|
|
|
|
** or implicitly).
|
|
|
|
** 2. They might reference tzname[1] before calling tzset (explicitly
|
|
|
|
** or implicitly).
|
|
|
|
** 3. They might reference tzname[1] after setting to a time zone
|
|
|
|
** in which Daylight Saving Time is never observed.
|
|
|
|
** 4. They might reference tzname[0] after setting to a time zone
|
|
|
|
** in which Standard Time is never observed.
|
|
|
|
** 5. They might reference tm.TM_ZONE after calling offtime.
|
2009-03-04 04:28:35 +01:00
|
|
|
** What's best to do in the above cases is open to debate;
|
|
|
|
** for now, we just set things up so that in any of the five cases
|
|
|
|
** WILDABBR is used. Another possibility: initialize tzname[0] to the
|
|
|
|
** string "tzname[0] used before set", and similarly for the other cases.
|
|
|
|
** And another: initialize tzname[0] to "ERA", with an explanation in the
|
|
|
|
** manual page of what this "time zone abbreviation" means (doing this so
|
|
|
|
** that tzname[0] has the "normal" length of three characters).
|
|
|
|
*/
|
2009-03-19 06:20:24 +01:00
|
|
|
#define WILDABBR " "
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* !defined WILDABBR */
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
static char wildabbr[] = WILDABBR;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
static const char gmt[] = "GMT";
|
2009-03-04 04:28:35 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
** The DST rules to use if TZ has no rules and we can't load TZDEFRULES.
|
|
|
|
** We default to US rules as of 1999-08-17.
|
|
|
|
** POSIX 1003.1 section 8.1.1 says that the default DST rules are
|
|
|
|
** implementation dependent; for historical reasons, US rules are a
|
|
|
|
** common default.
|
|
|
|
*/
|
|
|
|
#ifndef TZDEFRULESTRING
|
|
|
|
#define TZDEFRULESTRING ",M4.1.0,M10.5.0"
|
|
|
|
#endif /* !defined TZDEFDST */
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
struct ttinfo { /* time type information */
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
int_fast32_t tt_gmtoff; /* UT offset in seconds */
|
2013-07-13 02:31:11 +02:00
|
|
|
int tt_isdst; /* used to set tm_isdst */
|
|
|
|
int tt_abbrind; /* abbreviation list index */
|
|
|
|
int tt_ttisstd; /* TRUE if transition is std time */
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
int tt_ttisgmt; /* TRUE if transition is UT */
|
2009-03-04 04:28:35 +01:00
|
|
|
};
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
struct lsinfo { /* leap second information */
|
2013-07-13 02:31:11 +02:00
|
|
|
time_t ls_trans; /* transition time */
|
|
|
|
int_fast64_t ls_corr; /* correction to apply */
|
2009-03-04 04:28:35 +01:00
|
|
|
};
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
#define BIGGEST(a, b) (((a) > (b)) ? (a) : (b))
|
2009-03-04 04:28:35 +01:00
|
|
|
|
|
|
|
#ifdef TZNAME_MAX
|
2009-03-19 06:20:24 +01:00
|
|
|
#define MY_TZNAME_MAX TZNAME_MAX
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined TZNAME_MAX */
|
|
|
|
#ifndef TZNAME_MAX
|
2009-03-19 06:20:24 +01:00
|
|
|
#define MY_TZNAME_MAX 255
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* !defined TZNAME_MAX */
|
|
|
|
|
|
|
|
struct state {
|
2009-03-19 06:20:24 +01:00
|
|
|
int leapcnt;
|
|
|
|
int timecnt;
|
|
|
|
int typecnt;
|
|
|
|
int charcnt;
|
|
|
|
int goback;
|
|
|
|
int goahead;
|
|
|
|
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];
|
2013-07-13 02:31:11 +02:00
|
|
|
int defaulttype; /* for early times or if no transitions */
|
2009-03-04 04:28:35 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
struct rule {
|
2013-07-13 02:31:11 +02:00
|
|
|
int r_type; /* type of rule--see below */
|
|
|
|
int r_day; /* day number of rule */
|
|
|
|
int r_week; /* week number of rule */
|
|
|
|
int r_mon; /* month number of rule */
|
|
|
|
int_fast32_t r_time; /* transition time of rule */
|
2009-03-04 04:28:35 +01:00
|
|
|
};
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
#define JULIAN_DAY 0 /* Jn - Julian day */
|
|
|
|
#define DAY_OF_YEAR 1 /* n - day of year */
|
|
|
|
#define MONTH_NTH_DAY_OF_WEEK 2 /* Mm.n.d - month, week, day of week */
|
2009-03-04 04:28:35 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
** Prototypes for static functions.
|
|
|
|
*/
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
/* NOTE: all internal functions assume that _tzLock() was already called */
|
|
|
|
|
2012-10-18 01:30:47 +02:00
|
|
|
static int __bionic_open_tzdata(const char*, int*);
|
2013-07-13 02:31:11 +02:00
|
|
|
static int_fast32_t detzcode(const char * codep);
|
|
|
|
static time_t detzcode64(const char * codep);
|
|
|
|
static int differ_by_repeat(time_t t1, time_t t0);
|
|
|
|
static const char * getzname(const char * strp) ATTRIBUTE_PURE;
|
|
|
|
static const char * getqzname(const char * strp, const int delim)
|
|
|
|
ATTRIBUTE_PURE;
|
|
|
|
static const char * getnum(const char * strp, int * nump, int min,
|
|
|
|
int max);
|
|
|
|
static const char * getsecs(const char * strp, int_fast32_t * secsp);
|
|
|
|
static const char * getoffset(const char * strp, int_fast32_t * offsetp);
|
|
|
|
static const char * getrule(const char * strp, struct rule * rulep);
|
|
|
|
static void gmtload(struct state * sp);
|
|
|
|
static struct tm * gmtsub(const time_t * timep, const int_fast32_t offset,
|
|
|
|
struct tm * tmp, const struct state * sp); // android-changed: added sp.
|
|
|
|
static struct tm * localsub(const time_t * timep, int_fast32_t offset,
|
|
|
|
struct tm * tmp, const struct state * sp); // android-changed: added sp.
|
|
|
|
static int increment_overflow(int * number, int delta);
|
|
|
|
static int leaps_thru_end_of(int y) ATTRIBUTE_PURE;
|
|
|
|
static int increment_overflow32(int_fast32_t * number, int delta);
|
|
|
|
static int normalize_overflow32(int_fast32_t * tensptr,
|
|
|
|
int * unitsptr, int base);
|
|
|
|
static int normalize_overflow(int * tensptr, int * unitsptr,
|
|
|
|
int base);
|
|
|
|
static void settzname(void);
|
|
|
|
static time_t time1(struct tm * tmp,
|
|
|
|
struct tm * (*funcp)(const time_t *,
|
|
|
|
int_fast32_t, struct tm *, const struct state *), // android-changed: added state*.
|
|
|
|
int_fast32_t offset, const struct state * sp); // android-changed: added sp.
|
|
|
|
static time_t time2(struct tm * const tmp,
|
|
|
|
struct tm * (*const funcp)(const time_t *,
|
|
|
|
int_fast32_t, struct tm*, const struct state *), // android-changed: added state*.
|
|
|
|
int_fast32_t offset, int * okayp, const struct state * sp); // android-changed: added sp.
|
|
|
|
static time_t time2sub(struct tm *tmp,
|
|
|
|
struct tm * (*funcp) (const time_t *,
|
|
|
|
int_fast32_t, struct tm*, const struct state *), // android-changed: added state*.
|
|
|
|
int_fast32_t offset, int * okayp, int do_norm_secs, const struct state * sp); // android-change: added sp.
|
|
|
|
static struct tm * timesub(const time_t * timep, int_fast32_t offset,
|
|
|
|
const struct state * sp, struct tm * tmp);
|
|
|
|
static int tmcomp(const struct tm * atmp,
|
|
|
|
const struct tm * btmp);
|
|
|
|
static time_t transtime(time_t janfirst, int year,
|
|
|
|
const struct rule * rulep, int_fast32_t offset)
|
|
|
|
ATTRIBUTE_PURE;
|
|
|
|
static int typesequiv(const struct state * sp, int a, int b);
|
|
|
|
static int tzload(const char * name, struct state * sp,
|
|
|
|
int doextend);
|
|
|
|
static int tzparse(const char * name, struct state * sp,
|
|
|
|
int lastditch);
|
2009-03-04 04:28:35 +01:00
|
|
|
|
|
|
|
#ifdef ALL_STATE
|
2009-03-19 06:20:24 +01:00
|
|
|
static struct state * lclptr;
|
|
|
|
static struct state * gmtptr;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALL_STATE */
|
|
|
|
|
|
|
|
#ifndef ALL_STATE
|
2009-03-19 06:20:24 +01:00
|
|
|
static struct state lclmem;
|
|
|
|
static struct state gmtmem;
|
|
|
|
#define lclptr (&lclmem)
|
|
|
|
#define gmtptr (&gmtmem)
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* State Farm */
|
|
|
|
|
|
|
|
#ifndef TZ_STRLEN_MAX
|
|
|
|
#define TZ_STRLEN_MAX 255
|
|
|
|
#endif /* !defined TZ_STRLEN_MAX */
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
static char lcl_TZname[TZ_STRLEN_MAX + 1];
|
|
|
|
static int lcl_is_set;
|
|
|
|
static int gmt_is_set;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
char * tzname[2] = {
|
|
|
|
wildabbr,
|
|
|
|
wildabbr
|
2009-03-04 04:28:35 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Section 4.12.3 of X3.159-1989 requires that
|
2009-03-19 06:20:24 +01:00
|
|
|
** Except for the strftime function, these functions [asctime,
|
|
|
|
** ctime, gmtime, localtime] return values in one of two static
|
|
|
|
** objects: a broken-down time structure and an array of char.
|
2009-03-04 04:28:35 +01:00
|
|
|
** Thanks to Paul Eggert for noting this.
|
|
|
|
*/
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
static struct tm tmGlobal;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
|
|
|
#ifdef USG_COMPAT
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
long timezone = 0;
|
|
|
|
int daylight = 0;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined USG_COMPAT */
|
|
|
|
|
|
|
|
#ifdef ALTZONE
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
long altzone = 0;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALTZONE */
|
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
static int_fast32_t
|
|
|
|
detzcode(const char *const codep)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2013-07-13 02:31:11 +02:00
|
|
|
register int_fast32_t result;
|
|
|
|
register int i;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
result = (codep[0] & 0x80) ? -1 : 0;
|
|
|
|
for (i = 0; i < 4; ++i)
|
|
|
|
result = (result << 8) | (codep[i] & 0xff);
|
|
|
|
return result;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static time_t
|
2013-07-13 02:31:11 +02:00
|
|
|
detzcode64(const char *const codep)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2013-07-13 02:31:11 +02:00
|
|
|
register time_t result;
|
|
|
|
register int i;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
result = (codep[0] & 0x80) ? (~(int_fast64_t) 0) : 0;
|
|
|
|
for (i = 0; i < 8; ++i)
|
|
|
|
result = result * 256 + (codep[i] & 0xff);
|
|
|
|
return result;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-07-13 02:31:11 +02:00
|
|
|
settzname(void)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register struct state * const sp = lclptr;
|
|
|
|
register int i;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
tzname[0] = wildabbr;
|
|
|
|
tzname[1] = wildabbr;
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifdef USG_COMPAT
|
2009-03-19 06:20:24 +01:00
|
|
|
daylight = 0;
|
|
|
|
timezone = 0;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined USG_COMPAT */
|
|
|
|
#ifdef ALTZONE
|
2009-03-19 06:20:24 +01:00
|
|
|
altzone = 0;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALTZONE */
|
|
|
|
#ifdef ALL_STATE
|
2009-03-19 06:20:24 +01:00
|
|
|
if (sp == NULL) {
|
|
|
|
tzname[0] = tzname[1] = gmt;
|
|
|
|
return;
|
|
|
|
}
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALL_STATE */
|
2013-07-13 02:31:11 +02:00
|
|
|
/*
|
|
|
|
** And to get the latest zone names into tzname. . .
|
|
|
|
*/
|
2009-03-19 06:20:24 +01:00
|
|
|
for (i = 0; i < sp->typecnt; ++i) {
|
|
|
|
register const struct ttinfo * const ttisp = &sp->ttis[i];
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
tzname[ttisp->tt_isdst] = &sp->chars[ttisp->tt_abbrind];
|
|
|
|
}
|
|
|
|
for (i = 0; i < sp->timecnt; ++i) {
|
|
|
|
register const struct ttinfo * const ttisp =
|
|
|
|
&sp->ttis[
|
|
|
|
sp->types[i]];
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
tzname[ttisp->tt_isdst] =
|
|
|
|
&sp->chars[ttisp->tt_abbrind];
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifdef USG_COMPAT
|
2009-03-19 06:20:24 +01:00
|
|
|
if (ttisp->tt_isdst)
|
|
|
|
daylight = 1;
|
2013-07-13 02:31:11 +02:00
|
|
|
if (!ttisp->tt_isdst)
|
2009-03-19 06:20:24 +01:00
|
|
|
timezone = -(ttisp->tt_gmtoff);
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined USG_COMPAT */
|
|
|
|
#ifdef ALTZONE
|
2013-07-13 02:31:11 +02:00
|
|
|
if (ttisp->tt_isdst)
|
2009-03-19 06:20:24 +01:00
|
|
|
altzone = -(ttisp->tt_gmtoff);
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALTZONE */
|
2009-03-19 06:20:24 +01:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
** Finally, scrub the abbreviations.
|
|
|
|
** First, replace bogus characters.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < sp->charcnt; ++i)
|
|
|
|
if (strchr(TZ_ABBR_CHAR_SET, sp->chars[i]) == NULL)
|
|
|
|
sp->chars[i] = TZ_ABBR_ERR_CHAR;
|
|
|
|
/*
|
|
|
|
** Second, truncate long abbreviations.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < sp->typecnt; ++i) {
|
|
|
|
register const struct ttinfo * const ttisp = &sp->ttis[i];
|
|
|
|
register char * cp = &sp->chars[ttisp->tt_abbrind];
|
|
|
|
|
|
|
|
if (strlen(cp) > TZ_ABBR_MAX_LEN &&
|
|
|
|
strcmp(cp, GRANDPARENTED) != 0)
|
|
|
|
*(cp + TZ_ABBR_MAX_LEN) = '\0';
|
|
|
|
}
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-07-13 02:31:11 +02:00
|
|
|
differ_by_repeat(const time_t t1, const time_t t0)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
if (TYPE_BIT(time_t) - TYPE_SIGNED(time_t) < SECSPERREPEAT_BITS)
|
2013-07-13 02:31:11 +02:00
|
|
|
return 0;
|
2013-10-09 03:30:44 +02:00
|
|
|
#if __LP64__ // 32-bit Android only has a signed 32-bit time_t; 64-bit Android is fixed.
|
2013-07-13 02:31:11 +02:00
|
|
|
return t1 - t0 == SECSPERREPEAT;
|
2013-10-09 03:30:44 +02:00
|
|
|
#endif
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-07-13 02:31:11 +02:00
|
|
|
tzload(register const char* name, register struct state* const sp,
|
|
|
|
register const int doextend)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register const char * p;
|
|
|
|
register int i;
|
|
|
|
register int fid;
|
|
|
|
register int stored;
|
|
|
|
register int nread;
|
2013-07-13 02:31:11 +02:00
|
|
|
typedef union {
|
2009-03-19 06:20:24 +01:00
|
|
|
struct tzhead tzhead;
|
|
|
|
char buf[2 * sizeof(struct tzhead) +
|
|
|
|
2 * sizeof *sp +
|
|
|
|
4 * TZ_MAX_TIMES];
|
2013-07-13 02:31:11 +02:00
|
|
|
} u_t;
|
|
|
|
#ifdef ALL_STATE
|
|
|
|
register u_t * up;
|
2009-03-19 06:20:24 +01:00
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
up = (u_t *) calloc(1, sizeof *up);
|
|
|
|
if (up == NULL)
|
|
|
|
return -1;
|
|
|
|
#else /* !defined ALL_STATE */
|
|
|
|
u_t u;
|
|
|
|
register u_t * const up = &u;
|
|
|
|
#endif /* !defined ALL_STATE */
|
|
|
|
|
|
|
|
sp->goback = sp->goahead = FALSE;
|
|
|
|
if (name == NULL && (name = TZDEFAULT) == NULL)
|
|
|
|
goto oops;
|
|
|
|
int toread;
|
|
|
|
fid = __bionic_open_tzdata(name, &toread);
|
|
|
|
if (fid < 0) {
|
|
|
|
return -1;
|
2009-03-19 06:20:24 +01:00
|
|
|
}
|
2013-07-13 02:31:11 +02:00
|
|
|
nread = read(fid, up->buf, toread);
|
|
|
|
if (close(fid) < 0 || nread <= 0)
|
|
|
|
goto oops;
|
2009-03-19 06:20:24 +01:00
|
|
|
for (stored = 4; stored <= 8; stored *= 2) {
|
|
|
|
int ttisstdcnt;
|
|
|
|
int ttisgmtcnt;
|
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
ttisstdcnt = (int) detzcode(up->tzhead.tzh_ttisstdcnt);
|
|
|
|
ttisgmtcnt = (int) detzcode(up->tzhead.tzh_ttisgmtcnt);
|
|
|
|
sp->leapcnt = (int) detzcode(up->tzhead.tzh_leapcnt);
|
|
|
|
sp->timecnt = (int) detzcode(up->tzhead.tzh_timecnt);
|
|
|
|
sp->typecnt = (int) detzcode(up->tzhead.tzh_typecnt);
|
|
|
|
sp->charcnt = (int) detzcode(up->tzhead.tzh_charcnt);
|
|
|
|
p = up->tzhead.tzh_charcnt + sizeof up->tzhead.tzh_charcnt;
|
2009-03-19 06:20:24 +01:00
|
|
|
if (sp->leapcnt < 0 || sp->leapcnt > TZ_MAX_LEAPS ||
|
|
|
|
sp->typecnt <= 0 || sp->typecnt > TZ_MAX_TYPES ||
|
|
|
|
sp->timecnt < 0 || sp->timecnt > TZ_MAX_TIMES ||
|
|
|
|
sp->charcnt < 0 || sp->charcnt > TZ_MAX_CHARS ||
|
|
|
|
(ttisstdcnt != sp->typecnt && ttisstdcnt != 0) ||
|
|
|
|
(ttisgmtcnt != sp->typecnt && ttisgmtcnt != 0))
|
2013-07-13 02:31:11 +02:00
|
|
|
goto oops;
|
|
|
|
if (nread - (p - up->buf) <
|
2009-03-19 06:20:24 +01:00
|
|
|
sp->timecnt * stored + /* ats */
|
|
|
|
sp->timecnt + /* types */
|
|
|
|
sp->typecnt * 6 + /* ttinfos */
|
|
|
|
sp->charcnt + /* chars */
|
|
|
|
sp->leapcnt * (stored + 4) + /* lsinfos */
|
|
|
|
ttisstdcnt + /* ttisstds */
|
|
|
|
ttisgmtcnt) /* ttisgmts */
|
2013-07-13 02:31:11 +02:00
|
|
|
goto oops;
|
2009-03-19 06:20:24 +01:00
|
|
|
for (i = 0; i < sp->timecnt; ++i) {
|
|
|
|
sp->ats[i] = (stored == 4) ?
|
|
|
|
detzcode(p) : detzcode64(p);
|
|
|
|
p += stored;
|
|
|
|
}
|
|
|
|
for (i = 0; i < sp->timecnt; ++i) {
|
|
|
|
sp->types[i] = (unsigned char) *p++;
|
|
|
|
if (sp->types[i] >= sp->typecnt)
|
2013-07-13 02:31:11 +02:00
|
|
|
goto oops;
|
2009-03-19 06:20:24 +01:00
|
|
|
}
|
|
|
|
for (i = 0; i < sp->typecnt; ++i) {
|
|
|
|
register struct ttinfo * ttisp;
|
|
|
|
|
|
|
|
ttisp = &sp->ttis[i];
|
|
|
|
ttisp->tt_gmtoff = detzcode(p);
|
|
|
|
p += 4;
|
|
|
|
ttisp->tt_isdst = (unsigned char) *p++;
|
|
|
|
if (ttisp->tt_isdst != 0 && ttisp->tt_isdst != 1)
|
2013-07-13 02:31:11 +02:00
|
|
|
goto oops;
|
2009-03-19 06:20:24 +01:00
|
|
|
ttisp->tt_abbrind = (unsigned char) *p++;
|
|
|
|
if (ttisp->tt_abbrind < 0 ||
|
|
|
|
ttisp->tt_abbrind > sp->charcnt)
|
2013-07-13 02:31:11 +02:00
|
|
|
goto oops;
|
2009-03-19 06:20:24 +01:00
|
|
|
}
|
|
|
|
for (i = 0; i < sp->charcnt; ++i)
|
|
|
|
sp->chars[i] = *p++;
|
|
|
|
sp->chars[i] = '\0'; /* ensure '\0' at end */
|
|
|
|
for (i = 0; i < sp->leapcnt; ++i) {
|
|
|
|
register struct lsinfo * lsisp;
|
|
|
|
|
|
|
|
lsisp = &sp->lsis[i];
|
|
|
|
lsisp->ls_trans = (stored == 4) ?
|
|
|
|
detzcode(p) : detzcode64(p);
|
|
|
|
p += stored;
|
|
|
|
lsisp->ls_corr = detzcode(p);
|
|
|
|
p += 4;
|
|
|
|
}
|
|
|
|
for (i = 0; i < sp->typecnt; ++i) {
|
|
|
|
register struct ttinfo * ttisp;
|
|
|
|
|
|
|
|
ttisp = &sp->ttis[i];
|
|
|
|
if (ttisstdcnt == 0)
|
|
|
|
ttisp->tt_ttisstd = FALSE;
|
|
|
|
else {
|
|
|
|
ttisp->tt_ttisstd = *p++;
|
|
|
|
if (ttisp->tt_ttisstd != TRUE &&
|
|
|
|
ttisp->tt_ttisstd != FALSE)
|
2013-07-13 02:31:11 +02:00
|
|
|
goto oops;
|
2009-03-19 06:20:24 +01:00
|
|
|
}
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
2009-03-19 06:20:24 +01:00
|
|
|
for (i = 0; i < sp->typecnt; ++i) {
|
|
|
|
register struct ttinfo * ttisp;
|
|
|
|
|
|
|
|
ttisp = &sp->ttis[i];
|
|
|
|
if (ttisgmtcnt == 0)
|
|
|
|
ttisp->tt_ttisgmt = FALSE;
|
|
|
|
else {
|
|
|
|
ttisp->tt_ttisgmt = *p++;
|
|
|
|
if (ttisp->tt_ttisgmt != TRUE &&
|
|
|
|
ttisp->tt_ttisgmt != FALSE)
|
2013-07-13 02:31:11 +02:00
|
|
|
goto oops;
|
2009-03-19 06:20:24 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
** Out-of-sort ats should mean we're running on a
|
|
|
|
** signed time_t system but using a data file with
|
|
|
|
** unsigned values (or vice versa).
|
|
|
|
*/
|
2013-07-13 02:31:11 +02:00
|
|
|
for (i = 0; i < sp->timecnt; ++i)
|
|
|
|
if ((i < sp->timecnt - 1 &&
|
|
|
|
sp->ats[i] > sp->ats[i + 1]) ||
|
|
|
|
(i == sp->timecnt - 1 && !TYPE_SIGNED(time_t) &&
|
|
|
|
sp->ats[i] >
|
|
|
|
((stored == 4) ? INT32_MAX : INT64_MAX))) {
|
|
|
|
if (TYPE_SIGNED(time_t)) {
|
|
|
|
/*
|
|
|
|
** Ignore the end (easy).
|
|
|
|
*/
|
|
|
|
sp->timecnt = i + 1;
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
** Ignore the beginning (harder).
|
|
|
|
*/
|
|
|
|
register int j;
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Keep the record right before the
|
|
|
|
** epoch boundary,
|
|
|
|
** but tweak it so that it starts
|
|
|
|
** right with the epoch
|
|
|
|
** (thanks to Doug Bailey).
|
|
|
|
*/
|
|
|
|
sp->ats[i] = 0;
|
|
|
|
for (j = 0; j + i < sp->timecnt; ++j) {
|
|
|
|
sp->ats[j] = sp->ats[j + i];
|
|
|
|
sp->types[j] = sp->types[j + i];
|
|
|
|
}
|
|
|
|
sp->timecnt = j;
|
2009-03-19 06:20:24 +01:00
|
|
|
}
|
2013-07-13 02:31:11 +02:00
|
|
|
break;
|
2009-03-19 06:20:24 +01:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
** If this is an old file, we're done.
|
|
|
|
*/
|
2013-07-13 02:31:11 +02:00
|
|
|
if (up->tzhead.tzh_version[0] == '\0')
|
2009-03-19 06:20:24 +01:00
|
|
|
break;
|
2013-07-13 02:31:11 +02:00
|
|
|
nread -= p - up->buf;
|
2009-03-19 06:20:24 +01:00
|
|
|
for (i = 0; i < nread; ++i)
|
2013-07-13 02:31:11 +02:00
|
|
|
up->buf[i] = p[i];
|
2009-03-19 06:20:24 +01:00
|
|
|
/*
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
** If this is a narrow time_t system, we're done.
|
2009-03-19 06:20:24 +01:00
|
|
|
*/
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
if (stored >= (int) sizeof(time_t))
|
2009-03-19 06:20:24 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (doextend && nread > 2 &&
|
2013-07-13 02:31:11 +02:00
|
|
|
up->buf[0] == '\n' && up->buf[nread - 1] == '\n' &&
|
2009-03-19 06:20:24 +01:00
|
|
|
sp->typecnt + 2 <= TZ_MAX_TYPES) {
|
|
|
|
struct state ts;
|
|
|
|
register int result;
|
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
up->buf[nread - 1] = '\0';
|
|
|
|
result = tzparse(&up->buf[1], &ts, FALSE);
|
2009-03-19 06:20:24 +01:00
|
|
|
if (result == 0 && ts.typecnt == 2 &&
|
|
|
|
sp->charcnt + ts.charcnt <= TZ_MAX_CHARS) {
|
|
|
|
for (i = 0; i < 2; ++i)
|
|
|
|
ts.ttis[i].tt_abbrind +=
|
|
|
|
sp->charcnt;
|
|
|
|
for (i = 0; i < ts.charcnt; ++i)
|
|
|
|
sp->chars[sp->charcnt++] =
|
|
|
|
ts.chars[i];
|
|
|
|
i = 0;
|
|
|
|
while (i < ts.timecnt &&
|
|
|
|
ts.ats[i] <=
|
|
|
|
sp->ats[sp->timecnt - 1])
|
|
|
|
++i;
|
|
|
|
while (i < ts.timecnt &&
|
|
|
|
sp->timecnt < TZ_MAX_TIMES) {
|
|
|
|
sp->ats[sp->timecnt] =
|
|
|
|
ts.ats[i];
|
|
|
|
sp->types[sp->timecnt] =
|
|
|
|
sp->typecnt +
|
|
|
|
ts.types[i];
|
|
|
|
++sp->timecnt;
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
sp->ttis[sp->typecnt++] = ts.ttis[0];
|
|
|
|
sp->ttis[sp->typecnt++] = ts.ttis[1];
|
|
|
|
}
|
|
|
|
}
|
2013-07-13 02:31:11 +02:00
|
|
|
if (sp->timecnt > 1) {
|
|
|
|
for (i = 1; i < sp->timecnt; ++i)
|
|
|
|
if (typesequiv(sp, sp->types[i], sp->types[0]) &&
|
|
|
|
differ_by_repeat(sp->ats[i], sp->ats[0])) {
|
|
|
|
sp->goback = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
for (i = sp->timecnt - 2; i >= 0; --i)
|
|
|
|
if (typesequiv(sp, sp->types[sp->timecnt - 1],
|
|
|
|
sp->types[i]) &&
|
|
|
|
differ_by_repeat(sp->ats[sp->timecnt - 1],
|
|
|
|
sp->ats[i])) {
|
|
|
|
sp->goahead = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
** If type 0 is is unused in transitions,
|
|
|
|
** it's the type to use for early times.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < sp->typecnt; ++i)
|
|
|
|
if (sp->types[i] == 0)
|
|
|
|
break;
|
|
|
|
i = (i >= sp->typecnt) ? 0 : -1;
|
|
|
|
/*
|
|
|
|
** Absent the above,
|
|
|
|
** if there are transition times
|
|
|
|
** and the first transition is to a daylight time
|
|
|
|
** find the standard type less than and closest to
|
|
|
|
** the type of the first transition.
|
|
|
|
*/
|
|
|
|
if (i < 0 && sp->timecnt > 0 && sp->ttis[sp->types[0]].tt_isdst) {
|
|
|
|
i = sp->types[0];
|
|
|
|
while (--i >= 0)
|
|
|
|
if (!sp->ttis[i].tt_isdst)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
** If no result yet, find the first standard type.
|
|
|
|
** If there is none, punt to type zero.
|
|
|
|
*/
|
|
|
|
if (i < 0) {
|
|
|
|
i = 0;
|
|
|
|
while (sp->ttis[i].tt_isdst)
|
|
|
|
if (++i >= sp->typecnt) {
|
|
|
|
i = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sp->defaulttype = i;
|
|
|
|
#ifdef ALL_STATE
|
|
|
|
free(up);
|
|
|
|
#endif /* defined ALL_STATE */
|
|
|
|
return 0;
|
|
|
|
oops:
|
|
|
|
#ifdef ALL_STATE
|
|
|
|
free(up);
|
|
|
|
#endif /* defined ALL_STATE */
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
typesequiv(const struct state *const sp, const int a, const int b)
|
|
|
|
{
|
|
|
|
register int result;
|
|
|
|
|
|
|
|
if (sp == NULL ||
|
|
|
|
a < 0 || a >= sp->typecnt ||
|
|
|
|
b < 0 || b >= sp->typecnt)
|
|
|
|
result = FALSE;
|
|
|
|
else {
|
|
|
|
register const struct ttinfo * ap = &sp->ttis[a];
|
|
|
|
register const struct ttinfo * bp = &sp->ttis[b];
|
|
|
|
result = ap->tt_gmtoff == bp->tt_gmtoff &&
|
|
|
|
ap->tt_isdst == bp->tt_isdst &&
|
|
|
|
ap->tt_ttisstd == bp->tt_ttisstd &&
|
|
|
|
ap->tt_ttisgmt == bp->tt_ttisgmt &&
|
|
|
|
strcmp(&sp->chars[ap->tt_abbrind],
|
|
|
|
&sp->chars[bp->tt_abbrind]) == 0;
|
|
|
|
}
|
|
|
|
return result;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
static const int mon_lengths[2][MONSPERYEAR] = {
|
|
|
|
{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
|
|
|
|
{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
|
2009-03-04 04:28:35 +01:00
|
|
|
};
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
static const int year_lengths[2] = {
|
|
|
|
DAYSPERNYEAR, DAYSPERLYEAR
|
2009-03-04 04:28:35 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Given a pointer into a time zone string, scan until a character that is not
|
|
|
|
** a valid character in a zone name is found. Return a pointer to that
|
|
|
|
** character.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static const char *
|
2013-07-13 02:31:11 +02:00
|
|
|
getzname(register const char * strp)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register char c;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
while ((c = *strp) != '\0' && !is_digit(c) && c != ',' && c != '-' &&
|
|
|
|
c != '+')
|
|
|
|
++strp;
|
|
|
|
return strp;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Given a pointer into an extended time zone string, scan until the ending
|
|
|
|
** delimiter of the zone name is located. Return a pointer to the delimiter.
|
|
|
|
**
|
|
|
|
** As with getzname above, the legal character set is actually quite
|
|
|
|
** restricted, with other characters producing undefined results.
|
|
|
|
** We don't do any checking here; checking is done later in common-case code.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
getqzname(register const char *strp, const int delim)
|
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register int c;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
while ((c = *strp) != '\0' && c != delim)
|
|
|
|
++strp;
|
|
|
|
return strp;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Given a pointer into a time zone string, extract a number from that string.
|
|
|
|
** Check that the number is within a specified range; if it is not, return
|
|
|
|
** NULL.
|
|
|
|
** Otherwise, return a pointer to the first character not part of the number.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static const char *
|
2013-07-13 02:31:11 +02:00
|
|
|
getnum(register const char * strp, int * const nump, const int min, const int max)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register char c;
|
|
|
|
register int num;
|
|
|
|
|
|
|
|
if (strp == NULL || !is_digit(c = *strp))
|
|
|
|
return NULL;
|
|
|
|
num = 0;
|
|
|
|
do {
|
|
|
|
num = num * 10 + (c - '0');
|
|
|
|
if (num > max)
|
|
|
|
return NULL; /* illegal value */
|
|
|
|
c = *++strp;
|
|
|
|
} while (is_digit(c));
|
|
|
|
if (num < min)
|
|
|
|
return NULL; /* illegal value */
|
|
|
|
*nump = num;
|
|
|
|
return strp;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Given a pointer into a time zone string, extract a number of seconds,
|
|
|
|
** in hh[:mm[:ss]] form, from the string.
|
|
|
|
** If any error occurs, return NULL.
|
|
|
|
** Otherwise, return a pointer to the first character not part of the number
|
|
|
|
** of seconds.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static const char *
|
2013-07-13 02:31:11 +02:00
|
|
|
getsecs(register const char *strp, int_fast32_t *const secsp)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
int num;
|
|
|
|
|
|
|
|
/*
|
|
|
|
** `HOURSPERDAY * DAYSPERWEEK - 1' allows quasi-Posix rules like
|
|
|
|
** "M10.4.6/26", which does not conform to Posix,
|
|
|
|
** but which specifies the equivalent of
|
|
|
|
** ``02:00 on the first Sunday on or after 23 Oct''.
|
|
|
|
*/
|
|
|
|
strp = getnum(strp, &num, 0, HOURSPERDAY * DAYSPERWEEK - 1);
|
|
|
|
if (strp == NULL)
|
|
|
|
return NULL;
|
2013-07-13 02:31:11 +02:00
|
|
|
*secsp = num * (int_fast32_t) SECSPERHOUR;
|
2009-03-19 06:20:24 +01:00
|
|
|
if (*strp == ':') {
|
|
|
|
++strp;
|
|
|
|
strp = getnum(strp, &num, 0, MINSPERHOUR - 1);
|
|
|
|
if (strp == NULL)
|
|
|
|
return NULL;
|
|
|
|
*secsp += num * SECSPERMIN;
|
|
|
|
if (*strp == ':') {
|
|
|
|
++strp;
|
|
|
|
/* `SECSPERMIN' allows for leap seconds. */
|
|
|
|
strp = getnum(strp, &num, 0, SECSPERMIN);
|
|
|
|
if (strp == NULL)
|
|
|
|
return NULL;
|
|
|
|
*secsp += num;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return strp;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Given a pointer into a time zone string, extract an offset, in
|
|
|
|
** [+-]hh[:mm[:ss]] form, from the string.
|
|
|
|
** If any error occurs, return NULL.
|
|
|
|
** Otherwise, return a pointer to the first character not part of the time.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static const char *
|
2013-07-13 02:31:11 +02:00
|
|
|
getoffset(register const char *strp, int_fast32_t *const offsetp)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register int neg = 0;
|
|
|
|
|
|
|
|
if (*strp == '-') {
|
|
|
|
neg = 1;
|
|
|
|
++strp;
|
|
|
|
} else if (*strp == '+')
|
|
|
|
++strp;
|
|
|
|
strp = getsecs(strp, offsetp);
|
|
|
|
if (strp == NULL)
|
|
|
|
return NULL; /* illegal time */
|
|
|
|
if (neg)
|
|
|
|
*offsetp = -*offsetp;
|
|
|
|
return strp;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Given a pointer into a time zone string, extract a rule in the form
|
|
|
|
** date[/time]. See POSIX section 8 for the format of "date" and "time".
|
|
|
|
** If a valid rule is not found, return NULL.
|
|
|
|
** Otherwise, return a pointer to the first character not part of the rule.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static const char *
|
2013-07-13 02:31:11 +02:00
|
|
|
getrule(const char * strp, register struct rule * const rulep)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
if (*strp == 'J') {
|
|
|
|
/*
|
|
|
|
** Julian day.
|
|
|
|
*/
|
|
|
|
rulep->r_type = JULIAN_DAY;
|
|
|
|
++strp;
|
|
|
|
strp = getnum(strp, &rulep->r_day, 1, DAYSPERNYEAR);
|
|
|
|
} else if (*strp == 'M') {
|
|
|
|
/*
|
|
|
|
** Month, week, day.
|
|
|
|
*/
|
|
|
|
rulep->r_type = MONTH_NTH_DAY_OF_WEEK;
|
|
|
|
++strp;
|
|
|
|
strp = getnum(strp, &rulep->r_mon, 1, MONSPERYEAR);
|
|
|
|
if (strp == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (*strp++ != '.')
|
|
|
|
return NULL;
|
|
|
|
strp = getnum(strp, &rulep->r_week, 1, 5);
|
|
|
|
if (strp == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (*strp++ != '.')
|
|
|
|
return NULL;
|
|
|
|
strp = getnum(strp, &rulep->r_day, 0, DAYSPERWEEK - 1);
|
|
|
|
} else if (is_digit(*strp)) {
|
|
|
|
/*
|
|
|
|
** Day of year.
|
|
|
|
*/
|
|
|
|
rulep->r_type = DAY_OF_YEAR;
|
|
|
|
strp = getnum(strp, &rulep->r_day, 0, DAYSPERLYEAR - 1);
|
|
|
|
} else return NULL; /* invalid format */
|
|
|
|
if (strp == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (*strp == '/') {
|
|
|
|
/*
|
|
|
|
** Time specified.
|
|
|
|
*/
|
|
|
|
++strp;
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
strp = getoffset(strp, &rulep->r_time);
|
2009-03-19 06:20:24 +01:00
|
|
|
} else rulep->r_time = 2 * SECSPERHOUR; /* default = 2:00:00 */
|
|
|
|
return strp;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Given the Epoch-relative time of January 1, 00:00:00 UTC, in a year, the
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
** year, a rule, and the offset from UT at the time that rule takes effect,
|
2009-03-04 04:28:35 +01:00
|
|
|
** calculate the Epoch-relative time that rule takes effect.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static time_t
|
2013-07-13 02:31:11 +02:00
|
|
|
transtime(const time_t janfirst, const int year,
|
|
|
|
register const struct rule *const rulep, const int_fast32_t offset)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register int leapyear;
|
|
|
|
register time_t value;
|
|
|
|
register int i;
|
|
|
|
int d, m1, yy0, yy1, yy2, dow;
|
|
|
|
|
|
|
|
INITIALIZE(value);
|
|
|
|
leapyear = isleap(year);
|
|
|
|
switch (rulep->r_type) {
|
|
|
|
|
|
|
|
case JULIAN_DAY:
|
|
|
|
/*
|
|
|
|
** Jn - Julian day, 1 == January 1, 60 == March 1 even in leap
|
|
|
|
** years.
|
|
|
|
** In non-leap years, or if the day number is 59 or less, just
|
|
|
|
** add SECSPERDAY times the day number-1 to the time of
|
|
|
|
** January 1, midnight, to get the day.
|
|
|
|
*/
|
|
|
|
value = janfirst + (rulep->r_day - 1) * SECSPERDAY;
|
|
|
|
if (leapyear && rulep->r_day >= 60)
|
|
|
|
value += SECSPERDAY;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DAY_OF_YEAR:
|
|
|
|
/*
|
|
|
|
** n - day of year.
|
|
|
|
** Just add SECSPERDAY times the day number to the time of
|
|
|
|
** January 1, midnight, to get the day.
|
|
|
|
*/
|
|
|
|
value = janfirst + rulep->r_day * SECSPERDAY;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MONTH_NTH_DAY_OF_WEEK:
|
|
|
|
/*
|
|
|
|
** Mm.n.d - nth "dth day" of month m.
|
|
|
|
*/
|
|
|
|
value = janfirst;
|
|
|
|
for (i = 0; i < rulep->r_mon - 1; ++i)
|
|
|
|
value += mon_lengths[leapyear][i] * SECSPERDAY;
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Use Zeller's Congruence to get day-of-week of first day of
|
|
|
|
** month.
|
|
|
|
*/
|
|
|
|
m1 = (rulep->r_mon + 9) % 12 + 1;
|
|
|
|
yy0 = (rulep->r_mon <= 2) ? (year - 1) : year;
|
|
|
|
yy1 = yy0 / 100;
|
|
|
|
yy2 = yy0 % 100;
|
|
|
|
dow = ((26 * m1 - 2) / 10 +
|
|
|
|
1 + yy2 + yy2 / 4 + yy1 / 4 - 2 * yy1) % 7;
|
|
|
|
if (dow < 0)
|
|
|
|
dow += DAYSPERWEEK;
|
|
|
|
|
|
|
|
/*
|
|
|
|
** "dow" is the day-of-week of the first day of the month. Get
|
|
|
|
** the day-of-month (zero-origin) of the first "dow" day of the
|
|
|
|
** month.
|
|
|
|
*/
|
|
|
|
d = rulep->r_day - dow;
|
|
|
|
if (d < 0)
|
|
|
|
d += DAYSPERWEEK;
|
|
|
|
for (i = 1; i < rulep->r_week; ++i) {
|
|
|
|
if (d + DAYSPERWEEK >=
|
|
|
|
mon_lengths[leapyear][rulep->r_mon - 1])
|
|
|
|
break;
|
|
|
|
d += DAYSPERWEEK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** "d" is the day-of-month (zero-origin) of the day we want.
|
|
|
|
*/
|
|
|
|
value += d * SECSPERDAY;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
** "value" is the Epoch-relative time of 00:00:00 UT on the day in
|
2009-03-19 06:20:24 +01:00
|
|
|
** question. To get the Epoch-relative time of the specified local
|
|
|
|
** time on that day, add the transition time and the current offset
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
** from UT.
|
2009-03-19 06:20:24 +01:00
|
|
|
*/
|
|
|
|
return value + rulep->r_time + offset;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Given a POSIX section 8-style TZ string, fill in the rule tables as
|
|
|
|
** appropriate.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
2013-07-13 02:31:11 +02:00
|
|
|
tzparse(const char * name, register struct state * const sp,
|
|
|
|
const int lastditch)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
const char * stdname;
|
|
|
|
const char * dstname;
|
|
|
|
size_t stdlen;
|
|
|
|
size_t dstlen;
|
2013-07-13 02:31:11 +02:00
|
|
|
int_fast32_t stdoffset;
|
|
|
|
int_fast32_t dstoffset;
|
|
|
|
register time_t * atp;
|
2009-03-19 06:20:24 +01:00
|
|
|
register unsigned char * typep;
|
|
|
|
register char * cp;
|
|
|
|
register int load_result;
|
2013-07-13 02:31:11 +02:00
|
|
|
static struct ttinfo zttinfo;
|
2009-03-19 06:20:24 +01:00
|
|
|
|
|
|
|
INITIALIZE(dstname);
|
|
|
|
stdname = name;
|
|
|
|
if (lastditch) {
|
|
|
|
stdlen = strlen(name); /* length of standard zone name */
|
|
|
|
name += stdlen;
|
|
|
|
if (stdlen >= sizeof sp->chars)
|
|
|
|
stdlen = (sizeof sp->chars) - 1;
|
|
|
|
stdoffset = 0;
|
|
|
|
} else {
|
|
|
|
if (*name == '<') {
|
|
|
|
name++;
|
|
|
|
stdname = name;
|
|
|
|
name = getqzname(name, '>');
|
|
|
|
if (*name != '>')
|
|
|
|
return (-1);
|
|
|
|
stdlen = name - stdname;
|
|
|
|
name++;
|
|
|
|
} else {
|
|
|
|
name = getzname(name);
|
|
|
|
stdlen = name - stdname;
|
|
|
|
}
|
|
|
|
if (*name == '\0')
|
|
|
|
return -1;
|
|
|
|
name = getoffset(name, &stdoffset);
|
|
|
|
if (name == NULL)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
load_result = tzload(TZDEFRULES, sp, FALSE);
|
|
|
|
if (load_result != 0)
|
|
|
|
sp->leapcnt = 0; /* so, we're off a little */
|
|
|
|
if (*name != '\0') {
|
|
|
|
if (*name == '<') {
|
|
|
|
dstname = ++name;
|
|
|
|
name = getqzname(name, '>');
|
|
|
|
if (*name != '>')
|
|
|
|
return -1;
|
|
|
|
dstlen = name - dstname;
|
|
|
|
name++;
|
|
|
|
} else {
|
|
|
|
dstname = name;
|
|
|
|
name = getzname(name);
|
|
|
|
dstlen = name - dstname; /* length of DST zone name */
|
|
|
|
}
|
|
|
|
if (*name != '\0' && *name != ',' && *name != ';') {
|
|
|
|
name = getoffset(name, &dstoffset);
|
|
|
|
if (name == NULL)
|
|
|
|
return -1;
|
|
|
|
} else dstoffset = stdoffset - SECSPERHOUR;
|
|
|
|
if (*name == '\0' && load_result != 0)
|
|
|
|
name = TZDEFRULESTRING;
|
|
|
|
if (*name == ',' || *name == ';') {
|
|
|
|
struct rule start;
|
|
|
|
struct rule end;
|
|
|
|
register int year;
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
register int yearlim;
|
2009-03-19 06:20:24 +01:00
|
|
|
register time_t janfirst;
|
|
|
|
time_t starttime;
|
|
|
|
time_t endtime;
|
|
|
|
|
|
|
|
++name;
|
|
|
|
if ((name = getrule(name, &start)) == NULL)
|
|
|
|
return -1;
|
|
|
|
if (*name++ != ',')
|
|
|
|
return -1;
|
|
|
|
if ((name = getrule(name, &end)) == NULL)
|
|
|
|
return -1;
|
|
|
|
if (*name != '\0')
|
|
|
|
return -1;
|
|
|
|
sp->typecnt = 2; /* standard time and DST */
|
|
|
|
/*
|
|
|
|
** Two transitions per year, from EPOCH_YEAR forward.
|
|
|
|
*/
|
2013-07-13 02:31:11 +02:00
|
|
|
sp->ttis[0] = sp->ttis[1] = zttinfo;
|
2009-03-19 06:20:24 +01:00
|
|
|
sp->ttis[0].tt_gmtoff = -dstoffset;
|
|
|
|
sp->ttis[0].tt_isdst = 1;
|
|
|
|
sp->ttis[0].tt_abbrind = stdlen + 1;
|
|
|
|
sp->ttis[1].tt_gmtoff = -stdoffset;
|
|
|
|
sp->ttis[1].tt_isdst = 0;
|
|
|
|
sp->ttis[1].tt_abbrind = 0;
|
|
|
|
atp = sp->ats;
|
|
|
|
typep = sp->types;
|
|
|
|
janfirst = 0;
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
yearlim = EPOCH_YEAR + YEARSPERREPEAT;
|
|
|
|
for (year = EPOCH_YEAR; year < yearlim; year++) {
|
|
|
|
int_fast32_t yearsecs;
|
2009-03-19 06:20:24 +01:00
|
|
|
|
|
|
|
starttime = transtime(janfirst, year, &start,
|
|
|
|
stdoffset);
|
|
|
|
endtime = transtime(janfirst, year, &end,
|
|
|
|
dstoffset);
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
yearsecs = (year_lengths[isleap(year)]
|
|
|
|
* SECSPERDAY);
|
|
|
|
if (starttime > endtime
|
|
|
|
|| (starttime < endtime
|
|
|
|
&& (endtime - starttime
|
|
|
|
< (yearsecs
|
|
|
|
+ (stdoffset - dstoffset))))) {
|
|
|
|
if (&sp->ats[TZ_MAX_TIMES - 2] < atp)
|
|
|
|
break;
|
|
|
|
yearlim = year + YEARSPERREPEAT + 1;
|
|
|
|
if (starttime > endtime) {
|
|
|
|
*atp++ = endtime;
|
|
|
|
*typep++ = 1; /* DST ends */
|
|
|
|
*atp++ = starttime;
|
|
|
|
*typep++ = 0; /* DST begins */
|
|
|
|
} else {
|
|
|
|
*atp++ = starttime;
|
|
|
|
*typep++ = 0; /* DST begins */
|
|
|
|
*atp++ = endtime;
|
|
|
|
*typep++ = 1; /* DST ends */
|
|
|
|
}
|
2009-03-19 06:20:24 +01:00
|
|
|
}
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
if (time_t_max - janfirst < yearsecs)
|
2009-03-19 06:20:24 +01:00
|
|
|
break;
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
janfirst += yearsecs;
|
2009-03-19 06:20:24 +01:00
|
|
|
}
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
sp->timecnt = atp - sp->ats;
|
|
|
|
if (!sp->timecnt)
|
|
|
|
sp->typecnt = 1; /* Perpetual DST. */
|
2009-03-19 06:20:24 +01:00
|
|
|
} else {
|
2013-07-13 02:31:11 +02:00
|
|
|
register int_fast32_t theirstdoffset;
|
|
|
|
register int_fast32_t theirdstoffset;
|
|
|
|
register int_fast32_t theiroffset;
|
2009-03-19 06:20:24 +01:00
|
|
|
register int isdst;
|
|
|
|
register int i;
|
|
|
|
register int j;
|
|
|
|
|
|
|
|
if (*name != '\0')
|
|
|
|
return -1;
|
|
|
|
/*
|
|
|
|
** Initial values of theirstdoffset and theirdstoffset.
|
|
|
|
*/
|
|
|
|
theirstdoffset = 0;
|
|
|
|
for (i = 0; i < sp->timecnt; ++i) {
|
|
|
|
j = sp->types[i];
|
|
|
|
if (!sp->ttis[j].tt_isdst) {
|
|
|
|
theirstdoffset =
|
|
|
|
-sp->ttis[j].tt_gmtoff;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
theirdstoffset = 0;
|
|
|
|
for (i = 0; i < sp->timecnt; ++i) {
|
|
|
|
j = sp->types[i];
|
|
|
|
if (sp->ttis[j].tt_isdst) {
|
|
|
|
theirdstoffset =
|
|
|
|
-sp->ttis[j].tt_gmtoff;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
** Initially we're assumed to be in standard time.
|
|
|
|
*/
|
|
|
|
isdst = FALSE;
|
|
|
|
theiroffset = theirstdoffset;
|
|
|
|
/*
|
|
|
|
** Now juggle transition times and types
|
|
|
|
** tracking offsets as you do.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < sp->timecnt; ++i) {
|
|
|
|
j = sp->types[i];
|
|
|
|
sp->types[i] = sp->ttis[j].tt_isdst;
|
|
|
|
if (sp->ttis[j].tt_ttisgmt) {
|
|
|
|
/* No adjustment to transition time */
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
** If summer time is in effect, and the
|
|
|
|
** transition time was not specified as
|
|
|
|
** standard time, add the summer time
|
|
|
|
** offset to the transition time;
|
|
|
|
** otherwise, add the standard time
|
|
|
|
** offset to the transition time.
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
** Transitions from DST to DDST
|
|
|
|
** will effectively disappear since
|
|
|
|
** POSIX provides for only one DST
|
|
|
|
** offset.
|
|
|
|
*/
|
|
|
|
if (isdst && !sp->ttis[j].tt_ttisstd) {
|
|
|
|
sp->ats[i] += dstoffset -
|
|
|
|
theirdstoffset;
|
|
|
|
} else {
|
|
|
|
sp->ats[i] += stdoffset -
|
|
|
|
theirstdoffset;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
theiroffset = -sp->ttis[j].tt_gmtoff;
|
|
|
|
if (sp->ttis[j].tt_isdst)
|
|
|
|
theirdstoffset = theiroffset;
|
|
|
|
else theirstdoffset = theiroffset;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
** Finally, fill in ttis.
|
|
|
|
*/
|
2013-07-13 02:31:11 +02:00
|
|
|
sp->ttis[0] = sp->ttis[1] = zttinfo;
|
2009-03-19 06:20:24 +01:00
|
|
|
sp->ttis[0].tt_gmtoff = -stdoffset;
|
|
|
|
sp->ttis[0].tt_isdst = FALSE;
|
|
|
|
sp->ttis[0].tt_abbrind = 0;
|
|
|
|
sp->ttis[1].tt_gmtoff = -dstoffset;
|
|
|
|
sp->ttis[1].tt_isdst = TRUE;
|
|
|
|
sp->ttis[1].tt_abbrind = stdlen + 1;
|
|
|
|
sp->typecnt = 2;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
dstlen = 0;
|
|
|
|
sp->typecnt = 1; /* only standard time */
|
|
|
|
sp->timecnt = 0;
|
2013-07-13 02:31:11 +02:00
|
|
|
sp->ttis[0] = zttinfo;
|
2009-03-19 06:20:24 +01:00
|
|
|
sp->ttis[0].tt_gmtoff = -stdoffset;
|
|
|
|
sp->ttis[0].tt_isdst = 0;
|
|
|
|
sp->ttis[0].tt_abbrind = 0;
|
|
|
|
}
|
|
|
|
sp->charcnt = stdlen + 1;
|
|
|
|
if (dstlen != 0)
|
|
|
|
sp->charcnt += dstlen + 1;
|
|
|
|
if ((size_t) sp->charcnt > sizeof sp->chars)
|
|
|
|
return -1;
|
|
|
|
cp = sp->chars;
|
|
|
|
(void) strncpy(cp, stdname, stdlen);
|
|
|
|
cp += stdlen;
|
|
|
|
*cp++ = '\0';
|
|
|
|
if (dstlen != 0) {
|
|
|
|
(void) strncpy(cp, dstname, dstlen);
|
|
|
|
*(cp + dstlen) = '\0';
|
|
|
|
}
|
|
|
|
return 0;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-07-13 02:31:11 +02:00
|
|
|
gmtload(struct state * const sp)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
if (tzload(gmt, sp, TRUE) != 0)
|
|
|
|
(void) tzparse(gmt, sp, TRUE);
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
#ifndef STD_INSPIRED
|
|
|
|
/*
|
|
|
|
** A non-static declaration of tzsetwall in a system header file
|
|
|
|
** may cause a warning about this upcoming static declaration...
|
|
|
|
*/
|
|
|
|
static
|
|
|
|
#endif /* !defined STD_INSPIRED */
|
|
|
|
void
|
|
|
|
tzsetwall(void)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
if (lcl_is_set < 0)
|
|
|
|
return;
|
|
|
|
lcl_is_set = -1;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
|
|
|
#ifdef ALL_STATE
|
2009-03-19 06:20:24 +01:00
|
|
|
if (lclptr == NULL) {
|
2013-07-13 02:31:11 +02:00
|
|
|
lclptr = calloc(1, sizeof *lclptr);
|
2009-03-19 06:20:24 +01:00
|
|
|
if (lclptr == NULL) {
|
|
|
|
settzname(); /* all we can do */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALL_STATE */
|
2013-07-13 02:31:11 +02:00
|
|
|
if (tzload(NULL, lclptr, TRUE) != 0)
|
2009-03-19 06:20:24 +01:00
|
|
|
gmtload(lclptr);
|
|
|
|
settzname();
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
#include <sys/system_properties.h> // For __system_property_get.
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
static void
|
2013-07-13 02:31:11 +02:00
|
|
|
tzset_locked(void)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register const char * name = NULL;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
name = getenv("TZ");
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
// try the "persist.sys.timezone" system property first
|
2013-07-13 02:31:11 +02:00
|
|
|
static char buf[PROP_VALUE_MAX];
|
|
|
|
if (name == NULL && __system_property_get("persist.sys.timezone", buf) > 0) {
|
2009-03-19 06:20:24 +01:00
|
|
|
name = buf;
|
2013-07-13 02:31:11 +02:00
|
|
|
}
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
if (name == NULL) {
|
|
|
|
tzsetwall();
|
|
|
|
return;
|
|
|
|
}
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
if (lcl_is_set > 0 && strcmp(lcl_TZname, name) == 0)
|
|
|
|
return;
|
|
|
|
lcl_is_set = strlen(name) < sizeof lcl_TZname;
|
|
|
|
if (lcl_is_set)
|
|
|
|
(void) strcpy(lcl_TZname, name);
|
2009-03-04 04:28:35 +01:00
|
|
|
|
|
|
|
#ifdef ALL_STATE
|
2009-03-19 06:20:24 +01:00
|
|
|
if (lclptr == NULL) {
|
2013-07-13 02:31:11 +02:00
|
|
|
lclptr = calloc(1, sizeof *lclptr);
|
2009-03-19 06:20:24 +01:00
|
|
|
if (lclptr == NULL) {
|
|
|
|
settzname(); /* all we can do */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALL_STATE */
|
2009-03-19 06:20:24 +01:00
|
|
|
if (*name == '\0') {
|
|
|
|
/*
|
|
|
|
** User wants it fast rather than right.
|
|
|
|
*/
|
|
|
|
lclptr->leapcnt = 0; /* so, we're off a little */
|
|
|
|
lclptr->timecnt = 0;
|
|
|
|
lclptr->typecnt = 0;
|
|
|
|
lclptr->ttis[0].tt_isdst = 0;
|
|
|
|
lclptr->ttis[0].tt_gmtoff = 0;
|
|
|
|
lclptr->ttis[0].tt_abbrind = 0;
|
|
|
|
(void) strcpy(lclptr->chars, gmt);
|
|
|
|
} else if (tzload(name, lclptr, TRUE) != 0)
|
|
|
|
if (name[0] == ':' || tzparse(name, lclptr, FALSE) != 0)
|
|
|
|
(void) gmtload(lclptr);
|
|
|
|
settzname();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2013-07-13 02:31:11 +02:00
|
|
|
tzset(void)
|
2009-03-19 06:20:24 +01:00
|
|
|
{
|
|
|
|
_tzLock();
|
|
|
|
tzset_locked();
|
|
|
|
_tzUnlock();
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** 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.)
|
|
|
|
**
|
|
|
|
** The unused offset argument is for the benefit of mktime variants.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*ARGSUSED*/
|
|
|
|
static struct tm *
|
2013-07-13 02:31:11 +02:00
|
|
|
localsub(const time_t * const timep, const int_fast32_t offset,
|
|
|
|
struct tm * const tmp, const struct state * sp) // android-changed: added sp.
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register const struct ttinfo * ttisp;
|
|
|
|
register int i;
|
|
|
|
register struct tm * result;
|
|
|
|
const time_t t = *timep;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2013-01-16 19:34:33 +01:00
|
|
|
// BEGIN android-changed: support user-supplied sp.
|
|
|
|
if (sp == NULL) {
|
|
|
|
sp = lclptr;
|
|
|
|
}
|
|
|
|
// END android-changed
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifdef ALL_STATE
|
2009-03-19 06:20:24 +01:00
|
|
|
if (sp == NULL)
|
2013-01-16 19:34:33 +01:00
|
|
|
return gmtsub(timep, offset, tmp, sp); // android-changed: added sp.
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALL_STATE */
|
2009-03-19 06:20:24 +01:00
|
|
|
if ((sp->goback && t < sp->ats[0]) ||
|
|
|
|
(sp->goahead && t > sp->ats[sp->timecnt - 1])) {
|
|
|
|
time_t newt = t;
|
|
|
|
register time_t seconds;
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
register time_t years;
|
2009-03-19 06:20:24 +01:00
|
|
|
|
|
|
|
if (t < sp->ats[0])
|
|
|
|
seconds = sp->ats[0] - t;
|
|
|
|
else seconds = t - sp->ats[sp->timecnt - 1];
|
|
|
|
--seconds;
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
years = (seconds / SECSPERREPEAT + 1) * YEARSPERREPEAT;
|
|
|
|
seconds = years * AVGSECSPERYEAR;
|
2009-03-19 06:20:24 +01:00
|
|
|
if (t < sp->ats[0])
|
|
|
|
newt += seconds;
|
|
|
|
else newt -= seconds;
|
|
|
|
if (newt < sp->ats[0] ||
|
|
|
|
newt > sp->ats[sp->timecnt - 1])
|
|
|
|
return NULL; /* "cannot happen" */
|
2013-01-16 19:34:33 +01:00
|
|
|
result = localsub(&newt, offset, tmp, sp); // android-changed: added sp.
|
2009-03-19 06:20:24 +01:00
|
|
|
if (result == tmp) {
|
|
|
|
register time_t newy;
|
|
|
|
|
|
|
|
newy = tmp->tm_year;
|
|
|
|
if (t < sp->ats[0])
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
newy -= years;
|
|
|
|
else newy += years;
|
2009-03-19 06:20:24 +01:00
|
|
|
tmp->tm_year = newy;
|
|
|
|
if (tmp->tm_year != newy)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
if (sp->timecnt == 0 || t < sp->ats[0]) {
|
2013-07-13 02:31:11 +02:00
|
|
|
i = sp->defaulttype;
|
2009-03-19 06:20:24 +01:00
|
|
|
} else {
|
|
|
|
register int lo = 1;
|
|
|
|
register int hi = sp->timecnt;
|
|
|
|
|
|
|
|
while (lo < hi) {
|
|
|
|
register int mid = (lo + hi) >> 1;
|
|
|
|
|
|
|
|
if (t < sp->ats[mid])
|
|
|
|
hi = mid;
|
|
|
|
else lo = mid + 1;
|
|
|
|
}
|
|
|
|
i = (int) sp->types[lo - 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);
|
|
|
|
*/
|
|
|
|
result = timesub(&t, ttisp->tt_gmtoff, sp, tmp);
|
|
|
|
tmp->tm_isdst = ttisp->tt_isdst;
|
|
|
|
tzname[tmp->tm_isdst] = &sp->chars[ttisp->tt_abbrind];
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifdef TM_ZONE
|
2009-03-19 06:20:24 +01:00
|
|
|
tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind];
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined TM_ZONE */
|
2009-03-19 06:20:24 +01:00
|
|
|
return result;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
struct tm *
|
2013-07-13 02:31:11 +02:00
|
|
|
localtime(const time_t * const timep)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
return localtime_r(timep, &tmGlobal);
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Re-entrant version of localtime.
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct tm *
|
2013-07-13 02:31:11 +02:00
|
|
|
localtime_r(const time_t * const timep, struct tm * tmp)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
struct tm* result;
|
|
|
|
|
|
|
|
_tzLock();
|
|
|
|
tzset_locked();
|
2013-01-16 19:34:33 +01:00
|
|
|
result = localsub(timep, 0L, tmp, NULL); // android-changed: extra parameter.
|
2009-03-19 06:20:24 +01:00
|
|
|
_tzUnlock();
|
|
|
|
|
|
|
|
return result;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** gmtsub is to gmtime as localsub is to localtime.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct tm *
|
2013-07-13 02:31:11 +02:00
|
|
|
gmtsub(const time_t * const timep, const int_fast32_t offset,
|
|
|
|
struct tm *const tmp, const struct state * sp) // android-changed: added sp.
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register struct tm * result;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2013-01-16 19:34:33 +01:00
|
|
|
(void) sp; // android-added: unused.
|
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
if (!gmt_is_set) {
|
|
|
|
gmt_is_set = TRUE;
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifdef ALL_STATE
|
2013-07-13 02:31:11 +02:00
|
|
|
gmtptr = calloc(1, sizeof *gmtptr);
|
2009-03-19 06:20:24 +01:00
|
|
|
if (gmtptr != NULL)
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALL_STATE */
|
2009-03-19 06:20:24 +01:00
|
|
|
gmtload(gmtptr);
|
|
|
|
}
|
|
|
|
result = timesub(timep, offset, gmtptr, tmp);
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifdef TM_ZONE
|
2009-03-19 06:20:24 +01:00
|
|
|
/*
|
|
|
|
** Could get fancy here and deliver something such as
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
** "UT+xxxx" or "UT-xxxx" if offset is non-zero,
|
2009-03-19 06:20:24 +01:00
|
|
|
** but this is no time for a treasure hunt.
|
|
|
|
*/
|
|
|
|
if (offset != 0)
|
|
|
|
tmp->TM_ZONE = wildabbr;
|
|
|
|
else {
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifdef ALL_STATE
|
2009-03-19 06:20:24 +01:00
|
|
|
if (gmtptr == NULL)
|
|
|
|
tmp->TM_ZONE = gmt;
|
|
|
|
else tmp->TM_ZONE = gmtptr->chars;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALL_STATE */
|
|
|
|
#ifndef ALL_STATE
|
2009-03-19 06:20:24 +01:00
|
|
|
tmp->TM_ZONE = gmtptr->chars;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* State Farm */
|
2009-03-19 06:20:24 +01:00
|
|
|
}
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined TM_ZONE */
|
2009-03-19 06:20:24 +01:00
|
|
|
return result;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
struct tm *
|
2013-07-13 02:31:11 +02:00
|
|
|
gmtime(const time_t * const timep)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
return gmtime_r(timep, &tmGlobal);
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Re-entrant version of gmtime.
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct tm *
|
2013-07-13 02:31:11 +02:00
|
|
|
gmtime_r(const time_t * const timep, struct tm * tmp)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
struct tm* result;
|
|
|
|
|
|
|
|
_tzLock();
|
2013-01-16 19:34:33 +01:00
|
|
|
result = gmtsub(timep, 0L, tmp, NULL); // android-changed: extra parameter.
|
2009-03-19 06:20:24 +01:00
|
|
|
_tzUnlock();
|
|
|
|
|
|
|
|
return result;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Return the number of leap years through the end of the given year
|
|
|
|
** where, to make the math easy, the answer for year zero is defined as zero.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
2013-07-13 02:31:11 +02:00
|
|
|
leaps_thru_end_of(register const int y)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
return (y >= 0) ? (y / 4 - y / 100 + y / 400) :
|
|
|
|
-(leaps_thru_end_of(-(y + 1)) + 1);
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct tm *
|
2013-07-13 02:31:11 +02:00
|
|
|
timesub(const time_t *const timep, const int_fast32_t offset,
|
|
|
|
register const struct state *const sp,
|
|
|
|
register struct tm *const tmp)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register const struct lsinfo * lp;
|
|
|
|
register time_t tdays;
|
|
|
|
register int idays; /* unsigned would be so 2003 */
|
2013-07-13 02:31:11 +02:00
|
|
|
register int_fast64_t rem;
|
2009-03-19 06:20:24 +01:00
|
|
|
int y;
|
|
|
|
register const int * ip;
|
2013-07-13 02:31:11 +02:00
|
|
|
register int_fast64_t corr;
|
2009-03-19 06:20:24 +01:00
|
|
|
register int hit;
|
|
|
|
register int i;
|
|
|
|
|
|
|
|
corr = 0;
|
|
|
|
hit = 0;
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifdef ALL_STATE
|
2009-03-19 06:20:24 +01:00
|
|
|
i = (sp == NULL) ? 0 : sp->leapcnt;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALL_STATE */
|
|
|
|
#ifndef ALL_STATE
|
2009-03-19 06:20:24 +01:00
|
|
|
i = sp->leapcnt;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* State Farm */
|
2009-03-19 06:20:24 +01:00
|
|
|
while (--i >= 0) {
|
|
|
|
lp = &sp->lsis[i];
|
|
|
|
if (*timep >= lp->ls_trans) {
|
|
|
|
if (*timep == lp->ls_trans) {
|
|
|
|
hit = ((i == 0 && lp->ls_corr > 0) ||
|
|
|
|
lp->ls_corr > sp->lsis[i - 1].ls_corr);
|
|
|
|
if (hit)
|
|
|
|
while (i > 0 &&
|
|
|
|
sp->lsis[i].ls_trans ==
|
|
|
|
sp->lsis[i - 1].ls_trans + 1 &&
|
|
|
|
sp->lsis[i].ls_corr ==
|
|
|
|
sp->lsis[i - 1].ls_corr + 1) {
|
|
|
|
++hit;
|
|
|
|
--i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
corr = lp->ls_corr;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
y = EPOCH_YEAR;
|
|
|
|
tdays = *timep / SECSPERDAY;
|
|
|
|
rem = *timep - tdays * SECSPERDAY;
|
|
|
|
while (tdays < 0 || tdays >= year_lengths[isleap(y)]) {
|
|
|
|
int newy;
|
|
|
|
register time_t tdelta;
|
|
|
|
register int idelta;
|
|
|
|
register int leapdays;
|
|
|
|
|
|
|
|
tdelta = tdays / DAYSPERLYEAR;
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
if (! ((! TYPE_SIGNED(time_t) || INT_MIN <= tdelta)
|
|
|
|
&& tdelta <= INT_MAX))
|
|
|
|
return NULL;
|
2009-03-19 06:20:24 +01:00
|
|
|
idelta = tdelta;
|
|
|
|
if (idelta == 0)
|
|
|
|
idelta = (tdays < 0) ? -1 : 1;
|
|
|
|
newy = y;
|
|
|
|
if (increment_overflow(&newy, idelta))
|
|
|
|
return NULL;
|
|
|
|
leapdays = leaps_thru_end_of(newy - 1) -
|
|
|
|
leaps_thru_end_of(y - 1);
|
|
|
|
tdays -= ((time_t) newy - y) * DAYSPERNYEAR;
|
|
|
|
tdays -= leapdays;
|
|
|
|
y = newy;
|
|
|
|
}
|
|
|
|
{
|
2013-07-13 02:31:11 +02:00
|
|
|
register int_fast32_t seconds;
|
2009-03-19 06:20:24 +01:00
|
|
|
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
seconds = tdays * SECSPERDAY;
|
2009-03-19 06:20:24 +01:00
|
|
|
tdays = seconds / SECSPERDAY;
|
|
|
|
rem += seconds - tdays * SECSPERDAY;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
** Given the range, we can now fearlessly cast...
|
|
|
|
*/
|
|
|
|
idays = tdays;
|
|
|
|
rem += offset - corr;
|
|
|
|
while (rem < 0) {
|
|
|
|
rem += SECSPERDAY;
|
|
|
|
--idays;
|
|
|
|
}
|
|
|
|
while (rem >= SECSPERDAY) {
|
|
|
|
rem -= SECSPERDAY;
|
|
|
|
++idays;
|
|
|
|
}
|
|
|
|
while (idays < 0) {
|
|
|
|
if (increment_overflow(&y, -1))
|
|
|
|
return NULL;
|
|
|
|
idays += year_lengths[isleap(y)];
|
|
|
|
}
|
|
|
|
while (idays >= year_lengths[isleap(y)]) {
|
|
|
|
idays -= year_lengths[isleap(y)];
|
|
|
|
if (increment_overflow(&y, 1))
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
tmp->tm_year = y;
|
|
|
|
if (increment_overflow(&tmp->tm_year, -TM_YEAR_BASE))
|
|
|
|
return NULL;
|
|
|
|
tmp->tm_yday = idays;
|
|
|
|
/*
|
|
|
|
** The "extra" mods below avoid overflow problems.
|
|
|
|
*/
|
|
|
|
tmp->tm_wday = EPOCH_WDAY +
|
|
|
|
((y - EPOCH_YEAR) % DAYSPERWEEK) *
|
|
|
|
(DAYSPERNYEAR % DAYSPERWEEK) +
|
|
|
|
leaps_thru_end_of(y - 1) -
|
|
|
|
leaps_thru_end_of(EPOCH_YEAR - 1) +
|
|
|
|
idays;
|
|
|
|
tmp->tm_wday %= DAYSPERWEEK;
|
|
|
|
if (tmp->tm_wday < 0)
|
|
|
|
tmp->tm_wday += DAYSPERWEEK;
|
|
|
|
tmp->tm_hour = (int) (rem / SECSPERHOUR);
|
|
|
|
rem %= SECSPERHOUR;
|
|
|
|
tmp->tm_min = (int) (rem / SECSPERMIN);
|
|
|
|
/*
|
|
|
|
** A positive leap second requires a special
|
|
|
|
** representation. This uses "... ??:59:60" et seq.
|
|
|
|
*/
|
|
|
|
tmp->tm_sec = (int) (rem % SECSPERMIN) + hit;
|
|
|
|
ip = mon_lengths[isleap(y)];
|
|
|
|
for (tmp->tm_mon = 0; idays >= ip[tmp->tm_mon]; ++(tmp->tm_mon))
|
|
|
|
idays -= ip[tmp->tm_mon];
|
|
|
|
tmp->tm_mday = (int) (idays + 1);
|
|
|
|
tmp->tm_isdst = 0;
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifdef TM_GMTOFF
|
2009-03-19 06:20:24 +01:00
|
|
|
tmp->TM_GMTOFF = offset;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined TM_GMTOFF */
|
2009-03-19 06:20:24 +01:00
|
|
|
return tmp;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
2013-07-13 02:31:11 +02:00
|
|
|
ctime(const time_t * const timep)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
** Section 4.12.3.2 of X3.159-1989 requires that
|
2009-03-19 06:20:24 +01:00
|
|
|
** The ctime function converts the calendar time pointed to by timer
|
|
|
|
** to local time in the form of a string. It is equivalent to
|
|
|
|
** asctime(localtime(timer))
|
2009-03-04 04:28:35 +01:00
|
|
|
*/
|
2009-03-19 06:20:24 +01:00
|
|
|
return asctime(localtime(timep));
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
2013-07-13 02:31:11 +02:00
|
|
|
ctime_r(const time_t * const timep, char * buf)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
struct tm mytm;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
return asctime_r(localtime_r(timep, &mytm), buf);
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Adapted from code provided by Robert Elz, who writes:
|
2009-03-19 06:20:24 +01:00
|
|
|
** The "best" way to do mktime I think is based on an idea of Bob
|
|
|
|
** Kridle's (so its said...) from a long time ago.
|
|
|
|
** It does a binary search of the time_t space. Since time_t's are
|
|
|
|
** just 32 bits, its a max of 32 iterations (even at 64 bits it
|
|
|
|
** would still be very reasonable).
|
2009-03-04 04:28:35 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef WRONG
|
2009-03-19 06:20:24 +01:00
|
|
|
#define WRONG (-1)
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* !defined WRONG */
|
|
|
|
|
|
|
|
/*
|
2013-07-13 02:31:11 +02:00
|
|
|
** Normalize logic courtesy Paul Eggert.
|
2009-03-04 04:28:35 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
2013-07-13 02:31:11 +02:00
|
|
|
increment_overflow(int *const ip, int j)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2013-07-13 02:31:11 +02:00
|
|
|
register int const i = *ip;
|
|
|
|
|
|
|
|
/*
|
|
|
|
** If i >= 0 there can only be overflow if i + j > INT_MAX
|
|
|
|
** or if j > INT_MAX - i; given i >= 0, INT_MAX - i cannot overflow.
|
|
|
|
** If i < 0 there can only be overflow if i + j < INT_MIN
|
|
|
|
** or if j < INT_MIN - i; given i < 0, INT_MIN - i cannot overflow.
|
|
|
|
*/
|
|
|
|
if ((i >= 0) ? (j > INT_MAX - i) : (j < INT_MIN - i))
|
|
|
|
return TRUE;
|
|
|
|
*ip += j;
|
|
|
|
return FALSE;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-07-13 02:31:11 +02:00
|
|
|
increment_overflow32(int_fast32_t *const lp, int const m)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2013-07-13 02:31:11 +02:00
|
|
|
register int_fast32_t const l = *lp;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
if ((l >= 0) ? (m > INT_FAST32_MAX - l) : (m < INT_FAST32_MIN - l))
|
|
|
|
return TRUE;
|
|
|
|
*lp += m;
|
|
|
|
return FALSE;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-07-13 02:31:11 +02:00
|
|
|
normalize_overflow(int *const tensptr, int *const unitsptr, const int base)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2013-07-13 02:31:11 +02:00
|
|
|
register int tensdelta;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
tensdelta = (*unitsptr >= 0) ?
|
|
|
|
(*unitsptr / base) :
|
|
|
|
(-1 - (-1 - *unitsptr) / base);
|
|
|
|
*unitsptr -= tensdelta * base;
|
|
|
|
return increment_overflow(tensptr, tensdelta);
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-07-13 02:31:11 +02:00
|
|
|
normalize_overflow32(int_fast32_t *const tensptr, int *const unitsptr,
|
|
|
|
const int base)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2013-07-13 02:31:11 +02:00
|
|
|
register int tensdelta;
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
tensdelta = (*unitsptr >= 0) ?
|
|
|
|
(*unitsptr / base) :
|
|
|
|
(-1 - (-1 - *unitsptr) / base);
|
|
|
|
*unitsptr -= tensdelta * base;
|
|
|
|
return increment_overflow32(tensptr, tensdelta);
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-07-13 02:31:11 +02:00
|
|
|
tmcomp(register const struct tm * const atmp,
|
|
|
|
register const struct tm * const btmp)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register int result;
|
|
|
|
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
if (atmp->tm_year != btmp->tm_year)
|
|
|
|
return atmp->tm_year < btmp->tm_year ? -1 : 1;
|
|
|
|
if ((result = (atmp->tm_mon - btmp->tm_mon)) == 0 &&
|
2009-03-19 06:20:24 +01:00
|
|
|
(result = (atmp->tm_mday - btmp->tm_mday)) == 0 &&
|
|
|
|
(result = (atmp->tm_hour - btmp->tm_hour)) == 0 &&
|
|
|
|
(result = (atmp->tm_min - btmp->tm_min)) == 0)
|
|
|
|
result = atmp->tm_sec - btmp->tm_sec;
|
|
|
|
return result;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static time_t
|
2013-07-13 02:31:11 +02:00
|
|
|
time2sub(struct tm * const tmp,
|
|
|
|
struct tm *(*const funcp)(const time_t*, int_fast32_t, struct tm*, const struct state*),
|
|
|
|
const int_fast32_t offset,
|
|
|
|
int * const okayp,
|
|
|
|
const int do_norm_secs, const struct state * sp) // android-changed: added sp
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register int dir;
|
|
|
|
register int i, j;
|
|
|
|
register int saved_seconds;
|
2013-07-13 02:31:11 +02:00
|
|
|
register int_fast32_t li;
|
2009-03-19 06:20:24 +01:00
|
|
|
register time_t lo;
|
|
|
|
register time_t hi;
|
2013-07-13 02:31:11 +02:00
|
|
|
int_fast32_t y;
|
2009-03-19 06:20:24 +01:00
|
|
|
time_t newt;
|
|
|
|
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;
|
|
|
|
y = yourtm.tm_year;
|
2013-07-13 02:31:11 +02:00
|
|
|
if (normalize_overflow32(&y, &yourtm.tm_mon, MONSPERYEAR))
|
2009-03-19 06:20:24 +01:00
|
|
|
return WRONG;
|
|
|
|
/*
|
|
|
|
** Turn y into an actual year number for now.
|
|
|
|
** It is converted back to an offset from TM_YEAR_BASE later.
|
|
|
|
*/
|
2013-07-13 02:31:11 +02:00
|
|
|
if (increment_overflow32(&y, TM_YEAR_BASE))
|
2009-03-19 06:20:24 +01:00
|
|
|
return WRONG;
|
|
|
|
while (yourtm.tm_mday <= 0) {
|
2013-07-13 02:31:11 +02:00
|
|
|
if (increment_overflow32(&y, -1))
|
2009-03-19 06:20:24 +01:00
|
|
|
return WRONG;
|
|
|
|
li = y + (1 < yourtm.tm_mon);
|
|
|
|
yourtm.tm_mday += year_lengths[isleap(li)];
|
|
|
|
}
|
|
|
|
while (yourtm.tm_mday > DAYSPERLYEAR) {
|
|
|
|
li = y + (1 < yourtm.tm_mon);
|
|
|
|
yourtm.tm_mday -= year_lengths[isleap(li)];
|
2013-07-13 02:31:11 +02:00
|
|
|
if (increment_overflow32(&y, 1))
|
2009-03-19 06:20:24 +01:00
|
|
|
return WRONG;
|
|
|
|
}
|
|
|
|
for ( ; ; ) {
|
|
|
|
i = mon_lengths[isleap(y)][yourtm.tm_mon];
|
|
|
|
if (yourtm.tm_mday <= i)
|
|
|
|
break;
|
|
|
|
yourtm.tm_mday -= i;
|
|
|
|
if (++yourtm.tm_mon >= MONSPERYEAR) {
|
|
|
|
yourtm.tm_mon = 0;
|
2013-07-13 02:31:11 +02:00
|
|
|
if (increment_overflow32(&y, 1))
|
2009-03-19 06:20:24 +01:00
|
|
|
return WRONG;
|
|
|
|
}
|
|
|
|
}
|
2013-07-13 02:31:11 +02:00
|
|
|
if (increment_overflow32(&y, -TM_YEAR_BASE))
|
2009-03-19 06:20:24 +01:00
|
|
|
return WRONG;
|
|
|
|
yourtm.tm_year = y;
|
|
|
|
if (yourtm.tm_year != y)
|
|
|
|
return WRONG;
|
|
|
|
if (yourtm.tm_sec >= 0 && yourtm.tm_sec < SECSPERMIN)
|
|
|
|
saved_seconds = 0;
|
|
|
|
else if (y + TM_YEAR_BASE < EPOCH_YEAR) {
|
|
|
|
/*
|
|
|
|
** We can't set tm_sec to 0, because that might push the
|
|
|
|
** time below the minimum representable time.
|
|
|
|
** Set tm_sec to 59 instead.
|
|
|
|
** This assumes that the minimum representable time is
|
|
|
|
** not in the same minute that a leap second was deleted from,
|
|
|
|
** 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 {
|
|
|
|
saved_seconds = yourtm.tm_sec;
|
|
|
|
yourtm.tm_sec = 0;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
** Do a binary search (this works whatever time_t's type is).
|
|
|
|
*/
|
|
|
|
if (!TYPE_SIGNED(time_t)) {
|
|
|
|
lo = 0;
|
|
|
|
hi = lo - 1;
|
|
|
|
} else {
|
|
|
|
lo = 1;
|
|
|
|
for (i = 0; i < (int) TYPE_BIT(time_t) - 1; ++i)
|
|
|
|
lo *= 2;
|
|
|
|
hi = -(lo + 1);
|
|
|
|
}
|
|
|
|
for ( ; ; ) {
|
|
|
|
t = lo / 2 + hi / 2;
|
|
|
|
if (t < lo)
|
|
|
|
t = lo;
|
|
|
|
else if (t > hi)
|
|
|
|
t = hi;
|
2013-01-16 19:34:33 +01:00
|
|
|
if ((*funcp)(&t, offset, &mytm, sp) == NULL) { // android-changed: added sp.
|
2009-03-19 06:20:24 +01:00
|
|
|
/*
|
|
|
|
** Assume that t is too extreme to be represented in
|
|
|
|
** a struct tm; arrange things so that it is less
|
|
|
|
** extreme on the next pass.
|
|
|
|
*/
|
|
|
|
dir = (t > 0) ? 1 : -1;
|
|
|
|
} else dir = tmcomp(&mytm, &yourtm);
|
|
|
|
if (dir != 0) {
|
|
|
|
if (t == lo) {
|
2013-08-22 23:13:50 +02:00
|
|
|
if (t == time_t_max)
|
2013-07-13 02:31:11 +02:00
|
|
|
return WRONG;
|
2013-08-22 23:13:50 +02:00
|
|
|
++t;
|
2009-03-19 06:20:24 +01:00
|
|
|
++lo;
|
|
|
|
} else if (t == hi) {
|
2013-08-22 23:13:50 +02:00
|
|
|
if (t == time_t_min)
|
2013-07-13 02:31:11 +02:00
|
|
|
return WRONG;
|
2013-08-22 23:13:50 +02:00
|
|
|
--t;
|
2009-03-19 06:20:24 +01:00
|
|
|
--hi;
|
|
|
|
}
|
|
|
|
if (lo > hi)
|
|
|
|
return WRONG;
|
|
|
|
if (dir > 0)
|
|
|
|
hi = t;
|
|
|
|
else lo = t;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (yourtm.tm_isdst < 0 || mytm.tm_isdst == yourtm.tm_isdst)
|
|
|
|
break;
|
|
|
|
/*
|
|
|
|
** Right time, wrong type.
|
|
|
|
** Hunt for right time, right type.
|
|
|
|
** It's okay to guess wrong since the guess
|
|
|
|
** gets checked.
|
|
|
|
*/
|
2013-01-16 19:34:33 +01:00
|
|
|
// BEGIN android-changed: support user-supplied sp
|
|
|
|
if (sp == NULL) {
|
|
|
|
sp = (const struct state *)
|
2013-07-13 02:31:11 +02:00
|
|
|
((funcp == localsub) ? lclptr : gmtptr);
|
2013-01-16 19:34:33 +01:00
|
|
|
}
|
|
|
|
// END android-changed
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifdef ALL_STATE
|
2009-03-19 06:20:24 +01:00
|
|
|
if (sp == NULL)
|
|
|
|
return WRONG;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALL_STATE */
|
2009-03-19 06:20:24 +01:00
|
|
|
for (i = sp->typecnt - 1; i >= 0; --i) {
|
|
|
|
if (sp->ttis[i].tt_isdst != yourtm.tm_isdst)
|
|
|
|
continue;
|
|
|
|
for (j = sp->typecnt - 1; j >= 0; --j) {
|
|
|
|
if (sp->ttis[j].tt_isdst == yourtm.tm_isdst)
|
|
|
|
continue;
|
|
|
|
newt = t + sp->ttis[j].tt_gmtoff -
|
|
|
|
sp->ttis[i].tt_gmtoff;
|
2013-01-16 19:34:33 +01:00
|
|
|
if ((*funcp)(&newt, offset, &mytm, sp) == NULL) // android-changed: added sp.
|
2009-03-19 06:20:24 +01:00
|
|
|
continue;
|
|
|
|
if (tmcomp(&mytm, &yourtm) != 0)
|
|
|
|
continue;
|
|
|
|
if (mytm.tm_isdst != yourtm.tm_isdst)
|
|
|
|
continue;
|
|
|
|
/*
|
|
|
|
** We have a match.
|
|
|
|
*/
|
|
|
|
t = newt;
|
|
|
|
goto label;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return WRONG;
|
|
|
|
}
|
2009-03-04 04:28:35 +01:00
|
|
|
label:
|
2009-03-19 06:20:24 +01:00
|
|
|
newt = t + saved_seconds;
|
|
|
|
if ((newt < t) != (saved_seconds < 0))
|
|
|
|
return WRONG;
|
|
|
|
t = newt;
|
2013-01-16 19:34:33 +01:00
|
|
|
if ((*funcp)(&t, offset, tmp, sp)) // android-changed: added sp.
|
2009-03-19 06:20:24 +01:00
|
|
|
*okayp = TRUE;
|
|
|
|
return t;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static time_t
|
2013-07-13 02:31:11 +02:00
|
|
|
time2(struct tm * const tmp,
|
|
|
|
struct tm * (*const funcp)(const time_t *, int_fast32_t, struct tm *, const struct state *), // android-changed: added sp.
|
|
|
|
const int_fast32_t offset,
|
|
|
|
int *const okayp, const struct state* sp) // android-changed: added sp.
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
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.
|
|
|
|
*/
|
2013-01-16 19:34:33 +01:00
|
|
|
t = time2sub(tmp, funcp, offset, okayp, FALSE, sp);
|
|
|
|
return *okayp ? t : time2sub(tmp, funcp, offset, okayp, TRUE, sp);
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static time_t
|
2013-07-13 02:31:11 +02:00
|
|
|
time1(struct tm * const tmp,
|
|
|
|
struct tm * (* const funcp) (const time_t *, int_fast32_t, struct tm *, const struct state *), // android-changed: added sp.
|
|
|
|
const int_fast32_t offset, const struct state * sp) // android-changed: added sp.
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
register time_t t;
|
|
|
|
register int samei, otheri;
|
|
|
|
register int sameind, otherind;
|
|
|
|
register int i;
|
|
|
|
register int nseen;
|
|
|
|
int seen[TZ_MAX_TYPES];
|
|
|
|
int types[TZ_MAX_TYPES];
|
|
|
|
int okay;
|
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
if (tmp == NULL) {
|
|
|
|
errno = EINVAL;
|
|
|
|
return WRONG;
|
|
|
|
}
|
2009-03-19 06:20:24 +01:00
|
|
|
if (tmp->tm_isdst > 1)
|
|
|
|
tmp->tm_isdst = 1;
|
2013-01-16 19:34:33 +01:00
|
|
|
t = time2(tmp, funcp, offset, &okay, sp); // android-changed: added sp.
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifdef PCTS
|
2009-03-19 06:20:24 +01:00
|
|
|
/*
|
|
|
|
** PCTS code courtesy Grant Sullivan.
|
|
|
|
*/
|
|
|
|
if (okay)
|
|
|
|
return t;
|
|
|
|
if (tmp->tm_isdst < 0)
|
|
|
|
tmp->tm_isdst = 0; /* reset to std and try again */
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined PCTS */
|
|
|
|
#ifndef PCTS
|
2009-03-19 06:20:24 +01:00
|
|
|
if (okay || tmp->tm_isdst < 0)
|
|
|
|
return t;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* !defined PCTS */
|
2009-03-19 06:20:24 +01:00
|
|
|
/*
|
|
|
|
** 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.
|
|
|
|
** We try to divine the type they started from and adjust to the
|
|
|
|
** type they need.
|
|
|
|
*/
|
2013-01-16 19:34:33 +01:00
|
|
|
// BEGIN android-changed: support user-supplied sp.
|
|
|
|
if (sp == NULL) {
|
2013-07-13 02:31:11 +02:00
|
|
|
sp = (const struct state *) ((funcp == localsub) ? lclptr : gmtptr);
|
2013-01-16 19:34:33 +01:00
|
|
|
}
|
|
|
|
// BEGIN android-changed
|
2009-03-04 04:28:35 +01:00
|
|
|
#ifdef ALL_STATE
|
2009-03-19 06:20:24 +01:00
|
|
|
if (sp == NULL)
|
|
|
|
return WRONG;
|
2009-03-04 04:28:35 +01:00
|
|
|
#endif /* defined ALL_STATE */
|
2009-03-19 06:20:24 +01:00
|
|
|
for (i = 0; i < sp->typecnt; ++i)
|
|
|
|
seen[i] = FALSE;
|
|
|
|
nseen = 0;
|
|
|
|
for (i = sp->timecnt - 1; i >= 0; --i)
|
|
|
|
if (!seen[sp->types[i]]) {
|
|
|
|
seen[sp->types[i]] = TRUE;
|
|
|
|
types[nseen++] = sp->types[i];
|
|
|
|
}
|
|
|
|
for (sameind = 0; sameind < nseen; ++sameind) {
|
|
|
|
samei = types[sameind];
|
|
|
|
if (sp->ttis[samei].tt_isdst != tmp->tm_isdst)
|
|
|
|
continue;
|
|
|
|
for (otherind = 0; otherind < nseen; ++otherind) {
|
|
|
|
otheri = types[otherind];
|
|
|
|
if (sp->ttis[otheri].tt_isdst == tmp->tm_isdst)
|
|
|
|
continue;
|
|
|
|
tmp->tm_sec += sp->ttis[otheri].tt_gmtoff -
|
|
|
|
sp->ttis[samei].tt_gmtoff;
|
|
|
|
tmp->tm_isdst = !tmp->tm_isdst;
|
2013-01-16 19:34:33 +01:00
|
|
|
t = time2(tmp, funcp, offset, &okay, sp); // android-changed: added sp.
|
2009-03-19 06:20:24 +01:00
|
|
|
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;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
time_t
|
2013-07-13 02:31:11 +02:00
|
|
|
mktime(struct tm * const tmp)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
_tzLock();
|
|
|
|
tzset_locked();
|
2013-07-13 02:31:11 +02:00
|
|
|
time_t result = time1(tmp, localsub, 0L, NULL); // android-changed: extra parameter.
|
2009-03-19 06:20:24 +01:00
|
|
|
_tzUnlock();
|
|
|
|
return result;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef STD_INSPIRED
|
|
|
|
|
|
|
|
time_t
|
2013-07-13 02:31:11 +02:00
|
|
|
timelocal(struct tm * const tmp)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2013-07-13 02:31:11 +02:00
|
|
|
if (tmp != NULL)
|
|
|
|
tmp->tm_isdst = -1; /* in case it wasn't initialized */
|
2009-03-19 06:20:24 +01:00
|
|
|
return mktime(tmp);
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
time_t
|
2013-07-13 02:31:11 +02:00
|
|
|
timegm(struct tm * const tmp)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
time_t result;
|
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
if (tmp != NULL)
|
|
|
|
tmp->tm_isdst = 0;
|
2009-03-19 06:20:24 +01:00
|
|
|
_tzLock();
|
2013-01-16 19:34:33 +01:00
|
|
|
result = time1(tmp, gmtsub, 0L, NULL); // android-changed: extra parameter.
|
2009-03-19 06:20:24 +01:00
|
|
|
_tzUnlock();
|
|
|
|
|
|
|
|
return result;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* defined STD_INSPIRED */
|
|
|
|
|
|
|
|
#ifdef CMUCS
|
|
|
|
|
|
|
|
/*
|
|
|
|
** The following is supplied for compatibility with
|
|
|
|
** previous versions of the CMUCS runtime library.
|
|
|
|
*/
|
|
|
|
|
Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications).
localtime.c and strftime.c are still quite different from upstream because of
our extensions, but the other files continue to be identical, and the two
exceptions should be otherwise identical.
From the tzcode2013e release notes:
Changes affecting Godthab time stamps after 2037 if version mismatch
Allow POSIX-like TZ strings where the transition time's hour can
range from -167 through 167, instead of the POSIX-required 0
through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
new Fiji rules. This is a more-compact way to represent
far-future time stamps for America/Godthab, America/Santiago,
Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by
this change. (Derived from a suggestion by Arthur David Olson.)
Allow POSIX-like TZ strings where daylight saving time is in
effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western
Argentina Summer Time all year. This supports a more-compact way
to represent the 2013d data for America/Argentina/San_Luis.
Because of the change for San Luis noted above this change does not
affect the current data. (Thanks to Andrew Main (Zefram) for
suggestions that improved this change.)
Where these two TZ changes take effect, there is a minor extension
to the tz file format in that it allows new values for the
embedded TZ-format string, and the tz file format version number
has therefore been increased from 2 to 3 as a precaution.
Version-2-based client code should continue to work as before for
all time stamps before 2038. Existing version-2-based client code
(tzcode, GNU/Linux, Solaris) has been tested on version-3-format
files, and typically works in practice even for time stamps after
2037; the only known exception is America/Godthab.
Changes affecting API
Support for floating-point time_t has been removed.
It was always dicey, and POSIX no longer requires it.
(Thanks to Eric Blake for suggesting to the POSIX committee to
remove it, and thanks to Alan Barrett, Clive D.W. Feather, Andy
Heninger, Arthur David Olson, and Alois Treindl, for reporting
bugs and elucidating some of the corners of the old floating-point
implementation.)
The signatures of 'offtime', 'timeoff', and 'gtime' have been
changed back to the old practice of using 'long' to represent UT
offsets. This had been inadvertently and mistakenly changed to
'int_fast32_t'. (Thanks to Christos Zoulos.)
The code avoids undefined behavior on integer overflow in some
more places, including gmtime, localtime, mktime and zdump.
Changes affecting code internals
Minor changes pacify GCC 4.7.3 and GCC 4.8.1.
Changes affecting documentation and commentary
Documentation and commentary is more careful to distinguish UT in
general from UTC in particular. (Thanks to Steve Allen.)
From the tzcode2013f release notes:
Changes affecting API
The types of the global variables 'timezone' and 'altzone' (if present)
have been changed back to 'long'. This is required for 'timezone'
by POSIX, and for 'altzone' by common practice, e.g., Solaris 11.
These variables were originally 'long' in the tz code, but were
mistakenly changed to 'time_t' in 1987; nobody reported the
incompatibility until now. The difference matters on x32, where
'long' is 32 bits and 'time_t' is 64. (Thanks to Elliott Hughes.)
Change-Id: I14937c42a391ddb865e4d89f0783961bcc6baa21
2013-09-27 09:04:30 +02:00
|
|
|
long
|
2013-07-13 02:31:11 +02:00
|
|
|
gtime(struct tm * const tmp)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
const time_t t = mktime(tmp);
|
2009-03-04 04:28:35 +01:00
|
|
|
|
2009-03-19 06:20:24 +01:00
|
|
|
if (t == WRONG)
|
|
|
|
return -1;
|
|
|
|
return t;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* defined CMUCS */
|
|
|
|
|
|
|
|
/*
|
|
|
|
** XXX--is the below the right way to conditionalize??
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef STD_INSPIRED
|
|
|
|
|
|
|
|
/*
|
|
|
|
** IEEE Std 1003.1-1988 (POSIX) legislates that 536457599
|
|
|
|
** shall correspond to "Wed Dec 31 23:59:59 UTC 1986", which
|
|
|
|
** is not the case if we are accounting for leap seconds.
|
|
|
|
** So, we provide the following conversion routines for use
|
|
|
|
** when exchanging timestamps with POSIX conforming systems.
|
|
|
|
*/
|
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
static int_fast64_t
|
|
|
|
leapcorr(time_t * timep)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
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)
|
|
|
|
return lp->ls_corr;
|
|
|
|
}
|
|
|
|
return 0;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
time_t
|
2013-07-13 02:31:11 +02:00
|
|
|
time2posix(time_t t)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
tzset();
|
|
|
|
return t - leapcorr(&t);
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
time_t
|
2013-07-13 02:31:11 +02:00
|
|
|
posix2time(time_t t)
|
2009-03-04 04:28:35 +01:00
|
|
|
{
|
2009-03-19 06:20:24 +01:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
return x;
|
2009-03-04 04:28:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* defined STD_INSPIRED */
|
2012-10-18 01:30:47 +02:00
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
// BEGIN android-added
|
|
|
|
|
2012-10-20 03:13:15 +02:00
|
|
|
#include <assert.h>
|
2012-10-18 01:30:47 +02:00
|
|
|
#include <stdint.h>
|
2012-10-18 22:42:59 +02:00
|
|
|
#include <arpa/inet.h> // For ntohl(3).
|
2012-10-18 01:30:47 +02:00
|
|
|
|
2013-07-13 02:31:11 +02:00
|
|
|
static int to_int(unsigned char* s) {
|
|
|
|
return (s[0] << 24) | (s[1] << 16) | (s[2] << 8) | s[3];
|
|
|
|
}
|
|
|
|
|
2013-09-19 04:25:28 +02:00
|
|
|
static int __bionic_open_tzdata_path(const char* path_prefix_variable, const char* path_suffix,
|
|
|
|
const char* olson_id, int* data_size) {
|
|
|
|
const char* path_prefix = getenv(path_prefix_variable);
|
|
|
|
if (path_prefix == NULL) {
|
|
|
|
fprintf(stderr, "%s: %s not set!\n", __FUNCTION__, path_prefix_variable);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
char path[PATH_MAX];
|
|
|
|
snprintf(path, sizeof(path), "%s/%s", path_prefix, path_suffix);
|
2012-10-20 03:13:15 +02:00
|
|
|
int fd = TEMP_FAILURE_RETRY(open(path, OPEN_MODE));
|
2012-10-18 01:30:47 +02:00
|
|
|
if (fd == -1) {
|
2012-10-20 03:13:15 +02:00
|
|
|
XLOG(("%s: could not open \"%s\": %s\n", __FUNCTION__, path, strerror(errno)));
|
|
|
|
return -2; // Distinguish failure to find any data from failure to find a specific id.
|
2012-10-18 01:30:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// byte[12] tzdata_version -- "tzdata2012f\0"
|
|
|
|
// int index_offset
|
|
|
|
// int data_offset
|
|
|
|
// int zonetab_offset
|
|
|
|
struct bionic_tzdata_header {
|
|
|
|
char tzdata_version[12];
|
|
|
|
int32_t index_offset;
|
|
|
|
int32_t data_offset;
|
|
|
|
int32_t zonetab_offset;
|
|
|
|
} header;
|
2013-04-25 23:02:59 +02:00
|
|
|
memset(&header, 0, sizeof(header));
|
|
|
|
ssize_t bytes_read = TEMP_FAILURE_RETRY(read(fd, &header, sizeof(header)));
|
|
|
|
if (bytes_read != sizeof(header)) {
|
|
|
|
fprintf(stderr, "%s: could not read header of \"%s\": %s\n",
|
|
|
|
__FUNCTION__, path, (bytes_read == -1) ? strerror(errno) : "short read");
|
2012-10-18 01:30:47 +02:00
|
|
|
close(fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strncmp(header.tzdata_version, "tzdata", 6) != 0 || header.tzdata_version[11] != 0) {
|
2013-04-25 23:02:59 +02:00
|
|
|
fprintf(stderr, "%s: bad magic in \"%s\": \"%.6s\"\n",
|
|
|
|
__FUNCTION__, path, header.tzdata_version);
|
2012-10-18 01:30:47 +02:00
|
|
|
close(fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
2012-10-22 23:47:58 +02:00
|
|
|
fprintf(stderr, "version: %s\n", header.tzdata_version);
|
2012-10-18 01:30:47 +02:00
|
|
|
fprintf(stderr, "index_offset = %d\n", ntohl(header.index_offset));
|
|
|
|
fprintf(stderr, "data_offset = %d\n", ntohl(header.data_offset));
|
|
|
|
fprintf(stderr, "zonetab_offset = %d\n", ntohl(header.zonetab_offset));
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (TEMP_FAILURE_RETRY(lseek(fd, ntohl(header.index_offset), SEEK_SET)) == -1) {
|
2013-04-25 23:02:59 +02:00
|
|
|
fprintf(stderr, "%s: couldn't seek to index in \"%s\": %s\n",
|
|
|
|
__FUNCTION__, path, strerror(errno));
|
2012-10-18 01:30:47 +02:00
|
|
|
close(fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
off_t specific_zone_offset = -1;
|
|
|
|
|
2012-10-20 03:13:15 +02:00
|
|
|
static const size_t NAME_LENGTH = 40;
|
|
|
|
unsigned char buf[NAME_LENGTH + 3 * sizeof(int32_t)];
|
2013-03-14 22:38:08 +01:00
|
|
|
|
|
|
|
size_t id_count = (ntohl(header.data_offset) - ntohl(header.index_offset)) / sizeof(buf);
|
|
|
|
for (size_t i = 0; i < id_count; ++i) {
|
|
|
|
if (TEMP_FAILURE_RETRY(read(fd, buf, sizeof(buf))) != (ssize_t) sizeof(buf)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-10-20 03:13:15 +02:00
|
|
|
char this_id[NAME_LENGTH + 1];
|
|
|
|
memcpy(this_id, buf, NAME_LENGTH);
|
|
|
|
this_id[NAME_LENGTH] = '\0';
|
2012-10-18 01:30:47 +02:00
|
|
|
|
|
|
|
if (strcmp(this_id, olson_id) == 0) {
|
2013-07-13 02:31:11 +02:00
|
|
|
specific_zone_offset = to_int(buf + NAME_LENGTH) + ntohl(header.data_offset);
|
|
|
|
*data_size = to_int(buf + NAME_LENGTH + sizeof(int32_t));
|
2012-10-18 01:30:47 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (specific_zone_offset == -1) {
|
2012-10-20 03:13:15 +02:00
|
|
|
XLOG(("%s: couldn't find zone \"%s\"\n", __FUNCTION__, olson_id));
|
2012-10-18 01:30:47 +02:00
|
|
|
close(fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (TEMP_FAILURE_RETRY(lseek(fd, specific_zone_offset, SEEK_SET)) == -1) {
|
2013-04-25 23:02:59 +02:00
|
|
|
fprintf(stderr, "%s: could not seek to %ld in \"%s\": %s\n",
|
|
|
|
__FUNCTION__, specific_zone_offset, path, strerror(errno));
|
2012-10-18 01:30:47 +02:00
|
|
|
close(fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-04-25 23:02:59 +02:00
|
|
|
// TODO: check that there's TZ_MAGIC at this offset, so we can fall back to the other file if not.
|
|
|
|
|
2012-10-18 01:30:47 +02:00
|
|
|
return fd;
|
|
|
|
}
|
2012-10-20 03:13:15 +02:00
|
|
|
|
|
|
|
static int __bionic_open_tzdata(const char* olson_id, int* data_size) {
|
2013-09-19 04:25:28 +02:00
|
|
|
int fd = __bionic_open_tzdata_path("ANDROID_DATA", "/misc/zoneinfo/tzdata", olson_id, data_size);
|
2012-10-20 03:13:15 +02:00
|
|
|
if (fd < 0) {
|
2013-09-19 04:25:28 +02:00
|
|
|
fd = __bionic_open_tzdata_path("ANDROID_ROOT", "/usr/share/zoneinfo/tzdata", olson_id, data_size);
|
2012-10-20 03:13:15 +02:00
|
|
|
if (fd == -2) {
|
2012-10-25 23:38:51 +02:00
|
|
|
// The first thing that 'recovery' does is try to format the current time. It doesn't have
|
|
|
|
// any tzdata available, so we must not abort here --- doing so breaks the recovery image!
|
|
|
|
fprintf(stderr, "%s: couldn't find any tzdata when looking for %s!\n", __FUNCTION__, olson_id);
|
2012-10-20 03:13:15 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return fd;
|
|
|
|
}
|
2013-07-13 02:31:11 +02:00
|
|
|
|
|
|
|
// Caches the most recent timezone (http://b/8270865).
|
|
|
|
static int __bionic_tzload_cached(const char* name, struct state* const sp, const int doextend) {
|
|
|
|
_tzLock();
|
|
|
|
|
|
|
|
// Our single-item cache.
|
|
|
|
static char* gCachedTimeZoneName;
|
|
|
|
static struct state gCachedTimeZone;
|
|
|
|
|
|
|
|
// Do we already have this timezone cached?
|
|
|
|
if (gCachedTimeZoneName != NULL && strcmp(name, gCachedTimeZoneName) == 0) {
|
|
|
|
*sp = gCachedTimeZone;
|
|
|
|
_tzUnlock();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Can we load it?
|
|
|
|
int rc = tzload(name, sp, doextend);
|
|
|
|
if (rc == 0) {
|
|
|
|
// Update the cache.
|
|
|
|
free(gCachedTimeZoneName);
|
|
|
|
gCachedTimeZoneName = strdup(name);
|
|
|
|
gCachedTimeZone = *sp;
|
|
|
|
}
|
|
|
|
|
|
|
|
_tzUnlock();
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Non-standard API: mktime(3) but with an explicit timezone parameter.
|
|
|
|
time_t mktime_tz(struct tm* const tmp, const char* tz) {
|
|
|
|
struct state st;
|
|
|
|
if (__bionic_tzload_cached(tz, &st, TRUE) != 0) {
|
|
|
|
// TODO: not sure what's best here, but for now, we fall back to gmt.
|
|
|
|
gmtload(&st);
|
|
|
|
}
|
|
|
|
return time1(tmp, localsub, 0L, &st);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Non-standard API: localtime(3) but with an explicit timezone parameter.
|
|
|
|
void localtime_tz(const time_t* const timep, struct tm* tmp, const char* tz) {
|
|
|
|
struct state st;
|
|
|
|
if (__bionic_tzload_cached(tz, &st, TRUE) != 0) {
|
|
|
|
// TODO: not sure what's best here, but for now, we fall back to gmt.
|
|
|
|
gmtload(&st);
|
|
|
|
}
|
|
|
|
localsub(timep, 0L, tmp, &st);
|
|
|
|
}
|
|
|
|
|
|
|
|
// END android-added
|