diff options
Diffstat (limited to 'newlib/libc/time/mktime.c')
| -rw-r--r-- | newlib/libc/time/mktime.c | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/newlib/libc/time/mktime.c b/newlib/libc/time/mktime.c index 93ca5c3a7..5bedf5afc 100644 --- a/newlib/libc/time/mktime.c +++ b/newlib/libc/time/mktime.c @@ -178,29 +178,22 @@ _DEFUN(mktime, (tim_p), /* compute day of the year */ tim_p->tm_yday = days; - if (tim_p->tm_year > 10000 - || tim_p->tm_year < -10000) - { + if (tim_p->tm_year > 10000 || tim_p->tm_year < -10000) return (time_t) -1; - } /* compute days in other years */ - if (tim_p->tm_year > 70) + if ((year = tim_p->tm_year) > 70) { for (year = 70; year < tim_p->tm_year; year++) days += _DAYS_IN_YEAR (year); } - else if (tim_p->tm_year < 70) + else if (year < 70) { for (year = 69; year > tim_p->tm_year; year--) days -= _DAYS_IN_YEAR (year); days -= _DAYS_IN_YEAR (year); } - /* compute day of the week */ - if ((tim_p->tm_wday = (days + 4) % 7) < 0) - tim_p->tm_wday += 7; - /* compute total seconds */ tim += (days * _SEC_IN_DAY); @@ -247,8 +240,29 @@ _DEFUN(mktime, (tim_p), if (!isdst) diff = -diff; tim_p->tm_sec += diff; - validate_structure (tim_p); tim += diff; /* we also need to correct our current time calculation */ + int mday = tim_p->tm_mday; + validate_structure (tim_p); + mday = tim_p->tm_mday - mday; + /* roll over occurred */ + if (mday) { + /* compensate for month roll overs */ + if (mday > 1) + mday = -1; + else if (mday < -1) + mday = 1; + /* update days for wday calculation */ + days += mday; + /* handle yday */ + if ((tim_p->tm_yday += mday) < 0) { + --year; + tim_p->tm_yday = _DAYS_IN_YEAR(year) - 1; + } else { + mday = _DAYS_IN_YEAR(year); + if (tim_p->tm_yday > (mday - 1)) + tim_p->tm_yday -= mday; + } + } } } } @@ -265,5 +279,9 @@ _DEFUN(mktime, (tim_p), /* reset isdst flag to what we have calculated */ tim_p->tm_isdst = isdst; + /* compute day of the week */ + if ((tim_p->tm_wday = (days + 4) % 7) < 0) + tim_p->tm_wday += 7; + return tim; } |