Skip to content

Commit 5feb539

Browse files
derickrderickr
committed
Sync with timelib 2017.06
1 parent 3348d40 commit 5feb539

File tree

8 files changed

+105
-53
lines changed

8 files changed

+105
-53
lines changed

‎ext/date/lib/README.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ Timelib is a timezone and date/time library that can calculate local time,
55
convert between timezones and parse textual descriptions of date/time
66
information.
77

8-
It is the library supporting PHP's Date/Time extension.
8+
It is the library supporting PHP's Date/Time extension and MongoDB's time zone
9+
support.

‎ext/date/lib/parse_date.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 0.15.3 on Tue Oct 24 13:44:48 2017 */
1+
/* Generated by re2c 0.15.3 on Wed Jan 31 11:51:51 2018 */
22
#line 1 "ext/date/lib/parse_date.re"
33
/*
44
* The MIT License (MIT)
@@ -483,7 +483,7 @@ static void timelib_skip_day_suffix(char **ptr)
483483
if (isspace(**ptr)) {
484484
return;
485485
}
486-
if (!strncasecmp(*ptr, "nd", 2) || !strncasecmp(*ptr, "rd", 2) ||!strncasecmp(*ptr, "st", 2) || !strncasecmp(*ptr, "th", 2)) {
486+
if (!timelib_strncasecmp(*ptr, "nd", 2) || !timelib_strncasecmp(*ptr, "rd", 2) ||!timelib_strncasecmp(*ptr, "st", 2) || !timelib_strncasecmp(*ptr, "th", 2)) {
487487
*ptr += 2;
488488
}
489489
}
@@ -549,7 +549,7 @@ static timelib_sll timelib_lookup_relative_text(char **ptr, int *behavior)
549549
memcpy(word, begin, end - begin);
550550

551551
for (tp = timelib_reltext_lookup; tp->name; tp++) {
552-
if (strcasecmp(word, tp->name) == 0) {
552+
if (timelib_strcasecmp(word, tp->name) == 0) {
553553
value = tp->value;
554554
*behavior = tp->type;
555555
}
@@ -582,7 +582,7 @@ static timelib_long timelib_lookup_month(char **ptr)
582582
memcpy(word, begin, end - begin);
583583

584584
for (tp = timelib_month_lookup; tp->name; tp++) {
585-
if (strcasecmp(word, tp->name) == 0) {
585+
if (timelib_strcasecmp(word, tp->name) == 0) {
586586
value = tp->value;
587587
}
588588
}
@@ -629,7 +629,7 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
629629
memcpy(word, begin, end - begin);
630630

631631
for (tp = timelib_relunit_lookup; tp->name; tp++) {
632-
if (strcasecmp(word, tp->name) == 0) {
632+
if (timelib_strcasecmp(word, tp->name) == 0) {
633633
value = tp;
634634
break;
635635
}
@@ -678,12 +678,12 @@ static const timelib_tz_lookup_table* abbr_search(const char *word, timelib_long
678678
const timelib_tz_lookup_table *tp, *first_found_elem = NULL;
679679
const timelib_tz_lookup_table *fmp;
680680

681-
if (strcasecmp("utc", word) == 0 || strcasecmp("gmt", word) == 0) {
681+
if (timelib_strcasecmp("utc", word) == 0 || timelib_strcasecmp("gmt", word) == 0) {
682682
return timelib_timezone_utc;
683683
}
684684

685685
for (tp = timelib_timezone_lookup; tp->name; tp++) {
686-
if (strcasecmp(word, tp->name) == 0) {
686+
if (timelib_strcasecmp(word, tp->name) == 0) {
687687
if (!first_found) {
688688
first_found = 1;
689689
first_found_elem = tp;

‎ext/date/lib/parse_date.re

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ static void timelib_skip_day_suffix(char **ptr)
481481
if (isspace(**ptr)) {
482482
return;
483483
}
484-
if (!strncasecmp(*ptr, "nd", 2) || !strncasecmp(*ptr, "rd", 2) ||!strncasecmp(*ptr, "st", 2) || !strncasecmp(*ptr, "th", 2)) {
484+
if (!timelib_strncasecmp(*ptr, "nd", 2) || !timelib_strncasecmp(*ptr, "rd", 2) ||!timelib_strncasecmp(*ptr, "st", 2) || !timelib_strncasecmp(*ptr, "th", 2)) {
485485
*ptr += 2;
486486
}
487487
}
@@ -547,7 +547,7 @@ static timelib_sll timelib_lookup_relative_text(char **ptr, int *behavior)
547547
memcpy(word, begin, end - begin);
548548

549549
for (tp = timelib_reltext_lookup; tp->name; tp++) {
550-
if (strcasecmp(word, tp->name) == 0) {
550+
if (timelib_strcasecmp(word, tp->name) == 0) {
551551
value = tp->value;
552552
*behavior = tp->type;
553553
}
@@ -580,7 +580,7 @@ static timelib_long timelib_lookup_month(char **ptr)
580580
memcpy(word, begin, end - begin);
581581

582582
for (tp = timelib_month_lookup; tp->name; tp++) {
583-
if (strcasecmp(word, tp->name) == 0) {
583+
if (timelib_strcasecmp(word, tp->name) == 0) {
584584
value = tp->value;
585585
}
586586
}
@@ -627,7 +627,7 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
627627
memcpy(word, begin, end - begin);
628628

629629
for (tp = timelib_relunit_lookup; tp->name; tp++) {
630-
if (strcasecmp(word, tp->name) == 0) {
630+
if (timelib_strcasecmp(word, tp->name) == 0) {
631631
value = tp;
632632
break;
633633
}
@@ -676,12 +676,12 @@ static const timelib_tz_lookup_table* abbr_search(const char *word, timelib_long
676676
const timelib_tz_lookup_table *tp, *first_found_elem = NULL;
677677
const timelib_tz_lookup_table *fmp;
678678

679-
if (strcasecmp("utc", word) == 0 || strcasecmp("gmt", word) == 0) {
679+
if (timelib_strcasecmp("utc", word) == 0 || timelib_strcasecmp("gmt", word) == 0) {
680680
return timelib_timezone_utc;
681681
}
682682

683683
for (tp = timelib_timezone_lookup; tp->name; tp++) {
684-
if (strcasecmp(word, tp->name) == 0) {
684+
if (timelib_strcasecmp(word, tp->name) == 0) {
685685
if (!first_found) {
686686
first_found = 1;
687687
first_found_elem = tp;

‎ext/date/lib/parse_iso_intervals.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 0.15.3 on Mon Sep 4 22:44:07 2017 */
1+
/* Generated by re2c 0.15.3 on Wed Jan 31 11:51:44 2018 */
22
#line 1 "ext/date/lib/parse_iso_intervals.re"
33
/*
44
* The MIT License (MIT)

‎ext/date/lib/parse_tz.c

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -377,45 +377,26 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
377377
static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
378378
{
379379
int left = 0, right = tzdb->index_size - 1;
380-
#ifdef HAVE_SETLOCALE
381-
char *cur_locale = NULL, *tmp;
382-
#endif
383380

384381
if (tzdb->index_size == 0) {
385382
return 0;
386383
}
387384

388-
#ifdef HAVE_SETLOCALE
389-
tmp = setlocale(LC_CTYPE, NULL);
390-
if (tmp) {
391-
cur_locale = timelib_strdup(tmp);
392-
}
393-
setlocale(LC_CTYPE, "C");
394-
#endif
395-
396385
do {
397386
int mid = ((unsigned)left + right) >> 1;
398-
int cmp = strcasecmp(timezone, tzdb->index[mid].id);
387+
int cmp = timelib_strcasecmp(timezone, tzdb->index[mid].id);
399388

400389
if (cmp < 0) {
401390
right = mid - 1;
402391
} else if (cmp > 0) {
403392
left = mid + 1;
404393
} else { /* (cmp == 0) */
405394
(*tzf) = &(tzdb->data[tzdb->index[mid].pos]);
406-
#ifdef HAVE_SETLOCALE
407-
setlocale(LC_CTYPE, cur_locale);
408-
if (cur_locale) timelib_free(cur_locale);
409-
#endif
410395
return 1;
411396
}
412397

