X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=time%2Ftzset.c;h=a6fed4abc1dd32eb07f26a899aa6ed16cb2aa4a4;hb=c2a684a419ce936d7443bcb1e71ea7725fee0507;hp=9eceb73cf59e07453d7104e531d7d82375d6f0ed;hpb=5107cf1d7d27f17c6de68ec15a8e8d9dd5b471c1;p=platform%2Fupstream%2Fglibc.git diff --git a/time/tzset.c b/time/tzset.c index 9eceb73..a6fed4a 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -1,39 +1,33 @@ -/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. +/* Copyright (C) 1991-2002,2003,2004,2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ #include +#include +#include #include #include #include #include #include -/* Defined in mktime.c. */ -extern const unsigned short int __mon_yday[2][13]; #define NOID -#include "tzfile.h" - -extern int __use_tzfile; -extern void __tzfile_read __P ((const char *file)); -extern void __tzfile_default __P ((char *std, char *dst, - long int stdoff, long int dstoff)); -extern int __tz_compute __P ((time_t timer, const struct tm *tm)); +#include char *__tzname[2] = { (char *) "GMT", (char *) "GMT" }; int __daylight = 0; @@ -43,6 +37,9 @@ weak_alias (__tzname, tzname) weak_alias (__daylight, daylight) weak_alias (__timezone, timezone) +/* This locks all the state variables in tzfile.c and this file. */ +__libc_lock_define_initialized (static, tzset_lock) + #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b)) @@ -53,7 +50,7 @@ weak_alias (__timezone, timezone) timezone given in the POSIX standard TZ envariable. */ typedef struct { - char *name; + const char *name; /* When to change. */ enum { J0, J1, M } type; /* Interpretation of: */ @@ -72,122 +69,122 @@ typedef struct static tz_rule tz_rules[2]; -static int compute_change __P ((tz_rule *rule, int year)); +static void compute_change (tz_rule *rule, int year) __THROW internal_function; +static void tzset_internal (int always, int explicit) + __THROW internal_function; -static char *old_tz = NULL; - -/* Interpret the TZ envariable. */ -void __tzset_internal __P ((int always)); -void -__tzset_internal (always) - int always; +/* List of buffers containing time zone strings. */ +struct tzstring_l { - static int is_initialized = 0; - register const char *tz; - register size_t l; - unsigned short int hh, mm, ss; - unsigned short int whichrule; + struct tzstring_l *next; + size_t len; /* strlen(data) - doesn't count terminating NUL! */ + char data[0]; +}; + +static struct tzstring_l *tzstring_list; + +/* Allocate a permanent home for S. It will never be moved or deallocated, + but may share space with other strings. + Don't modify the returned string. */ +char * +__tzstring (const char *s) +{ + char *p; + struct tzstring_l *t, *u, *new; + size_t len = strlen (s); + + /* Walk the list and look for a match. If this string is the same + as the end of an already-allocated string, it can share space. */ + for (u = t = tzstring_list; t; u = t, t = t->next) + if (len <= t->len) + { + p = &t->data[t->len - len]; + if (strcmp (s, p) == 0) + return p; + } - if (is_initialized && !always) - return; - is_initialized = 1; + /* Not found; allocate a new buffer. */ + new = malloc (sizeof (struct tzstring_l) + len + 1); + if (!new) + return NULL; - /* Examine the TZ environment variable. */ - tz = getenv ("TZ"); - if (tz == NULL) - /* No user specification; use the site-wide default. */ - tz = TZDEFAULT; - else if (*tz == '\0') - /* User specified the empty string; use UTC explicitly. */ - tz = "Universal"; + new->next = NULL; + new->len = len; + strcpy (new->data, s); - /* A leading colon means "implementation defined syntax". - We ignore the colon and always use the same algorithm: - try a data file, and if none exists parse the 1003.1 syntax. */ - if (tz && *tz == ':') - ++tz; + if (u) + u->next = new; + else + tzstring_list = new; - /* Check whether the value changes since the last run. */ - if (old_tz != NULL && tz != NULL && strcmp (tz, old_tz) == 0) - /* No change, simply return. */ - return; + return new->data; +} + +/* Maximum length of a timezone name. tzset_internal keeps this up to date + (never decreasing it) when ! __use_tzfile. + tzfile.c keeps it up to date when __use_tzfile. */ +size_t __tzname_cur_max; - /* Free old storage. */ - if (tz_rules[0].name != NULL && *tz_rules[0].name != '\0') - free ((void *) tz_rules[0].name); - if (tz_rules[1].name != NULL && *tz_rules[1].name != '\0' && - tz_rules[1].name != tz_rules[0].name) - free ((void *) tz_rules[1].name); - tz_rules[0].name = NULL; - tz_rules[1].name = NULL; +long int +__tzname_max () +{ + __libc_lock_lock (tzset_lock); - /* Save the value of `tz'. */ - if (old_tz != NULL) - free (old_tz); - old_tz = tz ? __strdup (tz) : NULL; + tzset_internal (0, 0); - /* Try to read a data file. */ - __tzfile_read (tz); - if (__use_tzfile) - return; + __libc_lock_unlock (tzset_lock); - /* No data file found. Default to UTC if nothing specified. */ + return __tzname_cur_max; +} + +static char *old_tz; - if (tz == NULL || *tz == '\0') - { - static const char UTC[] = "UTC"; - size_t len = sizeof UTC; - tz_rules[0].name = (char *) malloc (len); - if (tz_rules[0].name == NULL) - return; - tz_rules[1].name = (char *) malloc (len); - if (tz_rules[1].name == NULL) - return; - memcpy ((void *) tz_rules[0].name, UTC, len); - memcpy ((void *) tz_rules[1].name, UTC, len); - tz_rules[0].type = tz_rules[1].type = J0; - tz_rules[0].m = tz_rules[0].n = tz_rules[0].d = 0; - tz_rules[1].m = tz_rules[1].n = tz_rules[1].d = 0; - tz_rules[0].secs = tz_rules[1].secs = 0; - tz_rules[0].offset = tz_rules[1].offset = 0L; - tz_rules[0].change = tz_rules[1].change = (time_t) -1; - tz_rules[0].computed_for = tz_rules[1].computed_for = 0; - return; - } +static void +internal_function +update_vars (void) +{ + __daylight = tz_rules[0].offset != tz_rules[1].offset; + __timezone = -tz_rules[0].offset; + __tzname[0] = (char *) tz_rules[0].name; + __tzname[1] = (char *) tz_rules[1].name; + + /* Keep __tzname_cur_max up to date. */ + size_t len0 = strlen (__tzname[0]); + size_t len1 = strlen (__tzname[1]); + if (len0 > __tzname_cur_max) + __tzname_cur_max = len0; + if (len1 > __tzname_cur_max) + __tzname_cur_max = len1; +} + +/* Parse the POSIX TZ-style string. */ +void +__tzset_parse_tz (tz) + const char *tz; +{ + register size_t l; + char *tzbuf; + unsigned short int hh, mm, ss; + unsigned short int whichrule; /* Clear out old state and reset to unnamed UTC. */ memset (tz_rules, 0, sizeof tz_rules); - tz_rules[0].name = tz_rules[1].name = (char *) ""; + tz_rules[0].name = tz_rules[1].name = ""; /* Get the standard timezone name. */ - tz_rules[0].name = (char *) malloc (strlen (tz) + 1); - if (tz_rules[0].name == NULL) - { - /* Clear the old tz name so we will try again. */ - free (old_tz); - old_tz = NULL; - return; - } + tzbuf = strdupa (tz); - if (sscanf (tz, "%[^0-9,+-]", tz_rules[0].name) != 1 || - (l = strlen(tz_rules[0].name)) < 3) - { - free (tz_rules[0].name); - tz_rules[0].name = (char *) ""; - return; - } + if (sscanf (tz, "%[^0-9,+-]", tzbuf) != 1 || + (l = strlen (tzbuf)) < 3) + goto out; - { - char *n = realloc ((void *) tz_rules[0].name, l + 1); - if (n != NULL) - tz_rules[0].name = n; - } + tz_rules[0].name = __tzstring (tzbuf); tz += l; /* Figure out the standard offset from UTC. */ if (*tz == '\0' || (*tz != '+' && *tz != '-' && !isdigit (*tz))) - return; + goto out; if (*tz == '-' || *tz == '+') tz_rules[0].offset = *tz++ == '-' ? 1L : -1L; @@ -196,7 +193,8 @@ __tzset_internal (always) switch (sscanf (tz, "%hu:%hu:%hu", &hh, &mm, &ss)) { default: - return; + tz_rules[0].offset = 0; + goto out; case 1: mm = 0; case 2: @@ -205,7 +203,7 @@ __tzset_internal (always) break; } tz_rules[0].offset *= (min (ss, 59) + (min (mm, 59) * 60) + - (min (hh, 23) * 60 * 60)); + (min (hh, 24) * 60 * 60)); for (l = 0; l < 3; ++l) { @@ -218,23 +216,14 @@ __tzset_internal (always) /* Get the DST timezone name (if any). */ if (*tz != '\0') { - char *n = malloc (strlen (tz) + 1); - if (n != NULL) - { - tz_rules[1].name = n; - if (sscanf (tz, "%[^0-9,+-]", tz_rules[1].name) != 1 || - (l = strlen (tz_rules[1].name)) < 3) - { - free (n); - tz_rules[1].name = (char *) ""; - goto done_names; /* Punt on name, set up the offsets. */ - } - n = realloc ((void *) tz_rules[1].name, l + 1); - if (n != NULL) - tz_rules[1].name = n; + char *n = tzbuf + strlen (tzbuf) + 1; + if (sscanf (tz, "%[^0-9,+-]", n) != 1 || + (l = strlen (n)) < 3) + goto done_names; /* Punt on name, set up the offsets. */ - tz += l; - } + tz_rules[1].name = __tzstring (n); + + tz += l; /* Figure out the DST offset from GMT. */ if (*tz == '-' || *tz == '+') @@ -265,37 +254,36 @@ __tzset_internal (always) if (l < 2 && *tz == ':') ++tz; } + if (*tz == '\0' || (tz[0] == ',' && tz[1] == '\0')) + { + /* There is no rule. See if there is a default rule file. */ + __tzfile_default (tz_rules[0].name, tz_rules[1].name, + tz_rules[0].offset, tz_rules[1].offset); + if (__use_tzfile) + { + free (old_tz); + old_tz = NULL; + return; + } + } } else - /* There is no DST. */ - tz_rules[1].name = tz_rules[0].name; - - done_names: - - if (*tz == '\0' || (tz[0] == ',' && tz[1] == '\0')) { - /* There is no rule. See if there is a default rule file. */ - __tzfile_default (tz_rules[0].name, tz_rules[1].name, - tz_rules[0].offset, tz_rules[1].offset); - if (__use_tzfile) - { - free (old_tz); - old_tz = NULL; - return; - } + /* There is no DST. */ + tz_rules[1].name = tz_rules[0].name; + tz_rules[1].offset = tz_rules[0].offset; + goto out; } + done_names: /* Figure out the standard <-> DST rules. */ for (whichrule = 0; whichrule < 2; ++whichrule) { register tz_rule *tzr = &tz_rules[whichrule]; - if (*tz == ',') - { - ++tz; - if (*tz == '\0') - return; - } + /* Ignore comma to support string following the incorrect + specification in early POSIX.1 printings. */ + tz += *tz == ','; /* Get the date of the change. */ if (*tz == 'J' || isdigit (*tz)) @@ -303,12 +291,12 @@ __tzset_internal (always) char *end; tzr->type = *tz == 'J' ? J1 : J0; if (tzr->type == J1 && !isdigit (*++tz)) - return; + goto out; tzr->d = (unsigned short int) strtoul (tz, &end, 10); if (end == tz || tzr->d > 365) - return; + goto out; else if (tzr->type == J1 && tzr->d == 0) - return; + goto out; tz = end; } else if (*tz == 'M') @@ -319,7 +307,7 @@ __tzset_internal (always) &tzr->m, &tzr->n, &tzr->d, &n) != 3 || tzr->m < 1 || tzr->m > 12 || tzr->n < 1 || tzr->n > 5 || tzr->d > 6) - return; + goto out; tz += n; } else if (*tz == '\0') @@ -340,16 +328,16 @@ __tzset_internal (always) } } else - return; + goto out; if (*tz != '\0' && *tz != '/' && *tz != ',') - return; + goto out; else if (*tz == '/') { /* Get the time of day of the change. */ ++tz; if (*tz == '\0') - return; + goto out; switch (sscanf (tz, "%hu:%hu:%hu", &hh, &mm, &ss)) { default: @@ -376,41 +364,111 @@ __tzset_internal (always) tzr->computed_for = -1; } + + out: + update_vars (); } - -/* Maximum length of a timezone name. __tz_compute keeps this up to date - (never decreasing it) when ! __use_tzfile. - tzfile.c keeps it up to date when __use_tzfile. */ -size_t __tzname_cur_max; -long int -__tzname_max () +/* Interpret the TZ envariable. */ +static void +internal_function +tzset_internal (always, explicit) + int always; + int explicit; { - __tzset_internal (0); + static int is_initialized; + register const char *tz; - return __tzname_cur_max; + if (is_initialized && !always) + return; + is_initialized = 1; + + /* Examine the TZ environment variable. */ + tz = getenv ("TZ"); + if (tz == NULL && !explicit) + /* Use the site-wide default. This is a file name which means we + would not see changes to the file if we compare only the file + name for change. We want to notice file changes if tzset() has + been called explicitly. Leave TZ as NULL in this case. */ + tz = TZDEFAULT; + if (tz && *tz == '\0') + /* User specified the empty string; use UTC explicitly. */ + tz = "Universal"; + + /* A leading colon means "implementation defined syntax". + We ignore the colon and always use the same algorithm: + try a data file, and if none exists parse the 1003.1 syntax. */ + if (tz && *tz == ':') + ++tz; + + /* Check whether the value changed since the last run. */ + if (old_tz != NULL && tz != NULL && strcmp (tz, old_tz) == 0) + /* No change, simply return. */ + return; + + if (tz == NULL) + /* No user specification; use the site-wide default. */ + tz = TZDEFAULT; + + tz_rules[0].name = NULL; + tz_rules[1].name = NULL; + + /* Save the value of `tz'. */ + free (old_tz); + old_tz = tz ? __strdup (tz) : NULL; + + /* Try to read a data file. */ + __tzfile_read (tz, 0, NULL); + if (__use_tzfile) + return; + + /* No data file found. Default to UTC if nothing specified. */ + + if (tz == NULL || *tz == '\0' + || (TZDEFAULT != NULL && strcmp (tz, TZDEFAULT) == 0)) + { + tz_rules[0].name = tz_rules[1].name = "UTC"; + tz_rules[0].type = tz_rules[1].type = J0; + tz_rules[0].m = tz_rules[0].n = tz_rules[0].d = 0; + tz_rules[1].m = tz_rules[1].n = tz_rules[1].d = 0; + tz_rules[0].secs = tz_rules[1].secs = 0; + tz_rules[0].offset = tz_rules[1].offset = 0L; + tz_rules[0].change = tz_rules[1].change = (time_t) -1; + tz_rules[0].computed_for = tz_rules[1].computed_for = 0; + update_vars (); + return; + } + + __tzset_parse_tz (tz); } /* Figure out the exact time (as a time_t) in YEAR when the change described by RULE will occur and - put it in RULE->change, saving YEAR in RULE->computed_for. - Return nonzero if successful, zero on failure. */ -static int + put it in RULE->change, saving YEAR in RULE->computed_for. */ +static void +internal_function compute_change (rule, year) tz_rule *rule; int year; { register time_t t; - int y; if (year != -1 && rule->computed_for == year) - /* Operations on times in 1969 will be slower. Oh well. */ - return 1; + /* Operations on times in 2 BC will be slower. Oh well. */ + return; /* First set T to January 1st, 0:00:00 GMT in YEAR. */ - t = 0; - for (y = 1970; y < year; ++y) - t += SECSPERDAY * (__isleap (y) ? 366 : 365); + if (year > 1970) + t = ((year - 1970) * 365 + + /* Compute the number of leapdays between 1970 and YEAR + (exclusive). There is a leapday every 4th year ... */ + + ((year - 1) / 4 - 1970 / 4) + /* ... except every 100th year ... */ + - ((year - 1) / 100 - 1970 / 100) + /* ... but still every 400th year. */ + + ((year - 1) / 400 - 1970 / 400)) * SECSPERDAY; + else + t = 0; switch (rule->type) { @@ -433,8 +491,9 @@ compute_change (rule, year) case M: /* Mm.n.d - Nth "Dth day" of month M. */ { - register int i, d, m1, yy0, yy1, yy2, dow; - register const unsigned short int *myday = + unsigned int i; + int d, m1, yy0, yy1, yy2, dow; + const unsigned short int *myday = &__mon_yday[__isleap (year)][rule->m]; /* First add SECSPERDAY for each day in months before M. */ @@ -456,7 +515,7 @@ compute_change (rule, year) d += 7; for (i = 1; i < rule->n; ++i) { - if (d + 7 >= myday[0] - myday[-1]) + if (d + 7 >= (int) myday[0] - myday[-1]) break; d += 7; } @@ -472,56 +531,50 @@ compute_change (rule, year) rule->change = t - rule->offset + rule->secs; rule->computed_for = year; - return 1; } -/* Figure out the correct timezone for *TIMER and TM (which must be the same) - and set `__tzname', `__timezone', and `__daylight' accordingly. - Return nonzero on success, zero on failure. */ -int -__tz_compute (timer, tm) +/* Figure out the correct timezone for TM and set `__tzname', + `__timezone', and `__daylight' accordingly. */ +void +internal_function +__tz_compute (timer, tm, use_localtime) time_t timer; - const struct tm *tm; + struct tm *tm; + int use_localtime; { - __tzset_internal (0); - - if (! compute_change (&tz_rules[0], 1900 + tm->tm_year) || - ! compute_change (&tz_rules[1], 1900 + tm->tm_year)) - return 0; - - __daylight = timer >= tz_rules[0].change && timer < tz_rules[1].change; - __timezone = tz_rules[__daylight ? 1 : 0].offset; - __tzname[0] = (char *) tz_rules[0].name; - __tzname[1] = (char *) tz_rules[1].name; + compute_change (&tz_rules[0], 1900 + tm->tm_year); + compute_change (&tz_rules[1], 1900 + tm->tm_year); - { - /* Keep __tzname_cur_max up to date. */ - size_t len0 = strlen (__tzname[0]); - size_t len1 = strlen (__tzname[1]); - if (len0 > __tzname_cur_max) - __tzname_cur_max = len0; - if (len1 > __tzname_cur_max) - __tzname_cur_max = len1; - } - - return 1; + if (use_localtime) + { + int isdst; + + /* We have to distinguish between northern and southern + hemisphere. For the latter the daylight saving time + ends in the next year. */ + if (__builtin_expect (tz_rules[0].change + > tz_rules[1].change, 0)) + isdst = (timer < tz_rules[1].change + || timer >= tz_rules[0].change); + else + isdst = (timer >= tz_rules[0].change + && timer < tz_rules[1].change); + tm->tm_isdst = isdst; + tm->tm_zone = __tzname[isdst]; + tm->tm_gmtoff = tz_rules[isdst].offset; + } } -#include - -/* This locks all the state variables in tzfile.c and this file. */ -__libc_lock_define (, __tzset_lock) - /* Reinterpret the TZ environment variable and set `tzname'. */ #undef tzset void __tzset (void) { - __libc_lock_lock (__tzset_lock); + __libc_lock_lock (tzset_lock); - __tzset_internal (1); + tzset_internal (1, 1); if (!__use_tzfile) { @@ -530,6 +583,74 @@ __tzset (void) __tzname[1] = (char *) tz_rules[1].name; } - __libc_lock_unlock (__tzset_lock); + __libc_lock_unlock (tzset_lock); } weak_alias (__tzset, tzset) + +/* Return the `struct tm' representation of *TIMER in the local timezone. + Use local time if USE_LOCALTIME is nonzero, UTC otherwise. */ +struct tm * +__tz_convert (const time_t *timer, int use_localtime, struct tm *tp) +{ + long int leap_correction; + int leap_extra_secs; + + if (timer == NULL) + { + __set_errno (EINVAL); + return NULL; + } + + __libc_lock_lock (tzset_lock); + + /* Update internal database according to current TZ setting. + POSIX.1 8.3.7.2 says that localtime_r is not required to set tzname. + This is a good idea since this allows at least a bit more parallelism. */ + tzset_internal (tp == &_tmbuf && use_localtime, 1); + + if (__use_tzfile) + __tzfile_compute (*timer, use_localtime, &leap_correction, + &leap_extra_secs, tp); + else + { + if (! __offtime (timer, 0, tp)) + tp = NULL; + else + __tz_compute (*timer, tp, use_localtime); + leap_correction = 0L; + leap_extra_secs = 0; + } + + if (tp) + { + if (! use_localtime) + { + tp->tm_isdst = 0; + tp->tm_zone = "GMT"; + tp->tm_gmtoff = 0L; + } + + if (__offtime (timer, tp->tm_gmtoff - leap_correction, tp)) + tp->tm_sec += leap_extra_secs; + else + tp = NULL; + } + + __libc_lock_unlock (tzset_lock); + + return tp; +} + + +libc_freeres_fn (free_mem) +{ + while (tzstring_list != NULL) + { + struct tzstring_l *old = tzstring_list; + + tzstring_list = tzstring_list->next; + free (old); + } + free (old_tz); + old_tz = NULL; +}