test

Author: khwilliamson

ext/POSIX/POSIX.xs

@@ -3589,7 +3589,7 @@ difftime(time1, time2)
 #     sv_setpv(TARG, ...) could be used rather than
 #     ST(0) = sv_2mortal(newSVpv(...))
 void
-strftime(fmt, sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = 0)
+strftime(fmt, sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1)
 	SV *		fmt
 	int		sec
 	int		min
@@ -3605,10 +3605,8 @@ strftime(fmt, sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = 0)
             PERL_UNUSED_ARG(wday);
             PERL_UNUSED_ARG(yday);
 
-            /* -isdst triggers backwards compatibility mode for non-zero
-             * 'isdst' */
             SV *sv = sv_strftime_ints(fmt, sec, min, hour, mday, mon, year,
-                                           -abs(isdst));
+                                      isdst);
 	    if (sv) {
                 sv = sv_2mortal(sv);
             }

ext/POSIX/lib/POSIX.pm

@@ -4,7 +4,7 @@ use warnings;
 
 our ($AUTOLOAD, %SIGRT);
 
-our $VERSION = '2.24';
+our $VERSION = '2.25';
 
 require XSLoader;
 

ext/POSIX/lib/POSIX.pod

@@ -1866,49 +1866,17 @@ Identical to the string form of C<$!>, see L<perlvar/$ERRNO>.
 =item C<strftime>
 
 Convert date and time information to string based on the current
-underlying locale of the program (except for any daylight savings time).
-Returns the string.
+underlying locale of the program.
+Returns the string in a mortalized SV; set to an empty string on error.
 
-Synopsis:
-
-	strftime(fmt, sec, min, hour, mday, mon, year,
-		 wday = -1, yday = -1, isdst = 0)
-
-The month (C<mon>) begins at zero,
-I<e.g.>, January is 0, not 1.  The
-year (C<year>) is given in years since 1900, I<e.g.>, the year 1995 is 95; the
-year 2001 is 101.  Consult your system's C<strftime()> manpage for details
-about these and the other arguments.
+ my $sv = strftime(fmt, sec, min, hour, mday, mon, year,
+                   wday = -1, yday = -1, isdst = -1)
 
 The C<wday> and C<yday> parameters are both ignored.  Their values are
 always determinable from the other parameters.
 
-C<isdst> should be C<1> or C<0>, depending on whether or not daylight
-savings time is in effect for the given time or not.
-
-If you want your code to be portable, your format (C<fmt>) argument
-should use only the conversion specifiers defined by the ANSI C
-standard (C99, to play safe).  These are C<aAbBcdHIjmMpSUwWxXyYZ%>.
-But even then, the B<results> of some of the conversion specifiers are
-non-portable.  For example, the specifiers C<aAbBcpZ> change according
-to the locale settings of the user, and both how to set locales (the
-locale names) and what output to expect are non-standard.
-The specifier C<c> changes according to the timezone settings of the
-user and the timezone computation rules of the operating system.
-The C<Z> specifier is notoriously unportable since the names of
-timezones are non-standard. Sticking to the numeric specifiers is the
-safest route.
-
-The arguments, except for C<isdst>, are made consistent as though by
-calling C<mktime()> before calling your system's C<strftime()> function.
-To get correct results, you must set C<isdst> to be the proper value.
-When omitted, the function assumes daylight savings is not in effect.
-
-The string for Tuesday, December 12, 1995 in the C<C> locale.
-
-	$str = POSIX::strftime( "%A, %B %d, %Y",
-				 0, 0, 0, 12, 11, 95, 2 );
-	print "$str\n";
+More details on the behavior and the specification of the other
+parameters are described in L<perlapi/sv_strftime_ints>.
 
 =item C<strlen>
 

ext/POSIX/t/posix.t

@@ -273,7 +273,12 @@ print POSIX::strftime("ok $test # %H:%M, on %m/%d/%y\n", localtime());
 # input fields to strftime().
 sub try_strftime {
     my $expect = shift;
-    my $got = POSIX::strftime("%a %b %d %H:%M:%S %Y %j", @_);
+    my @input = @_;
+
+    # Add zeros to missing parameters.  The final 0 is for isdst, and the zero
+    # forces use of mini_mktime (unless the code changes).
+    push @input, 0 while @input < 9;
+    my $got = POSIX::strftime("%a %b %d %H:%M:%S %Y %j", @input);
     is($got, $expect, "validating mini_mktime() and strftime(): $expect");
 }
 

ext/POSIX/t/time.t

@@ -9,7 +9,7 @@ use strict;
 
 use Config;
 use POSIX;
-use Test::More tests => 31;
+use Test::More tests => 40;
 
 # For the first 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.
