diff options
| author | ache <ache@FreeBSD.org> | 2000-05-11 23:49:13 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2000-05-11 23:49:13 +0000 |
| commit | 40f1deb4aa95b57616860a9766fdea9eb4bd9ae8 (patch) | |
| tree | 90f61182919b2f35fc764916dacc0c63339ea3b4 | |
| parent | de093b7d98b1ec4b7c18bead1359bf09bfc7c2ea (diff) | |
| download | FreeBSD-src-40f1deb4aa95b57616860a9766fdea9eb4bd9ae8.zip FreeBSD-src-40f1deb4aa95b57616860a9766fdea9eb4bd9ae8.tar.gz | |
Better fix for strftime/mktime bug, now more compatible since local timezone
name and offset restored for compatibility with standard perl
| -rw-r--r-- | contrib/perl5/ext/POSIX/POSIX.xs | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/contrib/perl5/ext/POSIX/POSIX.xs b/contrib/perl5/ext/POSIX/POSIX.xs index 093cc99..2066b46 100644 --- a/contrib/perl5/ext/POSIX/POSIX.xs +++ b/contrib/perl5/ext/POSIX/POSIX.xs @@ -3620,9 +3620,12 @@ strftime(fmt, sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1) char tmpbuf[128]; struct tm mytm; int len; -#ifndef __FreeBSD__ - init_tm(&mytm); /* XXX workaround - see init_tm() above */ +#ifdef __FreeBSD__ + long sgmtoff; + int sisdst; + char *szone; #endif + init_tm(&mytm); /* XXX workaround - see init_tm() above */ mytm.tm_sec = sec; mytm.tm_min = min; mytm.tm_hour = hour; @@ -3633,8 +3636,14 @@ strftime(fmt, sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1) mytm.tm_yday = yday; mytm.tm_isdst = isdst; #ifdef __FreeBSD__ - mytm.tm_gmtoff = 0; - mytm.tm_zone = "???"; + sgmtoff = mytm.tm_gmtoff; + sisdst = mytm.tm_isdst; + szone = mytm.tm_zone; + /* to prevent mess with shifted hours/days/etc. */ + (void) timegm(&mytm); + mytm.tm_gmtoff = sgmtoff; + mytm.tm_isdst = sisdst; + mytm.tm_zone = szone; #else (void) mktime(&mytm); #endif |
