|
|
@ -1,11 +1,11 @@ |
|
|
From: Joe Orton <jorton@redhat.com> |
|
|
|
|
|
Date: Thu, 20 Oct 2016 11:44:14 +0200 |
|
|
|
|
|
Subject: Add support for use of the system timezone database |
|
|
|
|
|
|
|
|
# License: MIT |
|
|
|
|
|
# http://opensource.org/licenses/MIT |
|
|
|
|
|
|
|
|
Add support for use of the system timezone database, rather |
|
|
Add support for use of the system timezone database, rather |
|
|
than embedding a copy. Discussed upstream but was not desired. |
|
|
than embedding a copy. Discussed upstream but was not desired. |
|
|
|
|
|
|
|
|
History: |
|
|
History: |
|
|
|
|
|
r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1) |
|
|
r14: improve check for valid tz file |
|
|
r14: improve check for valid tz file |
|
|
r13: adapt for upstream changes to use PHP allocator |
|
|
r13: adapt for upstream changes to use PHP allocator |
|
|
r12: adapt for upstream changes for new zic |
|
|
r12: adapt for upstream changes for new zic |
|
|
@ -25,18 +25,13 @@ r4: added "System/Localtime" tzname which uses /etc/localtime |
|
|
r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) |
|
|
r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) |
|
|
r2: add filesystem trawl to set up name alias index |
|
|
r2: add filesystem trawl to set up name alias index |
|
|
r1: initial revision |
|
|
r1: initial revision |
|
|
---
|
|
|
|
|
|
ext/date/lib/parse_tz.c | 560 +++++++++++++++++++++++++++++++++++++++++++++++- |
|
|
|
|
|
ext/date/lib/timelib.m4 | 13 ++ |
|
|
|
|
|
2 files changed, 562 insertions(+), 11 deletions(-) |
|
|
|
|
|
|
|
|
|
|
|
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
|
|
|
|
|
|
index 20d7eea..ed7717e 100644
|
|
|
|
|
|
--- a/ext/date/lib/parse_tz.c
|
|
|
|
|
|
+++ b/ext/date/lib/parse_tz.c
|
|
|
|
|
|
@@ -24,6 +24,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
|
|
|
|
|
|
--- ./ext/date/lib/parse_tz.c.systzdata 2017-08-22 09:40:38.000000000 +0200
|
|
|
|
|
|
+++ ./ext/date/lib/parse_tz.c 2017-08-22 12:16:00.370298079 +0200
|
|
|
|
|
|
@@ -25,8 +25,21 @@
|
|
|
#include "timelib.h" |
|
|
#include "timelib.h" |
|
|
|
|
|
#include "timelib_private.h" |
|
|
|
|
|
|
|
|
+#ifdef HAVE_SYSTEM_TZDATA
|
|
|
+#ifdef HAVE_SYSTEM_TZDATA
|
|
|
+#include <sys/mman.h>
|
|
|
+#include <sys/mman.h>
|
|
|
@ -46,16 +41,8 @@ index 20d7eea..ed7717e 100644 |
|
|
+#include <unistd.h>
|
|
|
+#include <unistd.h>
|
|
|
+
|
|
|
+
|
|
|
+#include "php_scandir.h"
|
|
|
+#include "php_scandir.h"
|
|
|
+#endif
|
|
|
|
|
|
+
|
|
|
+
|
|
|
#include <stdio.h> |
|
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_LOCALE_H |
|
|
|
|
|
@@ -36,8 +46,12 @@
|
|
|
|
|
|
#include <strings.h> |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
+#ifndef HAVE_SYSTEM_TZDATA
|
|
|
|
|
|
|
|
|
+#else
|
|
|
#define TIMELIB_SUPPORTS_V2DATA |
|
|
#define TIMELIB_SUPPORTS_V2DATA |
|
|
#include "timezonedb.h" |
|
|
#include "timezonedb.h" |
|
|
+#endif
|
|
|
+#endif
|
|
|
@ -64,7 +51,7 @@ index 20d7eea..ed7717e 100644 |
|
|
|
|
|
|
|
|
#if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) |
|
|
#if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) |
|
|
# if defined(__LITTLE_ENDIAN__) |
|
|
# if defined(__LITTLE_ENDIAN__) |
|
|
@@ -59,6 +73,11 @@ static int read_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
|
|
|
|
|
|
|
|
|
@@ -67,6 +80,11 @@ static int read_php_preamble(const unsig
|
|
|
{ |
|
|
{ |
|
|
uint32_t version; |
|
|
uint32_t version; |
|
|
|
|
|
|
|
|
@ -76,7 +63,7 @@ index 20d7eea..ed7717e 100644 |
|
|
/* read ID */ |
|
|
/* read ID */ |
|
|
version = (*tzf)[3] - '0'; |
|
|
version = (*tzf)[3] - '0'; |
|
|
*tzf += 4; |
|
|
*tzf += 4; |
|
|
@@ -302,7 +321,429 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
|
|
|
|
|
|
|
|
|
@@ -374,7 +392,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -507,7 +494,7 @@ index 20d7eea..ed7717e 100644 |
|
|
{ |
|
|
{ |
|
|
int left = 0, right = tzdb->index_size - 1; |
|
|
int left = 0, right = tzdb->index_size - 1; |
|
|
#ifdef HAVE_SETLOCALE |
|
|
#ifdef HAVE_SETLOCALE |
|
|
@@ -341,21 +782,88 @@ static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const
|
|
|
|
|
|
|
|
|
@@ -419,9 +859,48 @@ static int seek_to_tz_position(const uns
|
|
|
return 0; |
|
|
return 0; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -555,17 +542,8 @@ index 20d7eea..ed7717e 100644 |
|
|
+#endif
|
|
|
+#endif
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count) |
|
|
|
|
|
{ |
|
|
|
|
|
+#ifdef HAVE_SYSTEM_TZDATA
|
|
|
|
|
|
+ *count = timezonedb_system->index_size;
|
|
|
|
|
|
+ return timezonedb_system->index;
|
|
|
|
|
|
+#else
|
|
|
|
|
|
*count = sizeof(timezonedb_idx_builtin) / sizeof(*timezonedb_idx_builtin); |
|
|
|
|
|
return timezonedb_idx_builtin; |
|
|
|
|
|
+#endif
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(timelib_tzdb *tzdb, int *count) |
|
|
|
|
|
@@ -433,7 +912,30 @@ const timelib_tzdb_index_entry *timelib_
|
|
|
int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) |
|
|
int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) |
|
|
{ |
|
|
{ |
|
|
const unsigned char *tzf; |
|
|
const unsigned char *tzf; |
|
|
@ -596,32 +574,27 @@ index 20d7eea..ed7717e 100644 |
|
|
+ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb));
|
|
|
+ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb));
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
static void skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) |
|
|
|
|
|
@@ -380,24 +888,54 @@ static void read_64bit_header(const unsigned char **tzf, timelib_tzinfo *tz)
|
|
|
|
|
|
timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb) |
|
|
|
|
|
|
|
|
static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) |
|
|
|
|
|
@@ -475,12 +977,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
|
|
|
|
|
|
timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code) |
|
|
{ |
|
|
{ |
|
|
const unsigned char *tzf; |
|
|
const unsigned char *tzf; |
|
|
+ char *memmap = NULL;
|
|
|
+ char *memmap = NULL;
|
|
|
+ size_t maplen;
|
|
|
+ size_t maplen;
|
|
|
timelib_tzinfo *tmp; |
|
|
timelib_tzinfo *tmp; |
|
|
int version; |
|
|
int version; |
|
|
|
|
|
int transitions_result, types_result; |
|
|
|
|
|
unsigned int type; /* TIMELIB_TZINFO_PHP or TIMELIB_TZINFO_ZONEINFO */ |
|
|
|
|
|
|
|
|
- if (seek_to_tz_position(&tzf, timezone, tzdb)) {
|
|
|
- if (seek_to_tz_position(&tzf, timezone, tzdb)) {
|
|
|
+ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
|
|
|
+ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
|
|
|
tmp = timelib_tzinfo_ctor(timezone); |
|
|
tmp = timelib_tzinfo_ctor(timezone); |
|
|
|
|
|
|
|
|
version = read_preamble(&tzf, tmp); |
|
|
|
|
|
read_header(&tzf, tmp); |
|
|
|
|
|
read_transistions(&tzf, tmp); |
|
|
|
|
|
read_types(&tzf, tmp); |
|
|
|
|
|
- if (version == 2) {
|
|
|
|
|
|
- skip_64bit_preamble(&tzf, tmp);
|
|
|
|
|
|
- read_64bit_header(&tzf, tmp);
|
|
|
|
|
|
- skip_64bit_transistions(&tzf, tmp);
|
|
|
|
|
|
- skip_64bit_types(&tzf, tmp);
|
|
|
|
|
|
- skip_posix_string(&tzf, tmp);
|
|
|
|
|
|
- }
|
|
|
|
|
|
- read_location(&tzf, tmp);
|
|
|
|
|
|
|
|
|
version = read_preamble(&tzf, tmp, &type); |
|
|
|
|
|
@@ -503,6 +1007,29 @@ timelib_tzinfo *timelib_parse_tzfile(cha
|
|
|
|
|
|
timelib_tzinfo_dtor(tmp); |
|
|
|
|
|
return NULL; |
|
|
|
|
|
} |
|
|
+
|
|
|
+
|
|
|
+#ifdef HAVE_SYSTEM_TZDATA
|
|
|
+#ifdef HAVE_SYSTEM_TZDATA
|
|
|
+ if (memmap) {
|
|
|
+ if (memmap) {
|
|
|
@ -638,34 +611,30 @@ index 20d7eea..ed7717e 100644 |
|
|
+ tmp->bc = 1;
|
|
|
+ tmp->bc = 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ else {
|
|
|
+ strcpy(tmp->location.country_code, "??");
|
|
|
|
|
|
+ tmp->bc = 0;
|
|
|
|
|
|
+ tmp->location.comments = timelib_strdup("");
|
|
|
|
|
|
|
|
|
+ set_default_location_and_comments(&tzf, tmp);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /* Now done with the mmap segment - discard it. */
|
|
|
+ /* Now done with the mmap segment - discard it. */
|
|
|
+ munmap(memmap, maplen);
|
|
|
+ munmap(memmap, maplen);
|
|
|
+ } else
|
|
|
|
|
|
|
|
|
+ } else {
|
|
|
|
|
|
+#endif
|
|
|
|
|
|
if (version == 2 || version == 3) { |
|
|
|
|
|
if (!skip_64bit_preamble(&tzf, tmp)) { |
|
|
|
|
|
/* 64 bit preamble is not in place */ |
|
|
|
|
|
@@ -520,6 +1047,9 @@ timelib_tzinfo *timelib_parse_tzfile(cha
|
|
|
|
|
|
} else { |
|
|
|
|
|
set_default_location_and_comments(&tzf, tmp); |
|
|
|
|
|
} |
|
|
|
|
|
+#ifdef HAVE_SYSTEM_TZDATA
|
|
|
|
|
|
+ }
|
|
|
+#endif
|
|
|
+#endif
|
|
|
+ {
|
|
|
|
|
|
+ /* PHP-style - use the embedded info. */
|
|
|
|
|
|
+ if (version == 2) {
|
|
|
|
|
|
+ skip_64bit_preamble(&tzf, tmp);
|
|
|
|
|
|
+ read_64bit_header(&tzf, tmp);
|
|
|
|
|
|
+ skip_64bit_transistions(&tzf, tmp);
|
|
|
|
|
|
+ skip_64bit_types(&tzf, tmp);
|
|
|
|
|
|
+ skip_posix_string(&tzf, tmp);
|
|
|
|
|
|
+ }
|
|
|
|
|
|
+ read_location(&tzf, tmp);
|
|
|
|
|
|
+ }
|
|
|
|
|
|
} else { |
|
|
} else { |
|
|
|
|
|
*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE; |
|
|
tmp = NULL; |
|
|
tmp = NULL; |
|
|
} |
|
|
|
|
|
diff --git a/ext/date/lib/timelib.m4 b/ext/date/lib/timelib.m4
|
|
|
|
|
|
index 99bf9fa..4bf7e46 100644
|
|
|
|
|
|
--- a/ext/date/lib/timelib.m4
|
|
|
|
|
|
+++ b/ext/date/lib/timelib.m4
|
|
|
|
|
|
@@ -78,3 +78,16 @@ stdlib.h
|
|
|
|
|
|
|
|
|
diff -up ./ext/date/lib/timelib.m4.systzdata ./ext/date/lib/timelib.m4
|
|
|
|
|
|
--- ./ext/date/lib/timelib.m4.systzdata 2017-08-22 09:40:38.000000000 +0200
|
|
|
|
|
|
+++ ./ext/date/lib/timelib.m4 2017-08-22 11:32:29.357799927 +0200
|
|
|
|
|
|
@@ -81,3 +81,16 @@ io.h
|
|
|
|
|
|
|
|
|
dnl Check for strtoll, atoll |
|
|
dnl Check for strtoll, atoll |
|
|
AC_CHECK_FUNCS(strtoll atoll strftime gettimeofday) |
|
|
AC_CHECK_FUNCS(strtoll atoll strftime gettimeofday) |
|
|
|
Michael Heimpold
7 years ago