413398
} while (left <= right);
414399

415-
#ifdef HAVE_SETLOCALE
416-
setlocale(LC_CTYPE, cur_locale);
417-
if (cur_locale) timelib_free(cur_locale);
418-
#endif
419400
return 0;
420401
}
421402

@@ -424,7 +405,7 @@ const timelib_tzdb *timelib_builtin_db(void)
424405
return &timezonedb_builtin;
425406
}
426407

427-
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(timelib_tzdb *tzdb, int *count)
408+
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
428409
{
429410
*count = tzdb->index_size;
430411
return tzdb->index;

‎ext/date/lib/timelib.c

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* The MIT License (MIT)
33
*
4-
* Copyright (c) 2015 Derick Rethans
4+
* Copyright (c) 2015-2017 Derick Rethans
55
*
66
* Permission is hereby granted, free of charge, to any person obtaining a copy
77
* of this software and associated documentation files (the "Software"), to deal
@@ -20,6 +20,12 @@
2020
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
23+
*
24+
* Portions copyright (c) 1998-2017 Zend Technologies Ltd.
25+
*
26+
* The timelib_strcasecmp and timelib_strncasecmp are taken from PHP's
27+
* Zend/zend_operators.[hc] source files.
28+
*
2329
*/
2430

2531
#include "timelib.h"
@@ -198,6 +204,79 @@ void timelib_hms_to_decimal_hour(int hour, int min, int sec, double *h)
198204
}
199205
}
200206

