2005-04-27 06:33:01 +02:00
|
|
|
#include <limits.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <time.h>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static const struct
|
|
|
|
|
{
|
|
|
|
|
const char *fmt;
|
|
|
|
|
long int gmtoff;
|
|
|
|
|
} tests[] =
|
|
|
|
|
{
|
|
|
|
|
{ "1113472456 +1000", 36000 },
|
|
|
|
|
{ "1113472456 -1000", -36000 },
|
|
|
|
|
{ "1113472456 +10", 36000 },
|
|
|
|
|
{ "1113472456 -10", -36000 },
|
|
|
|
|
{ "1113472456 +1030", 37800 },
|
|
|
|
|
{ "1113472456 -1030", -37800 },
|
|
|
|
|
{ "1113472456 +0030", 1800 },
|
|
|
|
|
{ "1113472456 -0030", -1800 },
|
strptime %z: fix rounding, extend range to +/-9959 [BZ #16141]
Topic: strptime supports a %z input field descriptor, which parses a
time zone offset from UTC time into the broken-out time field tm_gmtoff.
Problems:
1) In the current implementation, the minutes portion calculation is
correct only for minutes evenly divisible by 3. This is because the
minutes value is converted to decimal time, but inadequate precision
leads to rounding which calculates results that are too low for
some values.
For example, due to rounding, a +1159 offset string results in an
incorrect tm_gmtoff of 43128 (== 11 * 3600 + 58.8 * 60) seconds,
instead of 43140 (== 11 * 3600 + 59 * 60) seconds. In contrast,
a +1157 offset (minutes divisible by 3) does not cause the bug,
and results in a correct tm_gmtoff of 43020.
2) strptime's %z specifier will not parse time offsets less than
-1200 or greater than +1200, or if only hour digits are present, less
than -12 or greater than +12. It will return NULL for offsets outside
that range. These limits do not meet historical and modern use cases:
* Present day exceeds the +1200 limit:
- Pacific/Auckland (New Zealand) summer time is +1300.
- Pacific/Kiritimati (Christmas Island) is +1400.
- Pacific/Apia (Samoa) summer time is +1400.
* Historical offsets exceeded +1500/-1500.
* POSIX supports -2459 to +2559.
* Offsets up to +/-9959 may occasionally be useful.
* Paul Eggert's notes provide additional detail:
- https://sourceware.org/ml/libc-alpha/2014-12/msg00068.html
- https://sourceware.org/ml/libc-alpha/2014-12/msg00072.html
3) tst-strptime2, part of the 'make check' test suite, does not test
for the above problems.
Corrective actions:
1) In time/strptime_l.c, calculate the offset from the hour and
minute portions directly, without the rounding errors introduced by
decimal time.
2) Remove the +/-1200 range limit, permitting strptime to parse offsets
from -9959 through +9959.
3) Add zone offset values to time/tst-strptime2.c.
* Test minutes evenly divisible by three (+1157) and not evenly
divisible by three (+1158 and +1159).
* Test offsets near the old and new range limits (-1201, -1330, -2459,
-2500, -99, -9959, +1201, +1330, +1400, +1401, +2559, +2600, +99,
and +9959)
The revised strptime passes all old and new tst-strptime2 tests.
2015-08-17 22:48:38 +02:00
|
|
|
{ "1113472456 +1157", 43020 },
|
|
|
|
|
{ "1113472456 +1158", 43080 },
|
|
|
|
|
{ "1113472456 +1159", 43140 },
|
|
|
|
|
{ "1113472456 +1200", 43200 },
|
|
|
|
|
{ "1113472456 -1200", -43200 },
|
|
|
|
|
{ "1113472456 +1201", 43260 },
|
|
|
|
|
{ "1113472456 -1201", -43260 },
|
|
|
|
|
{ "1113472456 +1330", 48600 },
|
|
|
|
|
{ "1113472456 -1330", -48600 },
|
|
|
|
|
{ "1113472456 +1400", 50400 },
|
|
|
|
|
{ "1113472456 +1401", 50460 },
|
|
|
|
|
{ "1113472456 -2459", -89940 },
|
|
|
|
|
{ "1113472456 -2500", -90000 },
|
|
|
|
|
{ "1113472456 +2559", 93540 },
|
|
|
|
|
{ "1113472456 +2600", 93600 },
|
|
|
|
|
{ "1113472456 -99", -356400 },
|
|
|
|
|
{ "1113472456 +99", 356400 },
|
|
|
|
|
{ "1113472456 -9959", -359940 },
|
|
|
|
|
{ "1113472456 +9959", 359940 },
|
2005-04-27 06:33:01 +02:00
|
|
|
{ "1113472456 -1060", LONG_MAX },
|
|
|
|
|
{ "1113472456 +1060", LONG_MAX },
|
|
|
|
|
{ "1113472456 1030", LONG_MAX },
|
|
|
|
|
};
|
|
|
|
|
#define ntests (sizeof (tests) / sizeof (tests[0]))
|
|
|
|
|
|
|
|
|
|
|
2014-11-05 10:54:08 +01:00
|
|
|
static int
|
|
|
|
|
do_test (void)
|
2005-04-27 06:33:01 +02:00
|
|
|
{
|
|
|
|
|
int result = 0;
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < ntests; ++i)
|
|
|
|
|
{
|
|
|
|
|
struct tm tm;
|
|
|
|
|
|
|
|
|
|
if (strptime (tests[i].fmt, "%s %z", &tm) == NULL)
|
|
|
|
|
{
|
|
|
|
|
if (tests[i].gmtoff != LONG_MAX)
|
|
|
|
|
{
|
|
|
|
|
printf ("round %d: strptime unexpectedly failed\n", i);
|
|
|
|
|
result = 1;
|
|
|
|
|
}
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (tm.tm_gmtoff != tests[i].gmtoff)
|
|
|
|
|
{
|
|
|
|
|
printf ("round %d: tm_gmtoff is %ld\n", i, (long int) tm.tm_gmtoff);
|
|
|
|
|
result = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-06 12:01:52 +01:00
|
|
|
return result;
|
2005-04-27 06:33:01 +02:00
|
|
|
}
|
2014-11-05 10:54:08 +01:00
|
|
|
|
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
|
|
|
#include "../test-skeleton.c"
|
