libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* libc/time/tzset_r (_tzset_r): Fix loop.
This commit is contained in:
Jeff Johnston 2004-12-08 18:12:28 +00:00
parent 4b30e15471
commit 3b54b74f3a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/ChangeLog
View File

@ -1,3 +1,7 @@
2004-12-08 Alex Mogilnikov <alx@intellectronika.ru>
* libc/time/tzset_r (_tzset_r): Fix loop.
2004-12-08 Alex Mogilnikov <alx@intellectronika.ru> 2004-12-08 Alex Mogilnikov <alx@intellectronika.ru>
* libc/time/mktm_r (_mktm_r): Fix overflow calculation for * libc/time/mktm_r (_mktm_r): Fix overflow calculation for

9
newlib/libc/time/tzset_r.c
View File

@ -122,11 +122,11 @@ _DEFUN (_tzset_r, (reent_ptr),
tzenv += n; tzenv += n;
if (*tzenv == ',')
++tzenv;
for (i = 0; i < 2; ++i) for (i = 0; i < 2; ++i)
{ {
if (*tzenv == ',')
++tzenv;
if (*tzenv == 'M') if (*tzenv == 'M')
{ {
if (sscanf (tzenv, "M%hu%n.%hu%n.%hu%n", &m, &n, &w, &n, &d, &n) != 3 || if (sscanf (tzenv, "M%hu%n.%hu%n.%hu%n", &m, &n, &w, &n, &d, &n) != 3 ||
@ -187,11 +187,14 @@ _DEFUN (_tzset_r, (reent_ptr),
hh = 2; hh = 2;
mm = 0; mm = 0;
ss = 0; ss = 0;
n = 0;
if (*tzenv == '/') if (*tzenv == '/')
sscanf (tzenv, "%hu%n:%hu%n:%hu%n", &hh, &n, &mm, &n, &ss, &n); sscanf (tzenv, "%hu%n:%hu%n:%hu%n", &hh, &n, &mm, &n, &ss, &n);
__tzrule[i].s = ss + SECSPERMIN * mm + SECSPERHOUR * hh; __tzrule[i].s = ss + SECSPERMIN * mm + SECSPERHOUR * hh;
tzenv += n;
} }
__tzcalc_limits (__tzyear); __tzcalc_limits (__tzyear);