@@ -205,11 +205,16 @@ SKIP: {
     is(mktime(CORE::localtime($time)), $time, "mktime()");
     is(mktime(POSIX::localtime($time)), $time, "mktime()");
 }
+
+# What these are hasn't been fully investigated; None have %s.  At least MS
+# isn't documented to have %l, %E, %O either.
+my $limited_strftime_formats = $^O eq "VMS"
+                            || $^O eq "MSWin32"
+                            || $^O eq "os390";
 
 SKIP: {
-    skip "'%s' not implemented in strftime", 1 if $^O eq "VMS"
-                                               || $^O eq "MSWin32"
-                                               || $^O eq "os390";
+    skip "'%s' not implemented in strftime", 1 if $limited_strftime_formats;
+
     # Somewhat arbitrarily, put in 60 seconds of slack;  if this fails, it
     # will likely be off by 1 hour
     ok(abs(POSIX::strftime('%s', localtime) - time) < 60,
@@ -226,3 +231,50 @@ SKIP: {
     is(strftime(undef, CORE::localtime), '', "strftime() works if format is undef");
     like($warnings, qr/^Use of uninitialized value in subroutine entry /, "strftime(undef, ...) produces expected warning");
 }
+
+SKIP: {   # GH #23878
+    my $skip_count = 9;
+    skip "No mktime()", $skip_count if $Config{d_mktime} ne 'define';
+    my $locale = "Europe/Paris";
+    $ENV{TZ} = $locale;
+    my $t = 1761436800;     # an hour before time should have changed
+
+    # The time in the first test case is such that UTC gives a different day.
+    # If the locale above is unknown, libc is supposed to use UTC; so that's
+    # how we check if the system knows about the rules for Paris; which on
+    # some systems differ from plain CET-1CEST.
+    skip "'$locale' not understood", $skip_count if
+                POSIX::strftime("%F %T%z", localtime($t - 1)) !~ /2025-10-26/;
+
+    # On Winddows, the documentation says that it won't understand what our
+    # $locale is set to, but instead of falling back to UTC, it uses the
+    # system timezone, or U.S.  Pacific time.  The trick above therefore
+    # doesn't work, so just skip this batch of tests.
+    skip "'$locale' not understood", $skip_count if $^O eq "MSWin32";
+
+    my ($azone, $bzone);    # Timezone offset before and after dst change
+
+    # If this platform doesn't have this field, the offset will be zero
+    if (0 && ! $Config{d_tm_tm_gmtoff}) {
+        $azone = $bzone = "0000";
+    }
+    else {
+        $bzone = "0200";
+        $azone = "0100";
+    }
+    my @data = (
+                 [   -1, "2025-10-26 01:59:59+$bzone", "-1 second" ],
+                 [    0, "2025-10-26 02:00:00+$bzone", "+0 seconds" ],
+                 [    1, "2025-10-26 02:00:01+$bzone", "+1 second" ],
+                 [ 3599, "2025-10-26 02:59:59+$bzone", "+59 minutes 59 seconds" ],
+                 [ 3600, "2025-10-26 02:00:00+$azone", "+1 hour" ],
+                 [ 3601, "2025-10-26 02:00:01+$azone", "+1 hour 1 second" ],
+                 [ 7199, "2025-10-26 02:59:59+$azone", "+2 hours minus 1 sec" ],
+                 [ 7200, "2025-10-26 03:00:00+$azone", "+2 hours" ],
+                 [ 7201, "2025-10-26 03:00:01+$azone", "+2 hours 1 second" ],
+               );
+    for (my $i = 0; $i < @data; $i++) {
+        is(POSIX::strftime("%F %T%z", localtime $t + $data[$i][0]),
+           $data[$i][1], $data[$i][2]);
+    }
+}

locale.c

@@ -8347,15 +8347,8 @@ Perl_sv_strftime_ints(pTHX_ SV * fmt, int sec, int min, int hour,
     const char * locale = "C";
 #endif
 
-    /* A negative 'isdst' triggers backwards compatibility mode for
-     * POSIX::strftime(), in which 0 is always passed to ints_to_tm() so that
-     * the possibility of daylight savings time is never considered,  But, a 1
-     * is eventually passed to libc strftime() so that it returns the results
-     * it always has for a non-zero 'isdst'.  See GH #22351 */
     struct tm  mytm;
-    ints_to_tm(&mytm, locale, sec, min, hour, mday, mon, year,
-                              MAX(0, isdst));
-    mytm.tm_isdst = MIN(1, abs(isdst));
+    ints_to_tm(&mytm, locale, sec, min, hour, mday, mon, year, isdst);
     return sv_strftime_common(fmt, locale, &mytm);
 }