archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 18:58:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixup for sys_time_get_timezone (3rd path)

Browse source 
Also simplify Linux path a bit.
This commit is contained in:
Nekotekina 2021-04-29 00:07:14 +03:00
parent 64a109d28a
commit 703ec474f5
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
rpcs3/Emu/Cell/lv2/sys_time.cpp
View file

@ -218,11 +218,8 @@ error_code sys_time_get_timezone(vm::ptr<s32> timezone, vm::ptr<s32> summertime)
} }
} }
#elif __linux__ #elif __linux__
tzset(); *timezone = ::narrow<s16>(-::timezone / 60);
*timezone = ::narrow<s32>(-::timezone / 60); *summertime = !::daylight ? 0 : []() -> s32
*summertime = 0;
if (::daylight)
{ {
struct tm test{}; struct tm test{};
ensure(&test == localtime_r(&start_time.tv_sec, &test)); ensure(&test == localtime_r(&start_time.tv_sec, &test));
@ -231,18 +228,25 @@ error_code sys_time_get_timezone(vm::ptr<s32> timezone, vm::ptr<s32> summertime)
if (test.tm_isdst & -2) if (test.tm_isdst & -2)
{ {
sys_time.error("No information for timezone DST bias (timezone=%.2fh, tm_gmtoff=%d)", -::timezone / 3600.0, test.tm_gmtoff); sys_time.error("No information for timezone DST bias (timezone=%.2fh, tm_gmtoff=%d)", -::timezone / 3600.0, test.tm_gmtoff);
return 0;
} }
else else
{ {
*summertime = ::narrow<s32>(test.tm_isdst ? (test.tm_gmtoff + ::timezone) / 60 : 0); return test.tm_isdst ? ::narrow<s16>((test.tm_gmtoff + ::timezone) / 60) : 0;
}
} }
}();
#else #else
struct timeval _tv{}; // gettimeofday doesn't return timezone on linux anymore, but this should work on other OSes?
struct timezone tz{}; struct timezone tz{};
ensure(gettimeofday(&_tv, &tz) == 0); ensure(gettimeofday(nullptr, &tz) == 0);
*timezone = -tz.tz_minuteswest; *timezone = ::narrow<s16>(-tz.tz_minuteswest);
*summertime = tz.tz_dsttime ? 60 : 0; // TODO *summertime = !tz.tz_dsttime ? 0 : [&]() -> s32
{
struct tm test{};
ensure(&test == localtime_r(&start_time.tv_sec, &test));
return test.tm_isdst ? ::narrow<s16>(test.tm_gmtoff / 60 + tz.tz_minuteswest) : 0;
}();
#endif #endif
return CELL_OK; return CELL_OK;