beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibC: Make mktime() / gmtime() more POSIX-compliant

Browse source 
mktime() is supposed to fill in tm_wday and tm_yday, and it
it's supposed to canonicalize out-of-range values (that is,
"Jan 31" is turned into "Feb 1").

Instead of making the straightfoward tm_to_time() implementation
more complicated, just make it call time_to_tm() once the timestamp
is computed to break it back down ot (canonical) tm entries.
This commit is contained in:
Nico Weber 2020-08-24 09:19:50 -04:00 committed by Andreas Kling
parent 84f729c2b4
commit 1c9581f383
Notes: sideshowbarker 2024-07-19 03:13:36 +09:00 
Author: https://github.com/nico
Commit: https://github.com/SerenityOS/serenity/commit/1c9581f383d
Pull-request: https://github.com/SerenityOS/serenity/pull/3280
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Libraries/LibC/time.cpp
View file

@ -103,6 +103,16 @@ static void time_to_tm(struct tm* tm, time_t t)
static time_t tm_to_time(struct tm* tm, long timezone_adjust_seconds)
{
// "The original values of the tm_wday and tm_yday components of the structure are ignored,
// and the original values of the other components are not restricted to the ranges described in <time.h>.
// [...]
// Upon successful completion, the values of the tm_wday and tm_yday components of the structure shall be set appropriately,
// and the other components are set to represent the specified time since the Epoch,
// but with their values forced to the ranges indicated in the <time.h> entry;
// the final value of tm_mday shall not be set until tm_mon and tm_year are determined."
// FIXME: Handle tm_isdst eventually.
tm->tm_year += tm->tm_mon / 12;
tm->tm_mon %= 12;
if (tm->tm_mon < 0) {
@ -125,7 +135,9 @@ static time_t tm_to_time(struct tm* tm, long timezone_adjust_seconds)
days += tm->tm_yday;
int seconds = tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec;
return static_cast<time_t>(days) * __seconds_per_day + seconds + timezone_adjust_seconds;
auto timestamp = static_cast<time_t>(days) * __seconds_per_day + seconds + timezone_adjust_seconds;
time_to_tm(tm, timestamp);
return timestamp;
}
time_t mktime(struct tm* tm)