From cc1c87e7562a654e819f531cffec305f67d46878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Wed, 24 Jun 2015 21:09:58 +0200 Subject: [PATCH] 2015-06-24 21:09 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/hbmzip/mzip.c * src/rtl/filesys.c ! initialize tm_isdst member of tm structure with -1 to force correct local time to UTC conversion in mktime() --- ChangeLog.txt | 6 ++++++ contrib/hbmzip/mzip.c | 1 + src/rtl/filesys.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 6d07201163..c084875cda 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,12 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2015-06-24 21:09 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/hbmzip/mzip.c + * src/rtl/filesys.c + ! initialize tm_isdst member of tm structure with -1 to force correct + local time to UTC conversion in mktime() + 2015-06-24 20:32 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/pp/ppcore.c ! fixed directory include precedence in #included files which diff --git a/contrib/hbmzip/mzip.c b/contrib/hbmzip/mzip.c index cc3380c932..d25bd74906 100644 --- a/contrib/hbmzip/mzip.c +++ b/contrib/hbmzip/mzip.c @@ -1389,6 +1389,7 @@ static int hb_unzipExtractCurrentFile( unzFile hUnzip, const char * szFileName, st.tm_mday = ufi.tmu_date.tm_mday; st.tm_mon = ufi.tmu_date.tm_mon; st.tm_year = ufi.tmu_date.tm_year - 1900; + st.tm_isdst = -1; utim.actime = utim.modtime = mktime( &st ); ( void ) utime( szNameOS, &utim ); diff --git a/src/rtl/filesys.c b/src/rtl/filesys.c index f002dc08c1..303f74b8cb 100644 --- a/src/rtl/filesys.c +++ b/src/rtl/filesys.c @@ -1693,7 +1693,7 @@ HB_BOOL hb_fsSetFileTime( const char * pszFileName, long lJulian, long lMillisec new_value.tm_min = iMinute; new_value.tm_sec = iSecond; } - new_value.tm_isdst = 0; + new_value.tm_isdst = -1; # if defined( HB_OS_LINUX ) && ! defined( __WATCOMC__ ) {