207+
static const unsigned char timelib_tolower_map[256] = {
208+
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
209+
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
210+
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
211+
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
212+
0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
213+
0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
214+
0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
215+
0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
216+
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
217+
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
218+
0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
219+
0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
220+
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
221+
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
222+
0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
223+
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
224+
};
225+
226+
#define timelib_tolower(c) (timelib_tolower_map[(unsigned char)(c)])
227+
#undef MIN
228+
#undef MAX
229+
#define MAX(a, b) (((a)>(b))?(a):(b))
230+
#define MIN(a, b) (((a)<(b))?(a):(b))
231+
232+
int timelib_strcasecmp(const char *s1, const char *s2)
233+
{
234+
size_t len;
235+
size_t len1 = strlen(s1);
236+
size_t len2 = strlen(s2);
237+
int c1, c2;
238+
239+
if (s1 == s2) {
240+
return 0;
241+
}
242+
243+
len = MIN(len1, len2);
244+
while (len--) {
245+
c1 = timelib_tolower(*(unsigned char *)s1++);
246+
c2 = timelib_tolower(*(unsigned char *)s2++);
247+
if (c1 != c2) {
248+
return c1 - c2;
249+
}
250+
}
251+
252+
return (int)(len1 - len2);
253+
}
254+
255+
int timelib_strncasecmp(const char *s1, const char *s2, size_t length)
256+
{
257+
size_t len;
258+
size_t len1 = strlen(s1);
259+
size_t len2 = strlen(s2);
260+
int c1, c2;
261+
262+
if (s1 == s2) {
263+
return 0;
264+
}
265+
len = MIN(length, MIN(len1, len2));
266+
while (len--) {
267+
c1 = timelib_tolower(*(unsigned char *)s1++);
268+
c2 = timelib_tolower(*(unsigned char *)s2++);
269+
if (c1 != c2) {
270+
return c1 - c2;
271+
}
272+
}
273+
274+
return (int)(MIN(length, len1) - MIN(length, len2));
275+
}
276+
277+
#undef MIN
278+
#undef MAX
279+
201280
void timelib_dump_date(timelib_time *d, int options)
202281
{
203282
if ((options & 2) == 2) {

‎ext/date/lib/timelib.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,9 @@ typedef struct _timelib_tzdb {
310310
# define timelib_free free
311311
#endif
312312

313-
#define TIMELIB_VERSION 201705
314-
#define TIMELIB_EXTENDED_VERSION 20170509
315-
#define TIMELIB_ASCII_VERSION "2017.05beta9"
313+
#define TIMELIB_VERSION 201706
314+
#define TIMELIB_EXTENDED_VERSION 20170600
315+
#define TIMELIB_ASCII_VERSION "2017.06"
316316

317317
#define TIMELIB_NONE 0x00
318318
#define TIMELIB_OVERRIDE_TIME 0x01
@@ -661,7 +661,7 @@ const timelib_tzdb *timelib_builtin_db(void);
661661
* Each entry contains the time zone ID ('id' field), and the position within the time zone
662662
* information ('pos' field). The pos field should not be used.
663663
*/
664-
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(timelib_tzdb *tzdb, int *count);
664+
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count);
665665

666666
/* From parse_zoneinfo.c */
667667

‎ext/date/lib/timelib_private.h

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
#ifndef __TIMELIB_PRIVATE_H__
2626
#define __TIMELIB_PRIVATE_H__
2727

28-
#ifdef HAVE_SETLOCALE
29-
# include "locale.h"
30-
#endif
31-
3228
#ifdef HAVE_TIMELIB_CONFIG_H
3329
# include "timelib_config.h"
3430
#endif
@@ -140,19 +136,14 @@ struct _tlinfo
140136
#define LONG_MIN (- LONG_MAX - 1)
141137
#endif
142138

143-
#if defined(_MSC_VER) && !defined(strcasecmp)
144-
#define strcasecmp stricmp
145-
#endif
146-
147-
#if defined(_MSC_VER) && !defined(strncasecmp)
148-
#define strncasecmp strnicmp
149-
#endif
150-
151139
/* From unixtime2tm.c */
152140
int timelib_apply_localtime(timelib_time *t, unsigned int localtime);
153141

154142
/* From parse_tz.c */
155143
void timelib_time_tz_abbr_update(timelib_time* tm, char* tz_abbr);
156144

145+
/* From timelib.c */
146+
int timelib_strcasecmp(const char *s1, const char *s2);
147+
int timelib_strncasecmp(const char *s1, const char *s2, size_t n);
157148

158149
#endif

0 commit comments

Comments
 (0)