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

2008-08-28 Craig Howland <howland@LGSInnovations.com> 

* libc/time/mktime.c (mktime): Fix tm_isdst value usage (allowing
        any positive value from user (per std) rather than depending
        upon 1).
This commit is contained in:
Jeff Johnston 2008-08-28 18:18:12 +00:00
parent 60ac13a0b0
commit b6ab3057f6
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
newlib/ChangeLog
View File

@ -1,3 +1,9 @@
2008-08-28 Craig Howland <howland@LGSInnovations.com>
* libc/time/mktime.c (mktime): Fix tm_isdst value usage (allowing
any positive value from user (per std) rather than depending
upon 1).
2008-08-28 Corinna Vinschen <corinna@vinschen.de> 2008-08-28 Corinna Vinschen <corinna@vinschen.de>
* libc/stdlib/wcsrtombs.c (_wcsrtombs_r): Optimize condition * libc/stdlib/wcsrtombs.c (_wcsrtombs_r): Optimize condition

14
newlib/libc/time/mktime.c
View File

@ -9,6 +9,8 @@
* the fields of the structure are set to represent the specified calendar * the fields of the structure are set to represent the specified calendar
* time. Returns the specified calendar time. If the calendar time can not be * time. Returns the specified calendar time. If the calendar time can not be
* represented, returns the value (time_t) -1. * represented, returns the value (time_t) -1.
*
* Modifications: Fixed tm_isdst usage - 27 August 2008 Craig Howland.
*/ */
/* /*
@ -157,7 +159,7 @@ mktime (tim_p)
{ {
time_t tim = 0; time_t tim = 0;
long days = 0; long days = 0;
int year, isdst; int year, isdst, tm_isdst;
__tzinfo_type *tz = __gettzinfo (); __tzinfo_type *tz = __gettzinfo ();
/* validate structure */ /* validate structure */
@ -202,7 +204,9 @@ mktime (tim_p)
/* compute total seconds */ /* compute total seconds */
tim += (days * _SEC_IN_DAY); tim += (days * _SEC_IN_DAY);
isdst = tim_p->tm_isdst; /* Convert user positive into 1 */
tm_isdst = tim_p->tm_isdst > 0 ? 1 : tim_p->tm_isdst;
isdst = tm_isdst;
if (_daylight) if (_daylight)
{ {
@ -225,8 +229,10 @@ mktime (tim_p)
isdst = (tz->__tznorth isdst = (tz->__tznorth
? (tim >= startdst_dst && tim < startstd_std) ? (tim >= startdst_dst && tim < startstd_std)
: (tim >= startdst_dst || tim < startstd_std)); : (tim >= startdst_dst || tim < startstd_std));
/* if user committed and was wrong, perform correction */ /* if user committed and was wrong, perform correction, but not
if ((isdst ^ tim_p->tm_isdst) == 1) * if the user has given a negative value (which
* asks mktime() to determine if DST is in effect or not) */
if (tm_isdst >= 0 && (isdst ^ tm_isdst) == 1)
{ {
/* we either subtract or add the difference between /* we either subtract or add the difference between
time zone offsets, depending on which way the user got it time zone offsets, depending on which way the user got it