luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extract function zone_info_unix

Browse Source
This commit is contained in:
John Ralls 2012-10-15 14:11:14 -07:00
parent 5df1edaf70
commit 47de8646e2
1 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
glib/gtimezone.c
View File

@ -305,6 +305,50 @@ zone_for_constant_offset (const gchar *name)
return g_bytes_new_take (fake, sizeof *fake); return g_bytes_new_take (fake, sizeof *fake);
} }
static GBytes*
zone_info_unix (const gchar *identifier)
{
gchar *filename;
GMappedFile *file = NULL;
GBytes *zoneinfo = NULL;
/* identifier can be a relative or absolute path name;
if relative, it is interpreted starting from /usr/share/zoneinfo
while the POSIX standard says it should start with :,
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 ++;
if (g_path_is_absolute (identifier))
filename = g_strdup (identifier);
else
filename = g_build_filename (tzdir, identifier, NULL);
}
else
filename = g_strdup ("/etc/localtime");
file = g_mapped_file_new (filename, FALSE, NULL);
if (file != NULL)
{
zoneinfo = g_bytes_new_with_free_func (g_mapped_file_get_contents (file),
g_mapped_file_get_length (file),
(GDestroyNotify)g_mapped_file_unref,
g_mapped_file_ref (file));
g_mapped_file_unref (file);
}
g_free (filename);
return zoneinfo;
}
/* Construction {{{1 */ /* Construction {{{1 */
/** /**
* g_time_zone_new: * g_time_zone_new:
@ -371,43 +415,7 @@ g_time_zone_new (const gchar *identifier)
tz->zoneinfo = zone_for_constant_offset (identifier); tz->zoneinfo = zone_for_constant_offset (identifier);
if (tz->zoneinfo == NULL) if (tz->zoneinfo == NULL)
{ tz->zoneinfo = zone_info_unix (identifier);
gchar *filename;
/* identifier can be a relative or absolute path name;
if relative, it is interpreted starting from /usr/share/zoneinfo
while the POSIX standard says it should start with :,
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 ++;
if (g_path_is_absolute (identifier))
filename = g_strdup (identifier);
else
filename = g_build_filename (tzdir, identifier, NULL);
}
else
filename = g_strdup ("/etc/localtime");
file = g_mapped_file_new (filename, FALSE, NULL);
if (file != NULL)
{
tz->zoneinfo = g_bytes_new_with_free_func (g_mapped_file_get_contents (file),
g_mapped_file_get_length (file),
(GDestroyNotify)g_mapped_file_unref,
g_mapped_file_ref (file));
g_mapped_file_unref (file);
}
g_free (filename);
}
if (tz->zoneinfo != NULL) if (tz->zoneinfo != NULL)
{ {