Time-Piece-1.33

Author: rurban

Porting/Maintainers.pl

@@ -1500,7 +1500,7 @@ package Maintainers;
     },
 
     'Time::Piece' => {
-        'DISTRIBUTION' => 'ESAYM/Time-Piece-1.3203.tar.gz',
+        'DISTRIBUTION' => 'ESAYM/Time-Piece-1.33.tar.gz',
         'FILES'        => q[cpan/Time-Piece],
         'EXCLUDED'     => [
             qw[ reverse_deps.txt ],

cpan/Time-Piece/Piece.pm

@@ -6,6 +6,7 @@ use XSLoader ();
 use Time::Seconds;
 use Carp;
 use Time::Local;
+use Scalar::Util qw/ blessed /;
 
 use Exporter ();
 
@@ -18,7 +19,7 @@ our %EXPORT_TAGS = (
     ':override' => 'internal',
     );
 
-our $VERSION = '1.3203';
+our $VERSION = '1.33';
 
 XSLoader::load( 'Time::Piece', $VERSION );
 
@@ -63,13 +64,27 @@ sub gmtime {
     $class->_mktime($time, 0);
 }
 
+
+# Check if the supplied param is either a normal array (as returned from
+# localtime in list context) or a Time::Piece-like wrapper around one.
+#
+# We need to differentiate between an array ref that we can interrogate and
+# other blessed objects (like overloaded values).
+sub _is_time_struct {
+    return 1 if ref($_[1]) eq 'ARRAY';
+    return 1 if blessed($_[1]) && $_[1]->isa('Time::Piece');
+
+    return 0;
+}
+
+
 sub new {
     my $class = shift;
     my ($time) = @_;
 
     my $self;
 
-    if (ref($time)) {
+    if ($class->_is_time_struct($time)) {
         $self = $time->[c_islocal] ? $class->localtime($time) : $class->gmtime($time);
     }
     elsif (defined($time)) {
@@ -106,10 +121,9 @@ sub parse {
 sub _mktime {
     my ($class, $time, $islocal) = @_;
 
-    $class = eval { (ref $class) && (ref $class)->isa('Time::Piece') }
-           ? ref $class
-           : $class;
-    if (ref($time)) {
+    $class = blessed($class) || $class;
+
+    if ($class->_is_time_struct($time)) {
         my @new_time = @$time;
         my @tm_parts = (@new_time[c_sec .. c_mon], $new_time[c_year]+1900);
         $new_time[c_epoch] = $islocal ? timelocal(@tm_parts) : timegm(@tm_parts);
@@ -639,7 +653,8 @@ sub cdate {
 
 sub str_compare {
     my ($lhs, $rhs, $reverse) = @_;
-    if (UNIVERSAL::isa($rhs, 'Time::Piece')) {
+
+    if (blessed($rhs) && $rhs->isa('Time::Piece')) {
         $rhs = "$rhs";
     }
     return $reverse ? $rhs cmp $lhs->cdate : $lhs->cdate cmp $rhs;
@@ -652,9 +667,6 @@ use overload
 sub subtract {
     my $time = shift;
     my $rhs = shift;
-    if (UNIVERSAL::isa($rhs, 'Time::Seconds')) {
-        $rhs = $rhs->seconds;
-    }
 
     if (shift)
     {
@@ -667,7 +679,7 @@ sub subtract {
 	return $rhs - "$time";
     }
 
-    if (UNIVERSAL::isa($rhs, 'Time::Piece')) {
+    if (blessed($rhs) && $rhs->isa('Time::Piece')) {
         return Time::Seconds->new($time->epoch - $rhs->epoch);
     }
     else {
@@ -679,10 +691,6 @@ sub subtract {
 sub add {
     my $time = shift;
     my $rhs = shift;
-    if (UNIVERSAL::isa($rhs, 'Time::Seconds')) {
-        $rhs = $rhs->seconds;
-    }
-    croak "Invalid rhs of addition: $rhs" if ref($rhs);
 
     return $time->_mktime(($time->epoch + $rhs), $time->[c_islocal]);
 }
@@ -692,7 +700,7 @@ use overload
 
 sub get_epochs {
     my ($lhs, $rhs, $reverse) = @_;
-    if (!UNIVERSAL::isa($rhs, 'Time::Piece')) {
+    unless (blessed($rhs) && $rhs->isa('Time::Piece')) {
         $rhs = $lhs->new($rhs);
     }
     if ($reverse) {

cpan/Time-Piece/Piece.xs

@@ -347,8 +347,8 @@ _strptime(pTHX_ const char *buf, const char *fmt, struct tm *tm, int *got_GMT)
 {
 	char c;
 	const char *ptr;
-	int i,
-		len;
+	int i;
+	size_t len;
 	int Ealternative, Oalternative;
 
     /* There seems to be a slightly improved version at
@@ -811,12 +811,12 @@ label:
 			for (cp = buf; *cp && isupper((unsigned char)*cp); ++cp)
                             {/*empty*/}
 			if (cp - buf) {
-				zonestr = (char *)malloc(cp - buf + 1);
+				zonestr = (char *)malloc((size_t) (cp - buf + 1));
 				if (!zonestr) {
 				    errno = ENOMEM;
 				    return 0;
 				}
-				strncpy(zonestr, buf, cp - buf);
+				strncpy(zonestr, buf,(size_t) (cp - buf));
 				zonestr[cp - buf] = '\0';
 				my_tzset(aTHX);
 				if (0 == strcmp(zonestr, "GMT")) {
@@ -921,9 +921,9 @@ return_11part_tm(pTHX_ SV ** SP, struct tm *mytm)
 
 static void _populate_C_time_locale(pTHX_ HV* locales )
 {
-    AV* alt_names   = (AV *) SvRV( *hv_fetch(locales, "alt_month", strlen("alt_month"), 0) );
-    AV* long_names  = (AV *) SvRV( *hv_fetch(locales, "month", strlen("month"), 0) );
-    AV* short_names = (AV *) SvRV( *hv_fetch(locales, "mon", strlen("mon"), 0) );
+    AV* alt_names   = (AV *) SvRV( *hv_fetch(locales, "alt_month", 9, 0) );
+    AV* long_names  = (AV *) SvRV( *hv_fetch(locales, "month", 5, 0) );
+    AV* short_names = (AV *) SvRV( *hv_fetch(locales, "mon", 3, 0) );
     int i;
 
     for (i = 0; i < 1 + (int) av_len( long_names ); i++) {
@@ -932,18 +932,18 @@ static void _populate_C_time_locale(pTHX_ HV* locales )
         Locale->mon[i]       = SvPV_nolen( (SV *) *av_fetch(short_names, i, 0) );
     }
 
-    long_names = (AV *) SvRV( *hv_fetch(locales, "weekday", strlen("weekday"), 0) );
-    short_names = (AV *) SvRV( *hv_fetch(locales, "wday", strlen("wday"), 0) );
+    long_names = (AV *) SvRV( *hv_fetch(locales, "weekday", 7, 0) );
+    short_names = (AV *) SvRV( *hv_fetch(locales, "wday", 4, 0) );
 
     for (i = 0; i < 1 + (int) av_len( long_names ); i++) {
         Locale->wday[i]    = SvPV_nolen( (SV *) *av_fetch(short_names, i, 0) );
         Locale->weekday[i] = SvPV_nolen( (SV *) *av_fetch(long_names, i, 0) );
     }
 
-    Locale->am = SvPV_nolen( (SV *) *hv_fetch(locales, "am", strlen("am"), 0) );
-    Locale->pm = SvPV_nolen( (SV *) *hv_fetch(locales, "pm", strlen("pm"), 0) );
-    Locale->AM = SvPV_nolen( (SV *) *hv_fetch(locales, "AM", strlen("AM"), 0) );
-    Locale->PM = SvPV_nolen( (SV *) *hv_fetch(locales, "PM", strlen("PM"), 0) );
+    Locale->am = SvPV_nolen( (SV *) *hv_fetch(locales, "am", 2, 0) );
+    Locale->pm = SvPV_nolen( (SV *) *hv_fetch(locales, "pm", 2, 0) );
+    Locale->AM = SvPV_nolen( (SV *) *hv_fetch(locales, "AM", 2, 0) );
+    Locale->PM = SvPV_nolen( (SV *) *hv_fetch(locales, "PM", 2, 0) );
 
     return;
 }
@@ -987,10 +987,10 @@ _strftime(fmt, epoch, islocal = 1)
         ST(0) = sv_2mortal(newSVpv(tmpbuf, len));
         else {
         /* Possibly buf overflowed - try again with a bigger buf */
-        int     fmtlen = strlen(fmt);
-        int    bufsize = fmtlen + TP_BUF_SIZE;
+        size_t fmtlen = strlen(fmt);
+        size_t bufsize = fmtlen + TP_BUF_SIZE;
         char*     buf;
-        int    buflen;
+        size_t    buflen;
 
         New(0, buf, bufsize, char);
         while (buf) {
@@ -1145,17 +1145,17 @@ _get_localization()
             ++mytm.tm_mon;
         }
 
-        tmp = hv_store(locales, "wday", strlen("wday"), newRV_noinc((SV *) wdays), 0);
-        tmp = hv_store(locales, "weekday", strlen("weekday"), newRV_noinc((SV *) weekdays), 0);
-        tmp = hv_store(locales, "mon", strlen("mon"), newRV_noinc((SV *) mons), 0);
-        tmp = hv_store(locales, "month", strlen("month"), newRV_noinc((SV *) months), 0);
-        tmp = hv_store(locales, "alt_month", strlen("alt_month"), newRV((SV *) months), 0);
+        tmp = hv_store(locales, "wday", 4, newRV_noinc((SV *) wdays), 0);
+        tmp = hv_store(locales, "weekday", 7, newRV_noinc((SV *) weekdays), 0);
+        tmp = hv_store(locales, "mon", 3, newRV_noinc((SV *) mons), 0);
+        tmp = hv_store(locales, "month", 5, newRV_noinc((SV *) months), 0);
+        tmp = hv_store(locales, "alt_month", 9, newRV((SV *) months), 0);
 
         len = strftime(buf, TP_BUF_SIZE, "%p", &mytm);
-        tmp = hv_store(locales, "AM", strlen("AM"), newSVpvn(buf,len), 0);
+        tmp = hv_store(locales, "AM", 2, newSVpvn(buf,len), 0);
         mytm.tm_hour = 18;
         len = strftime(buf, TP_BUF_SIZE, "%p", &mytm);
-        tmp = hv_store(locales, "PM", strlen("PM"), newSVpvn(buf,len), 0);
+        tmp = hv_store(locales, "PM", 2, newSVpvn(buf,len), 0);
 
         if(tmp == NULL || !SvOK( (SV *) *tmp)){
             croak("Failed to get localization.");

cpan/Time-Piece/Seconds.pm

@@ -1,7 +1,7 @@
 package Time::Seconds;
 use strict;
 
-our $VERSION = '1.3203';
+our $VERSION = '1.33';
 
 use Exporter 5.57 'import';
 

cpan/Time-Piece/t/06subclass.t

@@ -35,6 +35,21 @@ for my $method (qw(new localtime gmtime)) {
   isa_ok($diff, $class, "yesterday via subtraction operator");
 }
 
+{
+  my $g = $class->gmtime;
+  my $l = $class->localtime;
+
+  #via clone
+  my $l_clone = $class->new($l);
+  isa_ok($l_clone, $class, 'custom localtime via clone');
+  cmp_ok("$l_clone", 'eq', "$l", 'Clones match');
+
+  #via clone with gmtime
+  my $g_clone = $class->new($g);
+  isa_ok($g_clone, $class, 'custom gmtime via clone');
+  cmp_ok("$g_clone", 'eq', "$g", 'Clones match');
+}
+
 {
   # let's verify that we can use gmtime from T::P without the export magic
   my $piece = Time::Piece::gmtime;

dist/Module-CoreList/lib/Module/CoreList.pm

@@ -17622,6 +17622,7 @@ our %delta = (
             'Test::Harness'         => '3.42_01',
             'Time::HiRes'           => '1.9758_01',
             'Time::Local'           => '1.28',
+            'Time::Piece'           => '1.33',
             'XSLoader'              => '1.04c',
         },
         removed => {

pod/perlcdelta.pod

@@ -530,6 +530,20 @@ Added timelocal_modern and timegm_modern variants as optional exports. These
 versions do not munge years at all. They treat the year value that they are
 given exactly as-is.
 
+=item L<Time::Piece> 1.33
+
+Switch to XSLoader.
+
+Fix AIX compile
+
+Fix compile errors on MS
+
+Use macro for buf sizes
+
+Remove some compile warnings
+
+SP off by 1 in C<_crt_localtime>
+
 =item L<XSLoader> 1.04c
 
 Fix wrong usage of C<SvREFCNT_inc_simple_NN> with a function, fixes a memory leak.