diff options
| author | Paul "LeoNerd" Evans <leonerd@leonerd.org.uk> | 2011-12-21 00:10:41 +0000 |
|---|---|---|
| committer | Ævar Arnfjörð Bjarmason <avar@cpan.org> | 2012-02-11 22:22:24 +0000 |
| commit | 351aaf90901b987c07221c72161035f21651079a (patch) | |
| tree | 20c536d1da1a7289320ee07032ea79aaa5212379 | |
| parent | 73bb741d3e1cc87e49797955b243e75cfe43d395 (diff) | |
| download | perl-351aaf90901b987c07221c72161035f21651079a.tar.gz | |
mktime() before returning result from strptime(), to ensure wday/yday/isdst fields are correct
| -rw-r--r-- | ext/POSIX/POSIX.xs | 3 | ||||
| -rw-r--r-- | ext/POSIX/t/time.t | 17 |
2 files changed, 13 insertions, 7 deletions
diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index 79593f7daa..715807d33e 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -1903,6 +1903,9 @@ strptime(str, fmt, sec=-1, min=-1, hour=-1, mday=-1, mon=-1, year=-1, wday=-1, y posmg->mg_len = remains - str_base; } + if(tm.tm_mday > -1 && tm.tm_mon > -1 && tm.tm_year > -1) + mktime(&tm); + EXTEND(SP, 9); PUSHs(sv_2mortal(newSViv(tm.tm_sec))); PUSHs(sv_2mortal(newSViv(tm.tm_min))); diff --git a/ext/POSIX/t/time.t b/ext/POSIX/t/time.t index d9d447f69a..15605bf991 100644 --- a/ext/POSIX/t/time.t +++ b/ext/POSIX/t/time.t @@ -4,7 +4,7 @@ use strict; use Config; use POSIX; -use Test::More tests => 27; +use Test::More tests => 28; # go to UTC to avoid DST issues around the world when testing. SUS3 says that # null should get you UTC, but some environments want the explicit names. @@ -68,14 +68,17 @@ is(ord strftime($ss, POSIX::localtime(time)), 223, 'Format string has correct character'); unlike($ss, qr/\w/, 'Still not internally UTF-8 encoded'); -my @time = (POSIX::strptime("2011-12-18 12:34:56", "%Y-%m-%d %H:%M:%S"))[0..5]; -is_deeply(\@time, [56, 34, 12, 18, 12-1, 2011-1900], 'strptime() all 6 fields'); +my @time = POSIX::strptime("2011-12-18 12:34:56", "%Y-%m-%d %H:%M:%S"); +is_deeply(\@time, [56, 34, 12, 18, 12-1, 2011-1900, 0, 351, 0], 'strptime() all 6 fields'); -@time = (POSIX::strptime("2011-12-18", "%Y-%m-%d", 1, 23, 4))[0..5]; -is_deeply(\@time, [1, 23, 4, 18, 12-1, 2011-1900], 'strptime() all date fields with passed time'); +@time = POSIX::strptime("2011-12-18", "%Y-%m-%d", 1, 23, 4); +is_deeply(\@time, [1, 23, 4, 18, 12-1, 2011-1900, 0, 351, 0], 'strptime() all date fields with passed time'); -@time = (POSIX::strptime("12:34:56", "%H:%M:%S", 1, 2, 3, 4, 5, 6))[0..5]; -is_deeply(\@time, [56, 34, 12, 4, 5, 6], 'strptime() all date fields with passed time'); +@time = POSIX::strptime("12:34:56", "%H:%M:%S", 1, 2, 3, 4, 5, 6); +is_deeply(\@time, [56, 34, 12, 4, 5, 6, 1, 154, 0], 'strptime() all date fields with passed time'); + +@time = POSIX::strptime("July 4", "%b %d"); +is_deeply([@time[3,4]], [4, 7-1], 'strptime() partial yields correct mday/mon'); @time = POSIX::strptime("Foobar", "%H:%M:%S"); is(scalar @time, 0, 'strptime() invalid input yields empty list'); |