POSIX::strftime() should be able to handle Unicode characters in the format

string.

(Restore the intent of 9e8c01f558a03902ff2f54935fd7e6dcc7ec656c, but with non-
buggy tests. Improve the implementation so that it doesn't always upgrade the
format string to UTF-8.)

3 files changed, 14 insertions, 5 deletions

diff --git a/ext/POSIX/POSIX.pm b/ext/POSIX/POSIX.pm
index 120769c623..b410fd995c 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 6de3588c63..b3a64a7a28 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(SvPV_nolen(fmt), sec, min, hour, mday, mon, year, wday, yday, isdst);
 	    if (buf) {
-		ST(0) = sv_2mortal(newSVpv(buf, 0));
+		ST(0) = newSVpvn_flags(buf, strlen(buf), SVs_TEMP | SvUTF8(fmt));
 		Safefree(buf);
 	    }
 	}
diff --git a/ext/POSIX/t/time.t b/ext/POSIX/t/time.t
index 103a161963..c349646655 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 => 13;
 
 # 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,15 @@ 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\x{5e74}%m\x{6708}%d\x{65e5}", localtime($jan_16)),
+   "1970\x{5e74}01\x{6708}16\x{65e5}",
+   "strftime() can handle unicode chars in the format string");
+
+my $ss = chr 223;
+unlike($ss, qr/\w/, 'Not internally UTF-8 encoded');
+is(ord strftime($ss, localtime), 223, 'Format string has correct character');
+unlike($ss, qr/\w/, 'Still not internally UTF-8 encoded');
+
 setlocale(LC_TIME, $orig_loc) || die "Cannot setlocale() back to orig: $!";
 
 # clock() seems to have different definitions of what it does between POSIX