In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/7b00711fc6f174fa5decef23606eea519c272aa4?hp=2e0eeeaafce11cb0128a6d1e245f1a5b806e3a87>
- Log ----------------------------------------------------------------- commit 7b00711fc6f174fa5decef23606eea519c272aa4 Merge: 9e8c01f... 2e0eeea... Author: Steve Peters <[email protected]> Date: Thu Oct 15 09:14:47 2009 -0500 Merge branch 'blead' of ssh://[email protected]/gitroot/perl into blead commit 9e8c01f558a03902ff2f54935fd7e6dcc7ec656c Author: Steve Peters <[email protected]> Date: Thu Oct 15 09:12:57 2009 -0500 POSIX::strftime() should be able to handle Unicode characters in the format string the same as ASCII ones. M ext/POSIX/POSIX.pm M ext/POSIX/POSIX.xs M ext/POSIX/t/time.t ----------------------------------------------------------------------- Summary of changes: ext/POSIX/POSIX.pm | 2 +- ext/POSIX/POSIX.xs | 6 +++--- ext/POSIX/t/time.t | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ext/POSIX/POSIX.pm b/ext/POSIX/POSIX.pm index 120769c..b410fd9 100644 --- a/ext/POSIX/POSIX.pm +++ b/ext/POSIX/POSIX.pm @@ -4,7 +4,7 @@ use warnings; our(@ISA, %EXPORT_TAGS, @EXPORT_OK, @EXPORT, $AUTOLOAD, %SIGRT) = (); -our $VERSION = "1.17"; +our $VERSION = "1.18"; use AutoLoader; diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index 6de3588..14b24ff 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -1781,7 +1781,7 @@ mktime(sec, min, hour, mday, mon, year, wday = 0, yday = 0, isdst = -1) # ST(0) = sv_2mortal(newSVpv(...)) void strftime(fmt, sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1) - char * fmt + SV * fmt int sec int min int hour @@ -1793,9 +1793,9 @@ strftime(fmt, sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1) int isdst CODE: { - char *buf = my_strftime(fmt, sec, min, hour, mday, mon, year, wday, yday, isdst); + char *buf = my_strftime(SvPVutf8_nolen(fmt), sec, min, hour, mday, mon, year, wday, yday, isdst); if (buf) { - ST(0) = sv_2mortal(newSVpv(buf, 0)); + ST(0) = sv_2mortal(newSVpvn_utf8(buf, strlen(buf), SvUTF8(fmt))); Safefree(buf); } } diff --git a/ext/POSIX/t/time.t b/ext/POSIX/t/time.t index 103a161..b1bdee2 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 => 9; +use Test::More tests => 10; # 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. @@ -39,6 +39,8 @@ my $orig_loc = setlocale(LC_TIME, "C") || die "Cannot setlocale() to C: $!"; my $jan_16 = 15 * 86400; is(ctime($jan_16), strftime("%a %b %d %H:%M:%S %Y\n", localtime($jan_16)), "get ctime() equal to strftime()"); +is(strftime("%Yå¹´%mæ%dæ¥", localtime($jan_16)), "1970å¹´01æ16æ¥", + "strftime() can handle unicode chars in the format string"); setlocale(LC_TIME, $orig_loc) || die "Cannot setlocale() back to orig: $!"; # clock() seems to have different definitions of what it does between POSIX -- Perl5 Master Repository
