mirror of
https://github.com/php/php-src.git
synced 2025-08-18 15:08:55 +02:00

It fixes several bugs: - Fixed bug #45554 (Inconsistent behavior of the u format char). - Fixed bug #48225 (DateTime parser doesn't set microseconds for "now"). - Fixed bug #52514 (microseconds are missing in DateTime class). - Fixed bug #52519 (microseconds in DateInterval are missing). - Fixed bug #68506 (General DateTime improvments needed for microseconds to become useful). - Fixed bug #73109 (timelib_meridian doesn't parse dots correctly). - Fixed bug #73247 (DateTime constructor does not initialise microseconds property). It also updates timelib to 2016.04, and updates a data mapping file, which causes changes to the volatile abbreviations tests.
345 lines
8.6 KiB
C
345 lines
8.6 KiB
C
/*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2015 Derick Rethans
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "timelib.h"
|
|
#include <ctype.h>
|
|
#include <math.h>
|
|
|
|
#define TIMELIB_TIME_FREE(m) \
|
|
if (m) { \
|
|
timelib_free(m); \
|
|
m = NULL; \
|
|
} \
|
|
|
|
#define TIMELIB_LLABS(y) (y < 0 ? (y * -1) : y)
|
|
|
|
#define HOUR(a) (int)(a * 60)
|
|
|
|
timelib_time* timelib_time_ctor(void)
|
|
{
|
|
timelib_time *t;
|
|
t = timelib_calloc(1, sizeof(timelib_time));
|
|
|
|
return t;
|
|
}
|
|
|
|
timelib_rel_time* timelib_rel_time_ctor(void)
|
|
{
|
|
timelib_rel_time *t;
|
|
t = timelib_calloc(1, sizeof(timelib_rel_time));
|
|
|
|
return t;
|
|
}
|
|
|
|
timelib_time* timelib_time_clone(timelib_time *orig)
|
|
{
|
|
timelib_time *tmp = timelib_time_ctor();
|
|
memcpy(tmp, orig, sizeof(timelib_time));
|
|
if (orig->tz_abbr) {
|
|
tmp->tz_abbr = timelib_strdup(orig->tz_abbr);
|
|
}
|
|
if (orig->tz_info) {
|
|
tmp->tz_info = orig->tz_info;
|
|
}
|
|
return tmp;
|
|
}
|
|
|
|
int timelib_time_compare(timelib_time *t1, timelib_time *t2)
|
|
{
|
|
if (t1->sse == t2->sse) {
|
|
if (t1->f == t2->f) {
|
|
return 0;
|
|
}
|
|
|
|
if (t1->sse < 0) {
|
|
return (t1->f < t2->f) ? 1 : -1;
|
|
} else {
|
|
return (t1->f < t2->f) ? -1 : 1;
|
|
}
|
|
}
|
|
|
|
return (t1->sse < t2->sse) ? -1 : 1;
|
|
}
|
|
|
|
timelib_rel_time* timelib_rel_time_clone(timelib_rel_time *rel)
|
|
{
|
|
timelib_rel_time *tmp = timelib_rel_time_ctor();
|
|
memcpy(tmp, rel, sizeof(timelib_rel_time));
|
|
return tmp;
|
|
}
|
|
|
|
void timelib_time_tz_abbr_update(timelib_time* tm, char* tz_abbr)
|
|
{
|
|
unsigned int i;
|
|
size_t tz_abbr_len = strlen(tz_abbr);
|
|
|
|
TIMELIB_TIME_FREE(tm->tz_abbr);
|
|
tm->tz_abbr = timelib_strdup(tz_abbr);
|
|
for (i = 0; i < tz_abbr_len; i++) {
|
|
tm->tz_abbr[i] = toupper(tz_abbr[i]);
|
|
}
|
|
}
|
|
|
|
void timelib_time_dtor(timelib_time* t)
|
|
{
|
|
TIMELIB_TIME_FREE(t->tz_abbr);
|
|
TIMELIB_TIME_FREE(t);
|
|
}
|
|
|
|
void timelib_rel_time_dtor(timelib_rel_time* t)
|
|
{
|
|
TIMELIB_TIME_FREE(t);
|
|
}
|
|
|
|
timelib_time_offset* timelib_time_offset_ctor(void)
|
|
{
|
|
timelib_time_offset *t;
|
|
t = timelib_calloc(1, sizeof(timelib_time_offset));
|
|
|
|
return t;
|
|
}
|
|
|
|
void timelib_time_offset_dtor(timelib_time_offset* t)
|
|
{
|
|
TIMELIB_TIME_FREE(t->abbr);
|
|
TIMELIB_TIME_FREE(t);
|
|
}
|
|
|
|
timelib_tzinfo* timelib_tzinfo_ctor(char *name)
|
|
{
|
|
timelib_tzinfo *t;
|
|
t = timelib_calloc(1, sizeof(timelib_tzinfo));
|
|
t->name = timelib_strdup(name);
|
|
|
|
return t;
|
|
}
|
|
|
|
timelib_tzinfo *timelib_tzinfo_clone(timelib_tzinfo *tz)
|
|
{
|
|
timelib_tzinfo *tmp = timelib_tzinfo_ctor(tz->name);
|
|
tmp->bit32.ttisgmtcnt = tz->bit32.ttisgmtcnt;
|
|
tmp->bit32.ttisstdcnt = tz->bit32.ttisstdcnt;
|
|
tmp->bit32.leapcnt = tz->bit32.leapcnt;
|
|
tmp->bit32.timecnt = tz->bit32.timecnt;
|
|
tmp->bit32.typecnt = tz->bit32.typecnt;
|
|
tmp->bit32.charcnt = tz->bit32.charcnt;
|
|
|
|
tmp->trans = (int32_t *) timelib_malloc(tz->bit32.timecnt * sizeof(int32_t));
|
|
tmp->trans_idx = (unsigned char*) timelib_malloc(tz->bit32.timecnt * sizeof(unsigned char));
|
|
memcpy(tmp->trans, tz->trans, tz->bit32.timecnt * sizeof(int32_t));
|
|
memcpy(tmp->trans_idx, tz->trans_idx, tz->bit32.timecnt * sizeof(unsigned char));
|
|
|
|
tmp->type = (ttinfo*) timelib_malloc(tz->bit32.typecnt * sizeof(struct ttinfo));
|
|
memcpy(tmp->type, tz->type, tz->bit32.typecnt * sizeof(struct ttinfo));
|
|
|
|
tmp->timezone_abbr = (char*) timelib_malloc(tz->bit32.charcnt);
|
|
memcpy(tmp->timezone_abbr, tz->timezone_abbr, tz->bit32.charcnt);
|
|
|
|
tmp->leap_times = (tlinfo*) timelib_malloc(tz->bit32.leapcnt * sizeof(tlinfo));
|
|
memcpy(tmp->leap_times, tz->leap_times, tz->bit32.leapcnt * sizeof(tlinfo));
|
|
|
|
return tmp;
|
|
}
|
|
|
|
void timelib_tzinfo_dtor(timelib_tzinfo *tz)
|
|
{
|
|
TIMELIB_TIME_FREE(tz->name);
|
|
TIMELIB_TIME_FREE(tz->trans);
|
|
TIMELIB_TIME_FREE(tz->trans_idx);
|
|
TIMELIB_TIME_FREE(tz->type);
|
|
TIMELIB_TIME_FREE(tz->timezone_abbr);
|
|
TIMELIB_TIME_FREE(tz->leap_times);
|
|
TIMELIB_TIME_FREE(tz->location.comments);
|
|
TIMELIB_TIME_FREE(tz);
|
|
tz = NULL;
|
|
}
|
|
|
|
char *timelib_get_tz_abbr_ptr(timelib_time *t)
|
|
{
|
|
if (!t->sse_uptodate) {
|
|
timelib_update_ts(t, NULL);
|
|
};
|
|
return t->tz_abbr;
|
|
}
|
|
|
|
void timelib_error_container_dtor(timelib_error_container *errors)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < errors->warning_count; i++) {
|
|
timelib_free(errors->warning_messages[i].message);
|
|
}
|
|
timelib_free(errors->warning_messages);
|
|
for (i = 0; i < errors->error_count; i++) {
|
|
timelib_free(errors->error_messages[i].message);
|
|
}
|
|
timelib_free(errors->error_messages);
|
|
timelib_free(errors);
|
|
}
|
|
|
|
timelib_long timelib_date_to_int(timelib_time *d, int *error)
|
|
{
|
|
timelib_sll ts;
|
|
|
|
ts = d->sse;
|
|
|
|
if (ts < TIMELIB_LONG_MIN || ts > TIMELIB_LONG_MAX) {
|
|
if (error) {
|
|
*error = 1;
|
|
}
|
|
return 0;
|
|
}
|
|
if (error) {
|
|
*error = 0;
|
|
}
|
|
return (timelib_long) d->sse;
|
|
}
|
|
|
|
void timelib_decimal_hour_to_hms(double h, int *hour, int *min, int *sec)
|
|
{
|
|
*hour = floor(h);
|
|
*min = floor((h - *hour) * 60);
|
|
*sec = (h - *hour - ((float) *min / 60)) * 3600;
|
|
}
|
|
|
|
void timelib_dump_date(timelib_time *d, int options)
|
|
{
|
|
if ((options & 2) == 2) {
|
|
printf("TYPE: %d ", d->zone_type);
|
|
}
|
|
printf("TS: %lld | %s%04lld-%02lld-%02lld %02lld:%02lld:%02lld",
|
|
d->sse, d->y < 0 ? "-" : "", TIMELIB_LLABS(d->y), d->m, d->d, d->h, d->i, d->s);
|
|
if (d->f > +0.0) {
|
|
printf(" %.6f", d->f);
|
|
}
|
|
|
|
if (d->is_localtime) {
|
|
switch (d->zone_type) {
|
|
case TIMELIB_ZONETYPE_OFFSET: /* Only offset */
|
|
printf(" GMT %05d%s", d->z, d->dst == 1 ? " (DST)" : "");
|
|
break;
|
|
case TIMELIB_ZONETYPE_ID: /* Timezone struct */
|
|
/* Show abbreviation if wanted */
|
|
if (d->tz_abbr) {
|
|
printf(" %s", d->tz_abbr);
|
|
}
|
|
/* Do we have a TimeZone struct? */
|
|
if (d->tz_info) {
|
|
printf(" %s", d->tz_info->name);
|
|
}
|
|
break;
|
|
case TIMELIB_ZONETYPE_ABBR:
|
|
printf(" %s", d->tz_abbr);
|
|
printf(" %05d%s", d->z, d->dst == 1 ? " (DST)" : "");
|
|
break;
|
|
}
|
|
}
|
|
|
|
if ((options & 1) == 1) {
|
|
if (d->have_relative) {
|
|
printf("%3lldY %3lldM %3lldD / %3lldH %3lldM %3lldS",
|
|
d->relative.y, d->relative.m, d->relative.d, d->relative.h, d->relative.i, d->relative.s);
|
|
if (d->relative.f) {
|
|
printf(" %6f", d->relative.f);
|
|
}
|
|
if (d->relative.first_last_day_of != 0) {
|
|
switch (d->relative.first_last_day_of) {
|
|
case 1:
|
|
printf(" / first day of");
|
|
break;
|
|
case 2:
|
|
printf(" / last day of");
|
|
break;
|
|
}
|
|
}
|
|
if (d->relative.have_weekday_relative) {
|
|
printf(" / %d.%d", d->relative.weekday, d->relative.weekday_behavior);
|
|
}
|
|
if (d->relative.have_special_relative) {
|
|
switch (d->relative.special.type) {
|
|
case TIMELIB_SPECIAL_WEEKDAY:
|
|
printf(" / %lld weekday", d->relative.special.amount);
|
|
break;
|
|
case TIMELIB_SPECIAL_DAY_OF_WEEK_IN_MONTH:
|
|
printf(" / x y of z month");
|
|
break;
|
|
case TIMELIB_SPECIAL_LAST_DAY_OF_WEEK_IN_MONTH:
|
|
printf(" / last y of z month");
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
printf("\n");
|
|
}
|
|
|
|
void timelib_dump_rel_time(timelib_rel_time *d)
|
|
{
|
|
printf("%3lldY %3lldM %3lldD / %3lldH %3lldM %3lldS (days: %lld)%s",
|
|
d->y, d->m, d->d, d->h, d->i, d->s, d->days, d->invert ? " inverted" : "");
|
|
if (d->first_last_day_of != 0) {
|
|
switch (d->first_last_day_of) {
|
|
case 1:
|
|
printf(" / first day of");
|
|
break;
|
|
case 2:
|
|
printf(" / last day of");
|
|
break;
|
|
}
|
|
}
|
|
printf("\n");
|
|
}
|
|
|
|
timelib_long timelib_parse_tz_cor(char **ptr)
|
|
{
|
|
char *begin = *ptr, *end;
|
|
timelib_long tmp;
|
|
|
|
while (isdigit(**ptr) || **ptr == ':') {
|
|
++*ptr;
|
|
}
|
|
end = *ptr;
|
|
switch (end - begin) {
|
|
case 1: /* H */
|
|
case 2: /* HH */
|
|
return HOUR(strtol(begin, NULL, 10));
|
|
break;
|
|
case 3: /* H:M */
|
|
case 4: /* H:MM, HH:M, HHMM */
|
|
if (begin[1] == ':') {
|
|
tmp = HOUR(strtol(begin, NULL, 10)) + strtol(begin + 2, NULL, 10);
|
|
return tmp;
|
|
} else if (begin[2] == ':') {
|
|
tmp = HOUR(strtol(begin, NULL, 10)) + strtol(begin + 3, NULL, 10);
|
|
return tmp;
|
|
} else {
|
|
tmp = strtol(begin, NULL, 10);
|
|
return HOUR(tmp / 100) + tmp % 100;
|
|
}
|
|
case 5: /* HH:MM */
|
|
tmp = HOUR(strtol(begin, NULL, 10)) + strtol(begin + 3, NULL, 10);
|
|
return tmp;
|
|
}
|
|
return 0;
|
|
}
|