* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
#include "gslice.h"
#include "gdatetime.h"
#include "gdate.h"
+#include "genviron.h"
#ifdef G_OS_WIN32
+
#define STRICT
#include <windows.h>
+#include <wchar.h>
#endif
/**
* #GTimeZone is a structure that represents a time zone, at no
* particular point in time. It is refcounted and immutable.
*
+ * Each time zone has an identifier (for example, ‘Europe/London’) which is
+ * platform dependent. See g_time_zone_new() for information on the identifier
+ * formats. The identifier of a time zone can be retrieved using
+ * g_time_zone_get_identifier().
+ *
* A time zone contains a number of intervals. Each interval has
- * an abbreviation to describe it, an offet to UTC and a flag indicating
- * if the daylight savings time is in effect during that interval. A
- * time zone always has at least one interval -- interval 0.
+ * an abbreviation to describe it (for example, ‘PDT’), an offset to UTC and a
+ * flag indicating if the daylight savings time is in effect during that
+ * interval. A time zone always has at least one interval — interval 0. Note
+ * that interval abbreviations are not the same as time zone identifiers
+ * (apart from ‘UTC’), and cannot be passed to g_time_zone_new().
*
* Every UTC time is contained within exactly one interval, but a given
* local time may be contained within zero, one or two intervals (due to
gint mday;
gint wday;
gint week;
- gint hour;
- gint min;
- gint sec;
+ gint32 offset; /* hour*3600 + min*60 + sec; can be negative. */
} TimeZoneDate;
/* POSIX Timezone abbreviations are typically 3 or 4 characters, but
*/
typedef struct
{
- gint start_year;
+ guint start_year;
gint32 std_offset;
gint32 dlt_offset;
TimeZoneDate dlt_start;
{
gint32 gmt_offset;
gboolean is_dst;
- gboolean is_standard;
- gboolean is_gmt;
gchar *abbrev;
} TransitionInfo;
G_LOCK_DEFINE_STATIC (time_zones);
static GHashTable/*<string?, GTimeZone>*/ *time_zones;
+G_LOCK_DEFINE_STATIC (tz_default);
+static GTimeZone *tz_default = NULL;
+G_LOCK_DEFINE_STATIC (tz_local);
+static GTimeZone *tz_local = NULL;
#define MIN_TZYEAR 1916 /* Daylight Savings started in WWI */
#define MAX_TZYEAR 2999 /* And it's not likely ever to go away, but
there's no point in getting carried
away. */
+#ifdef G_OS_UNIX
+static GTimeZone *parse_footertz (const gchar *, size_t);
+#endif
+
/**
* g_time_zone_unref:
* @tz: a #GTimeZone
goto again;
}
- g_hash_table_remove (time_zones, tz->name);
+ if (time_zones != NULL)
+ g_hash_table_remove (time_zones, tz->name);
G_UNLOCK(time_zones);
}
if (tz->t_info != NULL)
{
- gint idx;
+ guint idx;
for (idx = 0; idx < tz->t_info->len; idx++)
{
TransitionInfo *info = &g_array_index (tz->t_info, TransitionInfo, idx);
/* fake zoneinfo creation (for RFC3339/ISO 8601 timezones) {{{1 */
/*
* parses strings of the form h or hh[[:]mm[[[:]ss]]] where:
- * - h[h] is 0 to 23
+ * - h[h] is 0 to 24
* - mm is 00 to 59
* - ss is 00 to 59
+ * If RFC8536, TIME_ is a transition time sans sign,
+ * so colons are required before mm and ss, and hh can be up to 167.
+ * See Internet RFC 8536 section 3.3.1:
+ * https://tools.ietf.org/html/rfc8536#section-3.3.1
+ * and POSIX Base Definitions 8.3 TZ rule time:
+ * https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
*/
static gboolean
parse_time (const gchar *time_,
- gint32 *offset)
+ gint32 *offset,
+ gboolean rfc8536)
{
if (*time_ < '0' || '9' < *time_)
return FALSE;
*offset *= 10;
*offset += 60 * 60 * (*time_++ - '0');
- if (*offset > 23 * 60 * 60)
+ if (rfc8536)
+ {
+ /* Internet RFC 8536 section 3.3.1 and POSIX 8.3 TZ together say
+ that a transition time must be of the form [+-]hh[:mm[:ss]] where
+ the hours part can range from -167 to 167. */
+ if ('0' <= *time_ && *time_ <= '9')
+ {
+ *offset *= 10;
+ *offset += 60 * 60 * (*time_++ - '0');
+ }
+ if (*offset > 167 * 60 * 60)
+ return FALSE;
+ }
+ else if (*offset > 24 * 60 * 60)
return FALSE;
if (*time_ == '\0')
if (*time_ == ':')
time_++;
+ else if (rfc8536)
+ return FALSE;
if (*time_ < '0' || '5' < *time_)
return FALSE;
if (*time_ == ':')
time_++;
+ else if (rfc8536)
+ return FALSE;
if (*time_ < '0' || '5' < *time_)
return FALSE;
static gboolean
parse_constant_offset (const gchar *name,
- gint32 *offset)
+ gint32 *offset,
+ gboolean rfc8536)
{
- if (g_strcmp0 (name, "UTC") == 0)
+ /* Internet RFC 8536 section 3.3.1 and POSIX 8.3 TZ together say
+ that a transition time must be numeric. */
+ if (!rfc8536 && g_strcmp0 (name, "UTC") == 0)
{
*offset = 0;
return TRUE;
}
if (*name >= '0' && '9' >= *name)
- return parse_time (name, offset);
+ return parse_time (name, offset, rfc8536);
switch (*name++)
{
case 'Z':
*offset = 0;
- return !*name;
+ /* Internet RFC 8536 section 3.3.1 requires a numeric zone. */
+ return !rfc8536 && !*name;
case '+':
- return parse_time (name, offset);
+ return parse_time (name, offset, rfc8536);
case '-':
- if (parse_time (name, offset))
+ if (parse_time (name, offset, rfc8536))
{
*offset = -*offset;
return TRUE;
}
+ else
+ return FALSE;
default:
return FALSE;
gint32 offset;
TransitionInfo info;
- if (name == NULL || !parse_constant_offset (name, &offset))
+ if (name == NULL || !parse_constant_offset (name, &offset, FALSE))
return;
info.gmt_offset = offset;
info.is_dst = FALSE;
- info.is_standard = TRUE;
- info.is_gmt = TRUE;
info.abbrev = g_strdup (name);
-
+ gtz->name = g_strdup (name);
gtz->t_info = g_array_sized_new (FALSE, TRUE, sizeof (TransitionInfo), 1);
g_array_append_val (gtz->t_info, info);
}
#ifdef G_OS_UNIX
+
+#if defined(__sun) && defined(__SVR4)
+/*
+ * only used by Illumos distros or Solaris < 11: parse the /etc/default/init
+ * text file looking for TZ= followed by the timezone, possibly quoted
+ *
+ */
+static gchar *
+zone_identifier_illumos (void)
+{
+ gchar *resolved_identifier = NULL;
+ gchar *contents = NULL;
+ const gchar *line_start = NULL;
+ gsize tz_len = 0;
+
+ if (!g_file_get_contents ("/etc/default/init", &contents, NULL, NULL) )
+ return NULL;
+
+ /* is TZ= the first/only line in the file? */
+ if (strncmp (contents, "TZ=", 3) == 0)
+ {
+ /* found TZ= on the first line, skip over the TZ= */
+ line_start = contents + 3;
+ }
+ else
+ {
+ /* find a newline followed by TZ= */
+ line_start = strstr (contents, "\nTZ=");
+ if (line_start != NULL)
+ line_start = line_start + 4; /* skip past the \nTZ= */
+ }
+
+ /*
+ * line_start is NULL if we didn't find TZ= at the start of any line,
+ * otherwise it points to what is after the '=' (possibly '\0')
+ */
+ if (line_start == NULL || *line_start == '\0')
+ return NULL;
+
+ /* skip past a possible opening " or ' */
+ if (*line_start == '"' || *line_start == '\'')
+ line_start++;
+
+ /*
+ * loop over the next few characters, building up the length of
+ * the timezone identifier, ending with end of string, newline or
+ * a " or ' character
+ */
+ while (*(line_start + tz_len) != '\0' &&
+ *(line_start + tz_len) != '\n' &&
+ *(line_start + tz_len) != '"' &&
+ *(line_start + tz_len) != '\'')
+ tz_len++;
+
+ if (tz_len > 0)
+ {
+ /* found it */
+ resolved_identifier = g_strndup (line_start, tz_len);
+ g_strchomp (resolved_identifier);
+ g_free (contents);
+ return g_steal_pointer (&resolved_identifier);
+ }
+ else
+ return NULL;
+}
+#endif /* defined(__sun) && defined(__SRVR) */
+
+/*
+ * returns the path to the top of the Olson zoneinfo timezone hierarchy.
+ */
+static const gchar *
+zone_info_base_dir (void)
+{
+ if (g_file_test ("/usr/share/zoneinfo", G_FILE_TEST_IS_DIR))
+ return "/usr/share/zoneinfo"; /* Most distros */
+ else if (g_file_test ("/usr/share/lib/zoneinfo", G_FILE_TEST_IS_DIR))
+ return "/usr/share/lib/zoneinfo"; /* Illumos distros */
+
+ /* need a better fallback case */
+ return "/usr/share/zoneinfo";
+}
+
+static gchar *
+zone_identifier_unix (void)
+{
+ gchar *resolved_identifier = NULL;
+ gsize prefix_len = 0;
+ gchar *canonical_path = NULL;
+ GError *read_link_err = NULL;
+ const gchar *tzdir;
+
+ /* Resolve the actual timezone pointed to by /etc/localtime. */
+ resolved_identifier = g_file_read_link ("/etc/localtime", &read_link_err);
+ if (resolved_identifier == NULL)
+ {
+ gboolean not_a_symlink = g_error_matches (read_link_err,
+ G_FILE_ERROR,
+ G_FILE_ERROR_INVAL);
+ g_clear_error (&read_link_err);
+
+ /* if /etc/localtime is not a symlink, try:
+ * - /var/db/zoneinfo : 'tzsetup' program on FreeBSD and
+ * DragonflyBSD stores the timezone chosen by the user there.
+ * - /etc/timezone : Gentoo, OpenRC, and others store
+ * the user choice there.
+ * - call zone_identifier_illumos iff __sun and __SVR4 are defined,
+ * as a last-ditch effort to parse the TZ= setting from within
+ * /etc/default/init
+ */
+ if (not_a_symlink && (g_file_get_contents ("/var/db/zoneinfo",
+ &resolved_identifier,
+ NULL, NULL) ||
+ g_file_get_contents ("/etc/timezone",
+ &resolved_identifier,
+ NULL, NULL)
+#if defined(__sun) && defined(__SVR4)
+ ||
+ (resolved_identifier = zone_identifier_illumos ())
+#endif
+ ))
+ g_strchomp (resolved_identifier);
+ else
+ {
+ /* Error */
+ g_assert (resolved_identifier == NULL);
+ goto out;
+ }
+ }
+ else
+ {
+ /* Resolve relative path */
+ canonical_path = g_canonicalize_filename (resolved_identifier, "/etc");
+ g_free (resolved_identifier);
+ resolved_identifier = g_steal_pointer (&canonical_path);
+ }
+
+ tzdir = g_getenv ("TZDIR");
+ if (tzdir == NULL)
+ tzdir = zone_info_base_dir ();
+
+ /* Strip the prefix and slashes if possible. */
+ if (g_str_has_prefix (resolved_identifier, tzdir))
+ {
+ prefix_len = strlen (tzdir);
+ while (*(resolved_identifier + prefix_len) == '/')
+ prefix_len++;
+ }
+
+ if (prefix_len > 0)
+ memmove (resolved_identifier, resolved_identifier + prefix_len,
+ strlen (resolved_identifier) - prefix_len + 1 /* nul terminator */);
+
+ g_assert (resolved_identifier != NULL);
+
+out:
+ g_free (canonical_path);
+
+ return resolved_identifier;
+}
+
static GBytes*
-zone_info_unix (const gchar *identifier)
+zone_info_unix (const gchar *identifier,
+ const gchar *resolved_identifier)
{
- gchar *filename;
+ gchar *filename = NULL;
GMappedFile *file = NULL;
GBytes *zoneinfo = NULL;
+ const gchar *tzdir;
+
+ tzdir = g_getenv ("TZDIR");
+ if (tzdir == NULL)
+ tzdir = zone_info_base_dir ();
/* identifier can be a relative or absolute path name;
if relative, it is interpreted starting from /usr/share/zoneinfo
glibc allows both syntaxes, so we should too */
if (identifier != NULL)
{
- const gchar *tzdir;
-
- tzdir = getenv ("TZDIR");
- if (tzdir == NULL)
- tzdir = "/usr/share/zoneinfo";
-
if (*identifier == ':')
identifier ++;
filename = g_build_filename (tzdir, identifier, NULL);
}
else
- filename = g_strdup ("/etc/localtime");
+ {
+ if (resolved_identifier == NULL)
+ goto out;
+
+ filename = g_strdup ("/etc/localtime");
+ }
file = g_mapped_file_new (filename, FALSE, NULL);
if (file != NULL)
g_mapped_file_ref (file));
g_mapped_file_unref (file);
}
+
+ g_assert (resolved_identifier != NULL);
+
+out:
g_free (filename);
+
return zoneinfo;
}
static void
-init_zone_from_iana_info (GTimeZone *gtz, GBytes *zoneinfo)
+init_zone_from_iana_info (GTimeZone *gtz,
+ GBytes *zoneinfo,
+ gchar *identifier /* (transfer full) */)
{
gsize size;
guint index;
- guint32 time_count, type_count, leap_count, isgmt_count;
- guint32 isstd_count, char_count ;
+ guint32 time_count, type_count;
guint8 *tz_transitions, *tz_type_index, *tz_ttinfo;
- guint8 *tz_leaps, *tz_isgmt, *tz_isstd;
guint8 *tz_abbrs;
- gsize timesize = sizeof (gint32), countsize = sizeof (gint32);
- const struct tzhead *header = g_bytes_get_data (zoneinfo, &size);
+ gsize timesize = sizeof (gint32);
+ gconstpointer header_data = g_bytes_get_data (zoneinfo, &size);
+ const gchar *data = header_data;
+ const struct tzhead *header = header_data;
+ GTimeZone *footertz = NULL;
+ guint extra_time_count = 0, extra_type_count = 0;
+ gint64 last_explicit_transition_time;
g_return_if_fail (size >= sizeof (struct tzhead) &&
memcmp (header, "TZif", 4) == 0);
- if (header->tzh_version == '2')
+ /* FIXME: Handle invalid TZif files better (Issue#1088). */
+
+ if (header->tzh_version >= '2')
{
/* Skip ahead to the newer 64-bit data if it's available. */
header = (const struct tzhead *)
}
time_count = guint32_from_be(header->tzh_timecnt);
type_count = guint32_from_be(header->tzh_typecnt);
- leap_count = guint32_from_be(header->tzh_leapcnt);
- isgmt_count = guint32_from_be(header->tzh_ttisgmtcnt);
- isstd_count = guint32_from_be(header->tzh_ttisstdcnt);
- char_count = guint32_from_be(header->tzh_charcnt);
- g_assert (type_count == isgmt_count);
- g_assert (type_count == isstd_count);
+ if (header->tzh_version >= '2')
+ {
+ const gchar *footer = (((const gchar *) (header + 1))
+ + guint32_from_be(header->tzh_ttisgmtcnt)
+ + guint32_from_be(header->tzh_ttisstdcnt)
+ + 12 * guint32_from_be(header->tzh_leapcnt)
+ + 9 * time_count
+ + 6 * type_count
+ + guint32_from_be(header->tzh_charcnt));
+ const gchar *footerlast;
+ size_t footerlen;
+ g_return_if_fail (footer <= data + size - 2 && footer[0] == '\n');
+ footerlast = memchr (footer + 1, '\n', data + size - (footer + 1));
+ g_return_if_fail (footerlast);
+ footerlen = footerlast + 1 - footer;
+ if (footerlen != 2)
+ {
+ footertz = parse_footertz (footer, footerlen);
+ g_return_if_fail (footertz);
+ extra_type_count = footertz->t_info->len;
+ extra_time_count = footertz->transitions->len;
+ }
+ }
tz_transitions = ((guint8 *) (header) + sizeof (*header));
tz_type_index = tz_transitions + timesize * time_count;
tz_ttinfo = tz_type_index + time_count;
tz_abbrs = tz_ttinfo + sizeof (struct ttinfo) * type_count;
- tz_leaps = tz_abbrs + char_count;
- tz_isstd = tz_leaps + (timesize + countsize) * leap_count;
- tz_isgmt = tz_isstd + isstd_count;
+ gtz->name = g_steal_pointer (&identifier);
gtz->t_info = g_array_sized_new (FALSE, TRUE, sizeof (TransitionInfo),
- type_count);
+ type_count + extra_type_count);
gtz->transitions = g_array_sized_new (FALSE, TRUE, sizeof (Transition),
- time_count);
+ time_count + extra_time_count);
for (index = 0; index < type_count; index++)
{
struct ttinfo info = ((struct ttinfo*)tz_ttinfo)[index];
t_info.gmt_offset = gint32_from_be (info.tt_gmtoff);
t_info.is_dst = info.tt_isdst ? TRUE : FALSE;
- t_info.is_standard = tz_isstd[index] ? TRUE : FALSE;
- t_info.is_gmt = tz_isgmt[index] ? TRUE : FALSE;
t_info.abbrev = g_strdup ((gchar *) &tz_abbrs[info.tt_abbrind]);
g_array_append_val (gtz->t_info, t_info);
}
for (index = 0; index < time_count; index++)
{
Transition trans;
- if (header->tzh_version == '2')
+ if (header->tzh_version >= '2')
trans.time = gint64_from_be (((gint64_be*)tz_transitions)[index]);
else
trans.time = gint32_from_be (((gint32_be*)tz_transitions)[index]);
+ last_explicit_transition_time = trans.time;
trans.info_index = tz_type_index[index];
g_assert (trans.info_index >= 0);
- g_assert (trans.info_index < gtz->t_info->len);
+ g_assert ((guint) trans.info_index < gtz->t_info->len);
g_array_append_val (gtz->transitions, trans);
}
+
+ if (footertz)
+ {
+ /* Append footer time types. Don't bother to coalesce
+ duplicates with existing time types. */
+ for (index = 0; index < extra_type_count; index++)
+ {
+ TransitionInfo t_info;
+ TransitionInfo *footer_t_info
+ = &g_array_index (footertz->t_info, TransitionInfo, index);
+ t_info.gmt_offset = footer_t_info->gmt_offset;
+ t_info.is_dst = footer_t_info->is_dst;
+ t_info.abbrev = g_steal_pointer (&footer_t_info->abbrev);
+ g_array_append_val (gtz->t_info, t_info);
+ }
+
+ /* Append footer transitions that follow the last explicit
+ transition. */
+ for (index = 0; index < extra_time_count; index++)
+ {
+ Transition *footer_transition
+ = &g_array_index (footertz->transitions, Transition, index);
+ if (time_count <= 0
+ || last_explicit_transition_time < footer_transition->time)
+ {
+ Transition trans;
+ trans.time = footer_transition->time;
+ trans.info_index = type_count + footer_transition->info_index;
+ g_array_append_val (gtz->transitions, trans);
+ }
+ }
+
+ g_time_zone_unref (footertz);
+ }
}
#elif defined (G_OS_WIN32)
static void
copy_windows_systemtime (SYSTEMTIME *s_time, TimeZoneDate *tzdate)
{
- tzdate->sec = s_time->wSecond;
- tzdate->min = s_time->wMinute;
- tzdate->hour = s_time->wHour;
+ tzdate->offset
+ = s_time->wHour * 3600 + s_time->wMinute * 60 + s_time->wSecond;
tzdate->mon = s_time->wMonth;
tzdate->year = s_time->wYear;
tzdate->wday = s_time->wDayOfWeek ? s_time->wDayOfWeek : 7;
}
/* UTC = local time + bias while local time = UTC + offset */
-static void
+static gboolean
rule_from_windows_time_zone_info (TimeZoneRule *rule,
TIME_ZONE_INFORMATION *tzi)
{
+ gchar *std_name, *dlt_name;
+
+ std_name = g_utf16_to_utf8 ((gunichar2 *)tzi->StandardName, -1, NULL, NULL, NULL);
+ if (std_name == NULL)
+ return FALSE;
+
+ dlt_name = g_utf16_to_utf8 ((gunichar2 *)tzi->DaylightName, -1, NULL, NULL, NULL);
+ if (dlt_name == NULL)
+ {
+ g_free (std_name);
+ return FALSE;
+ }
+
/* Set offset */
if (tzi->StandardDate.wMonth)
{
copy_windows_systemtime (&(tzi->DaylightDate), &(rule->dlt_start));
copy_windows_systemtime (&(tzi->StandardDate), &(rule->dlt_end));
-
}
else
rule->std_offset = -tzi->Bias * 60;
rule->dlt_start.mon = 0;
}
- strncpy (rule->std_name, (gchar*)tzi->StandardName, NAME_SIZE - 1);
- strncpy (rule->dlt_name, (gchar*)tzi->DaylightName, NAME_SIZE - 1);
+ strncpy (rule->std_name, std_name, NAME_SIZE - 1);
+ strncpy (rule->dlt_name, dlt_name, NAME_SIZE - 1);
+
+ g_free (std_name);
+ g_free (dlt_name);
+
+ return TRUE;
}
static gchar*
windows_default_tzname (void)
{
- const gchar *subkey =
- "SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation";
+ const gunichar2 *subkey =
+ L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation";
HKEY key;
gchar *key_name = NULL;
- if (RegOpenKeyExA (HKEY_LOCAL_MACHINE, subkey, 0,
+ gunichar2 *key_name_w = NULL;
+ if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, subkey, 0,
KEY_QUERY_VALUE, &key) == ERROR_SUCCESS)
{
DWORD size = 0;
- if (RegQueryValueExA (key, "TimeZoneKeyName", NULL, NULL,
+ if (RegQueryValueExW (key, L"TimeZoneKeyName", NULL, NULL,
NULL, &size) == ERROR_SUCCESS)
{
- key_name = g_malloc ((gint)size);
- if (RegQueryValueExA (key, "TimeZoneKeyName", NULL, NULL,
- (LPBYTE)key_name, &size) != ERROR_SUCCESS)
+ key_name_w = g_malloc ((gint)size);
+
+ if (key_name_w == NULL ||
+ RegQueryValueExW (key, L"TimeZoneKeyName", NULL, NULL,
+ (LPBYTE)key_name_w, &size) != ERROR_SUCCESS)
{
- g_free (key_name);
+ g_free (key_name_w);
key_name = NULL;
}
+ else
+ key_name = g_utf16_to_utf8 (key_name_w, -1, NULL, NULL, NULL);
}
RegCloseKey (key);
}
tzi->DaylightBias = reg->DaylightBias;
}
-static gint
-rules_from_windows_time_zone (const gchar *identifier, TimeZoneRule **rules)
+static guint
+rules_from_windows_time_zone (const gchar *identifier,
+ const gchar *resolved_identifier,
+ TimeZoneRule **rules)
{
HKEY key;
- gchar *subkey, *subkey_dynamic;
- gchar *key_name = NULL;
+ gchar *subkey = NULL;
+ gchar *subkey_dynamic = NULL;
+ const gchar *key_name;
const gchar *reg_key =
"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\";
TIME_ZONE_INFORMATION tzi;
DWORD size;
- gint rules_num = 0;
- RegTZI regtzi, regtzi_prev;
+ guint rules_num = 0;
+ RegTZI regtzi = { 0 }, regtzi_prev;
+ WCHAR winsyspath[MAX_PATH];
+ gunichar2 *subkey_w, *subkey_dynamic_w;
+
+ subkey_dynamic_w = NULL;
+
+ if (GetSystemDirectoryW (winsyspath, MAX_PATH) == 0)
+ return 0;
+
+ g_assert (rules != NULL);
*rules = NULL;
key_name = NULL;
if (!identifier)
- key_name = windows_default_tzname ();
+ key_name = resolved_identifier;
else
- key_name = g_strdup (identifier);
+ key_name = identifier;
if (!key_name)
return 0;
subkey = g_strconcat (reg_key, key_name, NULL);
+ subkey_w = g_utf8_to_utf16 (subkey, -1, NULL, NULL, NULL);
+ if (subkey_w == NULL)
+ goto utf16_conv_failed;
+
subkey_dynamic = g_strconcat (subkey, "\\Dynamic DST", NULL);
+ subkey_dynamic_w = g_utf8_to_utf16 (subkey_dynamic, -1, NULL, NULL, NULL);
+ if (subkey_dynamic_w == NULL)
+ goto utf16_conv_failed;
- if (RegOpenKeyExA (HKEY_LOCAL_MACHINE, subkey, 0,
+ if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, subkey_w, 0,
KEY_QUERY_VALUE, &key) != ERROR_SUCCESS)
- return 0;
+ goto utf16_conv_failed;
+
size = sizeof tzi.StandardName;
- if (RegQueryValueExA (key, "Std", NULL, NULL,
- (LPBYTE)&(tzi.StandardName), &size) != ERROR_SUCCESS)
- goto failed;
+
+ /* use RegLoadMUIStringW() to query MUI_Std from the registry if possible, otherwise
+ fallback to querying Std */
+ if (RegLoadMUIStringW (key, L"MUI_Std", tzi.StandardName,
+ size, &size, 0, winsyspath) != ERROR_SUCCESS)
+ {
+ size = sizeof tzi.StandardName;
+ if (RegQueryValueExW (key, L"Std", NULL, NULL,
+ (LPBYTE)&(tzi.StandardName), &size) != ERROR_SUCCESS)
+ goto registry_failed;
+ }
size = sizeof tzi.DaylightName;
- if (RegQueryValueExA (key, "Dlt", NULL, NULL,
- (LPBYTE)&(tzi.DaylightName), &size) != ERROR_SUCCESS)
- goto failed;
+ /* use RegLoadMUIStringW() to query MUI_Dlt from the registry if possible, otherwise
+ fallback to querying Dlt */
+ if (RegLoadMUIStringW (key, L"MUI_Dlt", tzi.DaylightName,
+ size, &size, 0, winsyspath) != ERROR_SUCCESS)
+ {
+ size = sizeof tzi.DaylightName;
+ if (RegQueryValueExW (key, L"Dlt", NULL, NULL,
+ (LPBYTE)&(tzi.DaylightName), &size) != ERROR_SUCCESS)
+ goto registry_failed;
+ }
RegCloseKey (key);
- if (RegOpenKeyExA (HKEY_LOCAL_MACHINE, subkey_dynamic, 0,
+ if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, subkey_dynamic_w, 0,
KEY_QUERY_VALUE, &key) == ERROR_SUCCESS)
{
- DWORD first, last;
- int year, i;
- gchar *s;
+ DWORD i, first, last, year;
+ wchar_t s[12];
size = sizeof first;
- if (RegQueryValueExA (key, "FirstEntry", NULL, NULL,
+ if (RegQueryValueExW (key, L"FirstEntry", NULL, NULL,
(LPBYTE) &first, &size) != ERROR_SUCCESS)
- goto failed;
+ goto registry_failed;
size = sizeof last;
- if (RegQueryValueExA (key, "LastEntry", NULL, NULL,
+ if (RegQueryValueExW (key, L"LastEntry", NULL, NULL,
(LPBYTE) &last, &size) != ERROR_SUCCESS)
- goto failed;
+ goto registry_failed;
rules_num = last - first + 2;
*rules = g_new0 (TimeZoneRule, rules_num);
- for (year = first, i = 0; year <= last; year++)
+ for (year = first, i = 0; *rules != NULL && year <= last; year++)
{
- s = g_strdup_printf ("%d", year);
+ gboolean failed = FALSE;
+ swprintf_s (s, 11, L"%d", year);
- size = sizeof regtzi;
- if (RegQueryValueExA (key, s, NULL, NULL,
- (LPBYTE) ®tzi, &size) != ERROR_SUCCESS)
+ if (!failed)
+ {
+ size = sizeof regtzi;
+ if (RegQueryValueExW (key, s, NULL, NULL,
+ (LPBYTE) ®tzi, &size) != ERROR_SUCCESS)
+ failed = TRUE;
+ }
+
+ if (failed)
{
g_free (*rules);
*rules = NULL;
break;
}
- g_free (s);
-
if (year > first && memcmp (®tzi_prev, ®tzi, sizeof regtzi) == 0)
continue;
else
memcpy (®tzi_prev, ®tzi, sizeof regtzi);
register_tzi_to_tzi (®tzi, &tzi);
- rule_from_windows_time_zone_info (&(*rules)[i], &tzi);
+
+ if (!rule_from_windows_time_zone_info (&(*rules)[i], &tzi))
+ {
+ g_free (*rules);
+ *rules = NULL;
+ break;
+ }
+
(*rules)[i++].start_year = year;
}
rules_num = i + 1;
-failed:
+registry_failed:
RegCloseKey (key);
}
- else if (RegOpenKeyExA (HKEY_LOCAL_MACHINE, subkey, 0,
+ else if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, subkey_w, 0,
KEY_QUERY_VALUE, &key) == ERROR_SUCCESS)
{
size = sizeof regtzi;
- if (RegQueryValueExA (key, "TZI", NULL, NULL,
+ if (RegQueryValueExW (key, L"TZI", NULL, NULL,
(LPBYTE) ®tzi, &size) == ERROR_SUCCESS)
{
rules_num = 2;
*rules = g_new0 (TimeZoneRule, 2);
register_tzi_to_tzi (®tzi, &tzi);
- rule_from_windows_time_zone_info (&(*rules)[0], &tzi);
+
+ if (!rule_from_windows_time_zone_info (&(*rules)[0], &tzi))
+ {
+ g_free (*rules);
+ *rules = NULL;
+ }
}
RegCloseKey (key);
}
+utf16_conv_failed:
+ g_free (subkey_dynamic_w);
g_free (subkey_dynamic);
+ g_free (subkey_w);
g_free (subkey);
- g_free (key_name);
if (*rules)
{
return rules_num;
}
- else
- return 0;
+
+ return 0;
}
#endif
static void
find_relative_date (TimeZoneDate *buffer)
{
- gint wday;
+ guint wday;
GDate date;
g_date_clear (&date, 1);
wday = buffer->wday;
else /* M.W.D */
{
guint days;
- guint days_in_month = g_date_days_in_month (buffer->mon, buffer->year);
+ guint days_in_month = g_date_get_days_in_month (buffer->mon, buffer->year);
GDateWeekday first_wday;
g_date_set_dmy (&date, 1, buffer->mon, buffer->year);
first_wday = g_date_get_weekday (&date);
- if (first_wday > wday)
+ if ((guint) first_wday > wday)
++(buffer->week);
/* week is 1 <= w <= 5, we need 0-based */
days = 7 * (buffer->week - 1) + wday - first_wday;
- while (days > days_in_month)
+ /* "days" is a 0-based offset from the 1st of the month.
+ * Adding days == days_in_month would bring us into the next month,
+ * hence the ">=" instead of just ">".
+ */
+ while (days >= days_in_month)
days -= 7;
g_date_add_days (&date, days);
g_date_clear (&date, 1);
g_date_set_dmy (&date, buffer.mday, buffer.mon, buffer.year);
return ((g_date_get_julian (&date) - unix_epoch_start) * seconds_per_day +
- buffer.hour * 3600 + buffer.min * 60 + buffer.sec - offset);
+ buffer.offset - offset);
}
static void
info->gmt_offset = offset;
info->is_dst = is_dst;
- info->is_standard = FALSE;
- info->is_gmt = FALSE;
if (name)
info->abbrev = g_strdup (name);
static void
init_zone_from_rules (GTimeZone *gtz,
TimeZoneRule *rules,
- gint rules_num)
+ guint rules_num,
+ gchar *identifier /* (transfer full) */)
{
guint type_count = 0, trans_count = 0, info_index = 0;
guint ri; /* rule index */
type_count++;
}
+ gtz->name = g_steal_pointer (&identifier);
gtz->t_info = g_array_sized_new (FALSE, TRUE, sizeof (TransitionInfo), type_count);
gtz->transitions = g_array_sized_new (FALSE, TRUE, sizeof (Transition), trans_count);
++info_index;
skip_first_std_trans = TRUE;
}
- else if (rules[ri].std_offset || rules[ri].dlt_offset)
+ else
{
const guint start_year = rules[ri].start_year;
const guint end_year = rules[ri + 1].start_year;
* - N is 0 to 365
*
* time is either h or hh[[:]mm[[[:]ss]]]
- * - h[h] is 0 to 23
+ * - h[h] is 0 to 24
* - mm is 00 to 59
* - ss is 00 to 59
*/
return TRUE;
}
-/* Different implementations of tzset interpret the Julian day field
- differently. For example, Linux specifies that it should be 1-based
- (1 Jan is JD 1) for both Jn and n formats, while zOS and BSD
- specify that a Jn JD is 1-based while an n JD is 0-based. Rather
- than trying to follow different specs, we will follow GDate's
- practice thatIn order to keep it simple, we will follow Linux's
- practice. */
-
+/*
+ * This parses two slightly different ways of specifying
+ * the Julian day:
+ *
+ * - ignore_leap == TRUE
+ *
+ * Jn This specifies the Julian day with n between 1 and 365. Leap days
+ * are not counted. In this format, February 29 can't be represented;
+ * February 28 is day 59, and March 1 is always day 60.
+ *
+ * - ignore_leap == FALSE
+ *
+ * n This specifies the zero-based Julian day with n between 0 and 365.
+ * February 29 is counted in leap years.
+ */
static gboolean
parse_julian_boundary (gchar** pos, TimeZoneDate *boundary,
gboolean ignore_leap)
day += *(*pos)++ - '0';
}
- if (day < 1 || 365 < day)
- return FALSE;
+ if (ignore_leap)
+ {
+ if (day < 1 || 365 < day)
+ return FALSE;
+ if (day >= 59)
+ day++;
+ }
+ else
+ {
+ if (day < 0 || 365 < day)
+ return FALSE;
+ /* GDate wants day in range 1->366 */
+ day++;
+ }
g_date_clear (&date, 1);
g_date_set_julian (&date, day);
boundary->mday = (int) g_date_get_day (&date);
boundary->wday = 0;
- if (!ignore_leap && day >= 59)
- boundary->mday++;
-
return TRUE;
}
else if (*pos == 'J')
{
++pos;
- if (!parse_julian_boundary (&pos, boundary, FALSE))
+ if (!parse_julian_boundary (&pos, boundary, TRUE))
return FALSE ;
}
/* Julian date which counts Feb 29 in leap years */
else if (*pos >= '0' && '9' >= *pos)
{
- if (!parse_julian_boundary (&pos, boundary, TRUE))
+ if (!parse_julian_boundary (&pos, boundary, FALSE))
return FALSE;
}
else
/* Time */
if (*pos == '/')
- {
- gint32 offset;
-
- if (!parse_time (++pos, &offset))
- return FALSE;
-
- boundary->hour = offset / 3600;
- boundary->min = (offset / 60) % 60;
- boundary->sec = offset % 3600;
-
- return TRUE;
- }
-
+ return parse_constant_offset (pos + 1, &boundary->offset, TRUE);
else
{
- boundary->hour = 2;
- boundary->min = 0;
- boundary->sec = 0;
-
+ boundary->offset = 2 * 60 * 60;
return *pos == '\0';
}
}
-static gint
+static guint
create_ruleset_from_rule (TimeZoneRule **rules, TimeZoneRule *rule)
{
*rules = g_new0 (TimeZoneRule, 2);
++(*pos);
buffer = g_strndup (target_pos, *pos - target_pos);
- ret = parse_constant_offset (buffer, target);
+ ret = parse_constant_offset (buffer, target, FALSE);
g_free (buffer);
return ret;
static gboolean
set_tz_name (gchar **pos, gchar *buffer, guint size)
{
+ gboolean quoted = **pos == '<';
gchar *name_pos = *pos;
guint len;
- /* Name is ASCII alpha (Is this necessarily true?) */
- while (g_ascii_isalpha (**pos))
- ++(*pos);
+ g_assert (size != 0);
- /* Name should be three or more alphabetic characters */
+ if (quoted)
+ {
+ name_pos++;
+ do
+ ++(*pos);
+ while (g_ascii_isalnum (**pos) || **pos == '-' || **pos == '+');
+ if (**pos != '>')
+ return FALSE;
+ }
+ else
+ while (g_ascii_isalpha (**pos))
+ ++(*pos);
+
+ /* Name should be three or more characters */
+ /* FIXME: Should return FALSE if the name is too long.
+ This should simplify code later in this function. */
if (*pos - name_pos < 3)
return FALSE;
- memset (buffer, 0, NAME_SIZE);
+ memset (buffer, 0, size);
/* name_pos isn't 0-terminated, so we have to limit the length expressly */
- len = *pos - name_pos > size - 1 ? size - 1 : *pos - name_pos;
+ len = (guint) (*pos - name_pos) > size - 1 ? size - 1 : (guint) (*pos - name_pos);
strncpy (buffer, name_pos, len);
+ *pos += quoted;
return TRUE;
}
* Creates an array of TimeZoneRule from a TZ environment variable
* type of identifier. Should free rules afterwards
*/
-static gint
+static guint
rules_from_identifier (const gchar *identifier,
TimeZoneRule **rules)
{
gchar *pos;
TimeZoneRule tzr;
+ g_assert (rules != NULL);
+
+ *rules = NULL;
+
if (!identifier)
return 0;
return 0;
if (*pos == 0)
- return create_ruleset_from_rule (rules, &tzr);
+ {
+ return create_ruleset_from_rule (rules, &tzr);
+ }
/* Format 2 */
if (!(set_tz_name (&pos, tzr.dlt_name, NAME_SIZE)))
#ifdef G_OS_WIN32
/* Windows allows us to use the US DST boundaries if they're not given */
{
- int i;
- guint rules_num = 0;
+ guint i, rules_num = 0;
/* Use US rules, Windows' default is Pacific Standard Time */
if ((rules_num = rules_from_windows_time_zone ("Pacific Standard Time",
+ NULL,
rules)))
{
for (i = 0; i < rules_num - 1; i++)
return create_ruleset_from_rule (rules, &tzr);
}
+#ifdef G_OS_UNIX
+static GTimeZone *
+parse_footertz (const gchar *footer, size_t footerlen)
+{
+ gchar *tzstring = g_strndup (footer + 1, footerlen - 2);
+ GTimeZone *footertz = NULL;
+
+ /* FIXME: The allocation for tzstring could be avoided by
+ passing a gsize identifier_len argument to rules_from_identifier
+ and changing the code in that function to stop assuming that
+ identifier is nul-terminated. */
+ TimeZoneRule *rules;
+ guint rules_num = rules_from_identifier (tzstring, &rules);
+
+ g_free (tzstring);
+ if (rules_num > 1)
+ {
+ footertz = g_slice_new0 (GTimeZone);
+ init_zone_from_rules (footertz, rules, rules_num, NULL);
+ footertz->ref_count++;
+ }
+ g_free (rules);
+ return footertz;
+}
+#endif
+
/* Construction {{{1 */
/**
* g_time_zone_new:
- * @identifier: (allow-none): a timezone identifier
+ * @identifier: (nullable): a timezone identifier
+ *
+ * A version of g_time_zone_new_identifier() which returns the UTC time zone
+ * if @identifier could not be parsed or loaded.
+ *
+ * If you need to check whether @identifier was loaded successfully, use
+ * g_time_zone_new_identifier().
+ *
+ * Returns: (transfer full) (not nullable): the requested timezone
+ * Deprecated: 2.68: Use g_time_zone_new_identifier() instead, as it provides
+ * error reporting. Change your code to handle a potentially %NULL return
+ * value.
+ *
+ * Since: 2.26
+ **/
+GTimeZone *
+g_time_zone_new (const gchar *identifier)
+{
+ GTimeZone *tz = g_time_zone_new_identifier (identifier);
+
+ /* Always fall back to UTC. */
+ if (tz == NULL)
+ tz = g_time_zone_new_utc ();
+
+ g_assert (tz != NULL);
+
+ return g_steal_pointer (&tz);
+}
+
+/**
+ * g_time_zone_new_identifier:
+ * @identifier: (nullable): a timezone identifier
*
- * Creates a #GTimeZone corresponding to @identifier.
+ * Creates a #GTimeZone corresponding to @identifier. If @identifier cannot be
+ * parsed or loaded, %NULL is returned.
*
* @identifier can either be an RFC3339/ISO 8601 time offset or
* something that would pass as a valid value for the `TZ` environment
* In Windows, @identifier can also be the unlocalized name of a time
* zone for standard time, for example "Pacific Standard Time".
*
- * Valid RFC3339 time offsets are <literal>"Z"</literal> (for UTC) or
- * <literal>"±hh:mm"</literal>. ISO 8601 additionally specifies
- * <literal>"±hhmm"</literal> and <literal>"±hh"</literal>. Offsets are
+ * Valid RFC3339 time offsets are `"Z"` (for UTC) or
+ * `"±hh:mm"`. ISO 8601 additionally specifies
+ * `"±hhmm"` and `"±hh"`. Offsets are
* time values to be added to Coordinated Universal Time (UTC) to get
* the local time.
*
- * In Unix, the `TZ` environment variable typically corresponds
- * to the name of a file in the zoneinfo database, or string in
+ * In UNIX, the `TZ` environment variable typically corresponds
+ * to the name of a file in the zoneinfo database, an absolute path to a file
+ * somewhere else, or a string in
* "std offset [dst [offset],start[/time],end[/time]]" (POSIX) format.
* There are no spaces in the specification. The name of standard
* and daylight savings time zone must be three or more alphabetic
* characters. Offsets are time values to be added to local time to
* get Coordinated Universal Time (UTC) and should be
- * <literal>"[±]hh[[:]mm[:ss]]"</literal>. Dates are either
- * <literal>"Jn"</literal> (Julian day with n between 1 and 365, leap
- * years not counted), <literal>"n"</literal> (zero-based Julian day
- * with n between 0 and 365) or <literal>"Mm.w.d"</literal> (day d
+ * `"[±]hh[[:]mm[:ss]]"`. Dates are either
+ * `"Jn"` (Julian day with n between 1 and 365, leap
+ * years not counted), `"n"` (zero-based Julian day
+ * with n between 0 and 365) or `"Mm.w.d"` (day d
* (0 <= d <= 6) of week w (1 <= w <= 5) of month m (1 <= m <= 12), day
* 0 is a Sunday). Times are in local wall clock time, the default is
* 02:00:00.
*
* g_time_zone_new_local() calls this function with the value of the
* `TZ` environment variable. This function itself is independent of
- * the value of `TZ`, but if @identifier is %NULL then
- * <filename>/etc/localtime</filename> will be consulted
- * to discover the correct time zone on Unix and the registry will be
- * consulted or GetTimeZoneInformation() will be used to get the local
- * time zone on Windows.
+ * the value of `TZ`, but if @identifier is %NULL then `/etc/localtime`
+ * will be consulted to discover the correct time zone on UNIX and the
+ * registry will be consulted or GetTimeZoneInformation() will be used
+ * to get the local time zone on Windows.
*
* If intervals are not available, only time zone rules from `TZ`
* environment variable or other means, then they will be computed
* available and it is greater than 2037, then it will followed
* instead.
*
- * See <ulink
- * url='http://tools.ietf.org/html/rfc3339#section-5.6'>RFC3339
- * §5.6</ulink> for a precise definition of valid RFC3339 time offsets
- * (the <literal>time-offset</literal> expansion) and ISO 8601 for the
- * full list of valid time offsets. See <ulink
- * url='http://www.gnu.org/s/libc/manual/html_node/TZ-Variable.html'>The
- * GNU C Library manual</ulink> for an explanation of the possible
- * values of the `TZ` environment variable. See <ulink
- * url='http://msdn.microsoft.com/en-us/library/ms912391%28v=winembedded.11%29.aspx'>
- * Microsoft Time Zone Index Values</ulink> for the list of time zones
- * on Windows.
+ * See
+ * [RFC3339 §5.6](http://tools.ietf.org/html/rfc3339#section-5.6)
+ * for a precise definition of valid RFC3339 time offsets
+ * (the `time-offset` expansion) and ISO 8601 for the
+ * full list of valid time offsets. See
+ * [The GNU C Library manual](http://www.gnu.org/s/libc/manual/html_node/TZ-Variable.html)
+ * for an explanation of the possible
+ * values of the `TZ` environment variable. See
+ * [Microsoft Time Zone Index Values](http://msdn.microsoft.com/en-us/library/ms912391%28v=winembedded.11%29.aspx)
+ * for the list of time zones on Windows.
*
* You should release the return value by calling g_time_zone_unref()
* when you are done with it.
*
- * Returns: the requested timezone
- *
- * Since: 2.26
- **/
+ * Returns: (transfer full) (nullable): the requested timezone, or %NULL on
+ * failure
+ * Since: 2.68
+ */
GTimeZone *
-g_time_zone_new (const gchar *identifier)
+g_time_zone_new_identifier (const gchar *identifier)
{
GTimeZone *tz = NULL;
TimeZoneRule *rules;
gint rules_num;
-
- G_LOCK (time_zones);
- if (time_zones == NULL)
- time_zones = g_hash_table_new (g_str_hash, g_str_equal);
+ gchar *resolved_identifier = NULL;
if (identifier)
{
+ G_LOCK (time_zones);
+ if (time_zones == NULL)
+ time_zones = g_hash_table_new (g_str_hash, g_str_equal);
+
tz = g_hash_table_lookup (time_zones, identifier);
if (tz)
{
G_UNLOCK (time_zones);
return tz;
}
+ else
+ resolved_identifier = g_strdup (identifier);
+ }
+ else
+ {
+ G_LOCK (tz_default);
+#ifdef G_OS_UNIX
+ resolved_identifier = zone_identifier_unix ();
+#elif defined (G_OS_WIN32)
+ resolved_identifier = windows_default_tzname ();
+#endif
+ if (tz_default)
+ {
+ /* Flush default if changed. If the identifier couldn’t be resolved,
+ * we’re going to fall back to UTC eventually, so don’t clear out the
+ * cache if it’s already UTC. */
+ if (!(resolved_identifier == NULL && g_str_equal (tz_default->name, "UTC")) &&
+ g_strcmp0 (tz_default->name, resolved_identifier) != 0)
+ {
+ g_clear_pointer (&tz_default, g_time_zone_unref);
+ }
+ else
+ {
+ tz = g_time_zone_ref (tz_default);
+ G_UNLOCK (tz_default);
+
+ g_free (resolved_identifier);
+ return tz;
+ }
+ }
}
tz = g_slice_new0 (GTimeZone);
- tz->name = g_strdup (identifier);
tz->ref_count = 0;
zone_for_constant_offset (tz, identifier);
if (tz->t_info == NULL &&
(rules_num = rules_from_identifier (identifier, &rules)))
{
- init_zone_from_rules (tz, rules, rules_num);
+ init_zone_from_rules (tz, rules, rules_num, g_steal_pointer (&resolved_identifier));
g_free (rules);
}
if (tz->t_info == NULL)
{
#ifdef G_OS_UNIX
- GBytes *zoneinfo = zone_info_unix (identifier);
- if (!zoneinfo)
- zone_for_constant_offset (tz, "UTC");
- else
+ GBytes *zoneinfo = zone_info_unix (identifier, resolved_identifier);
+ if (zoneinfo != NULL)
{
- init_zone_from_iana_info (tz, zoneinfo);
+ init_zone_from_iana_info (tz, zoneinfo, g_steal_pointer (&resolved_identifier));
g_bytes_unref (zoneinfo);
}
#elif defined (G_OS_WIN32)
- if ((rules_num = rules_from_windows_time_zone (identifier, &rules)))
+ if ((rules_num = rules_from_windows_time_zone (identifier,
+ resolved_identifier,
+ &rules)))
{
- init_zone_from_rules (tz, rules, rules_num);
+ init_zone_from_rules (tz, rules, rules_num, g_steal_pointer (&resolved_identifier));
g_free (rules);
}
+#endif
}
+#if defined (G_OS_WIN32)
if (tz->t_info == NULL)
{
- if (identifier)
- zone_for_constant_offset (tz, "UTC");
- else
+ if (identifier == NULL)
{
TIME_ZONE_INFORMATION tzi;
{
rules = g_new0 (TimeZoneRule, 2);
- rule_from_windows_time_zone_info (&rules[0], &tzi);
-
- memset (rules[0].std_name, 0, NAME_SIZE);
- memset (rules[0].dlt_name, 0, NAME_SIZE);
+ if (rule_from_windows_time_zone_info (&rules[0], &tzi))
+ {
+ memset (rules[0].std_name, 0, NAME_SIZE);
+ memset (rules[0].dlt_name, 0, NAME_SIZE);
- rules[0].start_year = MIN_TZYEAR;
- rules[1].start_year = MAX_TZYEAR;
+ rules[0].start_year = MIN_TZYEAR;
+ rules[1].start_year = MAX_TZYEAR;
- init_zone_from_rules (tz, rules, 2);
+ init_zone_from_rules (tz, rules, 2, g_steal_pointer (&resolved_identifier));
+ }
g_free (rules);
}
}
-#endif
}
+#endif
+
+ g_free (resolved_identifier);
- if (tz->t_info != NULL)
+ /* Failed to load the timezone. */
+ if (tz->t_info == NULL)
{
+ g_slice_free (GTimeZone, tz);
+
if (identifier)
- g_hash_table_insert (time_zones, tz->name, tz);
+ G_UNLOCK (time_zones);
+ else
+ G_UNLOCK (tz_default);
+
+ return NULL;
+ }
+
+ g_assert (tz->name != NULL);
+ g_assert (tz->t_info != NULL);
+
+ if (identifier)
+ g_hash_table_insert (time_zones, tz->name, tz);
+ else if (tz->name)
+ {
+ /* Caching reference */
+ g_atomic_int_inc (&tz->ref_count);
+ tz_default = tz;
}
+
g_atomic_int_inc (&tz->ref_count);
- G_UNLOCK (time_zones);
+
+ if (identifier)
+ G_UNLOCK (time_zones);
+ else
+ G_UNLOCK (tz_default);
return tz;
}
GTimeZone *
g_time_zone_new_utc (void)
{
- return g_time_zone_new ("UTC");
+ static GTimeZone *utc = NULL;
+ static gsize initialised;
+
+ if (g_once_init_enter (&initialised))
+ {
+ utc = g_time_zone_new_identifier ("UTC");
+ g_assert (utc != NULL);
+ g_once_init_leave (&initialised, TRUE);
+ }
+
+ return g_time_zone_ref (utc);
}
/**
GTimeZone *
g_time_zone_new_local (void)
{
- return g_time_zone_new (getenv ("TZ"));
+ const gchar *tzenv = g_getenv ("TZ");
+ GTimeZone *tz;
+
+ G_LOCK (tz_local);
+
+ /* Is time zone changed and must be flushed? */
+ if (tz_local && g_strcmp0 (g_time_zone_get_identifier (tz_local), tzenv))
+ g_clear_pointer (&tz_local, g_time_zone_unref);
+
+ if (tz_local == NULL)
+ tz_local = g_time_zone_new_identifier (tzenv);
+ if (tz_local == NULL)
+ tz_local = g_time_zone_new_utc ();
+
+ tz = g_time_zone_ref (tz_local);
+
+ G_UNLOCK (tz_local);
+
+ return tz;
+}
+
+/**
+ * g_time_zone_new_offset:
+ * @seconds: offset to UTC, in seconds
+ *
+ * Creates a #GTimeZone corresponding to the given constant offset from UTC,
+ * in seconds.
+ *
+ * This is equivalent to calling g_time_zone_new() with a string in the form
+ * `[+|-]hh[:mm[:ss]]`.
+ *
+ * It is possible for this function to fail if @seconds is too big (greater than
+ * 24 hours), in which case this function will return the UTC timezone for
+ * backwards compatibility. To detect failures like this, use
+ * g_time_zone_new_identifier() directly.
+ *
+ * Returns: (transfer full): a timezone at the given offset from UTC, or UTC on
+ * failure
+ * Since: 2.58
+ */
+GTimeZone *
+g_time_zone_new_offset (gint32 seconds)
+{
+ GTimeZone *tz = NULL;
+ gchar *identifier = NULL;
+
+ /* Seemingly, we should be using @seconds directly to set the
+ * #TransitionInfo.gmt_offset to avoid all this string building and parsing.
+ * However, we always need to set the #GTimeZone.name to a constructed
+ * string anyway, so we might as well reuse its code.
+ * g_time_zone_new_identifier() should never fail in this situation. */
+ identifier = g_strdup_printf ("%c%02u:%02u:%02u",
+ (seconds >= 0) ? '+' : '-',
+ (ABS (seconds) / 60) / 60,
+ (ABS (seconds) / 60) % 60,
+ ABS (seconds) % 60);
+ tz = g_time_zone_new_identifier (identifier);
+
+ if (tz == NULL)
+ tz = g_time_zone_new_utc ();
+ else
+ g_assert (g_time_zone_get_offset (tz, 0) == seconds);
+
+ g_assert (tz != NULL);
+ g_free (identifier);
+
+ return tz;
}
#define TRANSITION(n) g_array_index (tz->transitions, Transition, n)
guint interval)
{
if (tz->transitions && interval < tz->transitions->len)
- return (TRANSITION(interval)).time - 1;
+ {
+ gint64 lim = (TRANSITION(interval)).time;
+ return lim - (lim != G_MININT64);
+ }
return G_MAXINT64;
}
}
-inline static gboolean
-interval_isgmt (GTimeZone *tz,
- guint interval)
-{
- g_return_val_if_fail (tz->t_info != NULL, 0);
- return interval_info (tz, interval)->is_gmt;
-}
-
-inline static gboolean
-interval_isstandard (GTimeZone *tz,
- guint interval)
-{
- return interval_info (tz, interval)->is_standard;
-}
-
inline static gchar*
interval_abbrev (GTimeZone *tz,
guint interval)
GTimeType type,
gint64 *time_)
{
- gint i;
- guint intervals;
+ guint i, intervals;
+ gboolean interval_is_dst;
if (tz->transitions == NULL)
return 0;
*time_ = interval_local_start (tz, i);
}
- else if (interval_isdst (tz, i) != type)
- /* it's in this interval, but dst flag doesn't match.
- * check neighbours for a better fit. */
+ else
{
- if (i && *time_ <= interval_local_end (tz, i - 1))
- i--;
-
- else if (i < intervals &&
- *time_ >= interval_local_start (tz, i + 1))
- i++;
+ interval_is_dst = interval_isdst (tz, i);
+ if ((interval_is_dst && type != G_TIME_TYPE_DAYLIGHT) ||
+ (!interval_is_dst && type == G_TIME_TYPE_DAYLIGHT))
+ {
+ /* it's in this interval, but dst flag doesn't match.
+ * check neighbours for a better fit. */
+ if (i && *time_ <= interval_local_end (tz, i - 1))
+ i--;
+
+ else if (i < intervals &&
+ *time_ >= interval_local_start (tz, i + 1))
+ i++;
+ }
}
}
* @type: the #GTimeType of @time_
* @time_: a number of seconds since January 1, 1970
*
- * Finds an the interval within @tz that corresponds to the given @time_.
+ * Finds an interval within @tz that corresponds to the given @time_.
* The meaning of @time_ depends on @type.
*
* If @type is %G_TIME_TYPE_UNIVERSAL then this function will always
* succeed (since universal time is monotonic and continuous).
*
- * Otherwise @time_ is treated is local time. The distinction between
+ * Otherwise @time_ is treated as local time. The distinction between
* %G_TIME_TYPE_STANDARD and %G_TIME_TYPE_DAYLIGHT is ignored except in
* the case that the given @time_ is ambiguous. In Toronto, for example,
* 01:30 on November 7th 2010 occurred twice (once inside of daylight
GTimeType type,
gint64 time_)
{
- gint i;
- guint intervals;
+ guint i, intervals;
+ gboolean interval_is_dst;
if (tz->transitions == NULL)
return 0;
return -1;
}
- else if (interval_isdst (tz, i) != type)
+ else
{
- if (i && time_ <= interval_local_end (tz, i - 1))
- i--;
+ interval_is_dst = interval_isdst (tz, i);
+ if ((interval_is_dst && type != G_TIME_TYPE_DAYLIGHT) ||
+ (!interval_is_dst && type == G_TIME_TYPE_DAYLIGHT))
+ {
+ if (i && time_ <= interval_local_end (tz, i - 1))
+ i--;
- else if (i < intervals && time_ >= interval_local_start (tz, i + 1))
- i++;
+ else if (i < intervals && time_ >= interval_local_start (tz, i + 1))
+ i++;
+ }
}
return i;
return interval_isdst (tz, (guint)interval);
}
+/**
+ * g_time_zone_get_identifier:
+ * @tz: a #GTimeZone
+ *
+ * Get the identifier of this #GTimeZone, as passed to g_time_zone_new().
+ * If the identifier passed at construction time was not recognised, `UTC` will
+ * be returned. If it was %NULL, the identifier of the local timezone at
+ * construction time will be returned.
+ *
+ * The identifier will be returned in the same format as provided at
+ * construction time: if provided as a time offset, that will be returned by
+ * this function.
+ *
+ * Returns: identifier for this timezone
+ * Since: 2.58
+ */
+const gchar *
+g_time_zone_get_identifier (GTimeZone *tz)
+{
+ g_return_val_if_fail (tz != NULL, NULL);
+
+ return tz->name;
+}
+
/* Epilogue {{{1 */
/* vim:set foldmethod=marker: */
projects / platform / upstream / glib.git / blobdiff