On August 13, 1999 at 00:57, Gunnar Hjalmarsson wrote:

> After having upgraded to 2.4.2, the default settings for the resource variabl
> es
> $LOCALDATE$ and $GMTDATE$ don't work for me.

Doh!

Patch for mhtime.pl attached.

*** mhtime.pl.org       Thu Aug 12 17:59:59 1999
--- mhtime.pl   Thu Aug 12 18:02:51 1999
***************
*** 84,89 ****
--- 84,91 ----
      my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
            ($local ? localtime($time) : gmtime($time));
  
+     $fmt = '%a %b %d %H:%M:%S %Y'  if $fmt !~ /\S/;
+ 
      POSIXMODCHK: {
        eval { require POSIX; };
        last  POSIXMODCHK  if ($@) || !defined(&POSIX::strftime);
***************
*** 97,147 ****
      $hour12   = $hour > 12 ? $hour-12 : $hour;
  
      ## Format output
!     if ($fmt =~ /\S/) {
!       $fmt =~ s/\%c/\%a \%b \%d \%H:\%M:\%S \%Y/g;
  
-       $fmt =~ s/\%a/$wdays[$wday]/g;
-       $fmt =~ s/\%A/$Wdays[$wday]/g;
-       $fmt =~ s/\%[bh]/$mons[$mon]/g;
-       $fmt =~ s/\%B/$Mons[$mon]/g;
- 
-       $sec      = sprintf("%02d", $sec);
-       $min      = sprintf("%02d", $min);
-       $hour     = sprintf("%02d", $hour);
-       $hour12   = sprintf("%02d", $hour12);
-       $mday     = sprintf("%02d", $mday);
-       $mon      = sprintf("%02d", $mon+1);
-       $year     = sprintf("%02d", $year);
-       $yearfull = sprintf("%04d", $yearfull);
-       $wday     = sprintf("%02d", $wday+1);
-       $yday     = sprintf("%03d", $yday);
- 
-       $fmt =~ s/\%d/$mday/g;
-       $fmt =~ s/\%H/$hour/g;
-       $fmt =~ s/\%I/$hour12/g;
-       $fmt =~ s/\%j/$yday/g;
-       $fmt =~ s/\%m/$mon/g;
-       $fmt =~ s/\%M/$min/g;
-       $fmt =~ s/\%n/\n/g;
-       $fmt =~ s/\%p/am/g if ($hour < 12);
-       $fmt =~ s/\%p/pm/g if ($hour >= 12);
-       $fmt =~ s/\%P/AM/g if ($hour < 12);
-       $fmt =~ s/\%P/PM/g if ($hour >= 12);
-       $fmt =~ s/\%S/$sec/eg;
-       $fmt =~ s/\%w/$wday/g;
-       $fmt =~ s/\%y/$year/g; 
-       $fmt =~ s/\%Y/$year+1900/ge; 
- 
-       $fmt =~ s/\%\%/\%/g ; 
- 
-       $date = $fmt ;
- 
-     } else {
-       $date = sprintf("%s %s %02d %02d:%02d:%02d ".
-                               ($local ? "%d" : "GMT %d"),
-                       $wdays[$wday], $mons[$mon],
-                       $mday, $hour, $min, $sec, $yearfull);
-     }
      $date ;
  }
  
--- 99,142 ----
      $hour12   = $hour > 12 ? $hour-12 : $hour;
  
      ## Format output
!     $fmt =~ s/\%c/\%a \%b \%d \%H:\%M:\%S \%Y/g;
! 
!     $fmt =~ s/\%a/$wdays[$wday]/g;
!     $fmt =~ s/\%A/$Wdays[$wday]/g;
!     $fmt =~ s/\%[bh]/$mons[$mon]/g;
!     $fmt =~ s/\%B/$Mons[$mon]/g;
! 
!     $sec      = sprintf("%02d", $sec);
!     $min      = sprintf("%02d", $min);
!     $hour     = sprintf("%02d", $hour);
!     $hour12   = sprintf("%02d", $hour12);
!     $mday     = sprintf("%02d", $mday);
!     $mon      = sprintf("%02d", $mon+1);
!     $year     = sprintf("%02d", $year);
!     $yearfull = sprintf("%04d", $yearfull);
!     $wday     = sprintf("%02d", $wday+1);
!     $yday     = sprintf("%03d", $yday);
! 
!     $fmt =~ s/\%d/$mday/g;
!     $fmt =~ s/\%H/$hour/g;
!     $fmt =~ s/\%I/$hour12/g;
!     $fmt =~ s/\%j/$yday/g;
!     $fmt =~ s/\%m/$mon/g;
!     $fmt =~ s/\%M/$min/g;
!     $fmt =~ s/\%n/\n/g;
!     $fmt =~ s/\%p/am/g if ($hour < 12);
!     $fmt =~ s/\%p/pm/g if ($hour >= 12);
!     $fmt =~ s/\%P/AM/g if ($hour < 12);
!     $fmt =~ s/\%P/PM/g if ($hour >= 12);
!     $fmt =~ s/\%S/$sec/eg;
!     $fmt =~ s/\%w/$wday/g;
!     $fmt =~ s/\%y/$year/g; 
!     $fmt =~ s/\%Y/$year+1900/ge; 
! 
!     $fmt =~ s/\%\%/\%/g ; 
! 
!     $date = $fmt ;
  
      $date ;
  }
  

Reply via email to