JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2004-12-08 Alex Mogilnikov <alx@intellectronika.ru>

Browse Source 
* libc/time/mktm_r (_mktm_r): Fix overflow calculation for
        m_day.
        (__tzcalc_limits): Fix reference to month array to be zero-based.
This commit is contained in:
Jeff Johnston 2004-12-08 17:54:38 +00:00
parent 465eab2eb4
commit 4b30e15471
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
newlib/ChangeLog
View File

@ -1,3 +1,9 @@
2004-12-08 Alex Mogilnikov <alx@intellectronika.ru>
* libc/time/mktm_r (_mktm_r): Fix overflow calculation for
m_day.
(__tzcalc_limits): Fix reference to month array to be zero-based.
2004-12-07 Jeff Johnston <jjohnstn@redhat.com> 2004-12-07 Jeff Johnston <jjohnstn@redhat.com>
* libc/sys/linux/sys/unistd.h: Add prototypes for ftruncate, truncate, * libc/sys/linux/sys/unistd.h: Add prototypes for ftruncate, truncate,

8
newlib/libc/time/mktm_r.c
View File

@ -2,6 +2,8 @@
* mktm_r.c * mktm_r.c
* Original Author: Adapted from tzcode maintained by Arthur David Olson. * Original Author: Adapted from tzcode maintained by Arthur David Olson.
* Modifications: Changed to mktm_r and added __tzcalc_limits - 04/10/02, Jeff Johnston * Modifications: Changed to mktm_r and added __tzcalc_limits - 04/10/02, Jeff Johnston
* Fixed bug in mday computations - 08/12/04, Alex Mogilnikov <alx@intellectronika.ru>
* Fixed bug in __tzcalc_limits - 08/12/04, Alex Mogilnikov <alx@intellectronika.ru>
* *
* Converts the calendar time pointed to by tim_p into a broken-down time * Converts the calendar time pointed to by tim_p into a broken-down time
* expressed as local time. Returns a pointer to a structure containing the * expressed as local time. Returns a pointer to a structure containing the
@ -149,9 +151,9 @@ _DEFUN (_mktm_r, (tim_p, res, is_gmtime),
res->tm_wday = 0; res->tm_wday = 0;
++res->tm_mday; ++res->tm_mday;
res->tm_hour -= HOURSPERDAY; res->tm_hour -= HOURSPERDAY;
if (res->tm_mday >= ip[res->tm_mon]) if (res->tm_mday > ip[res->tm_mon])
{ {
res->tm_mday -= ip[res->tm_mon] - 1; res->tm_mday -= ip[res->tm_mon];
res->tm_mon += 1; res->tm_mon += 1;
if (res->tm_mon == 12) if (res->tm_mon == 12)
{ {
@ -231,7 +233,7 @@ _DEFUN (__tzcalc_limits, (year),
wday_diff += DAYSPERWEEK; wday_diff += DAYSPERWEEK;
m_day = (__tzrule[i].n - 1) * DAYSPERWEEK + wday_diff; m_day = (__tzrule[i].n - 1) * DAYSPERWEEK + wday_diff;
while (m_day >= ip[j]) while (m_day >= ip[j-1])
m_day -= DAYSPERWEEK; m_day -= DAYSPERWEEK;
days += m_day; days += m_day;