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

* libc/time/strftime.c (get_era_info): Fix off-by-one error in month 

calculation.
This commit is contained in:
Corinna Vinschen 2011-12-12 10:48:29 +00:00
parent cdce73f183
commit 74e0bcfc0f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2011-12-12 Akio Idehara <zbe64533@gmail.com>
* libc/time/strftime.c (get_era_info): Fix off-by-one error in month
calculation.
2011-12-06 Chris Johns <chrisj@rtems.org> 2011-12-06 Chris Johns <chrisj@rtems.org>
* libc/iconv/Makefile.am (stmp-def): Use $(MAKE) rather than make. * libc/iconv/Makefile.am (stmp-def): Use $(MAKE) rather than make.

6
newlib/libc/time/strftime.c
View File

@ -426,7 +426,7 @@ get_era_info (const struct tm *tim_p, const char *era)
/* Adjust offset for negative gregorian dates. */ /* Adjust offset for negative gregorian dates. */
if (stm.tm_year <= -YEAR_BASE) if (stm.tm_year <= -YEAR_BASE)
++stm.tm_year; ++stm.tm_year;
stm.tm_mon = ERA_STRTOL (c + 1, &c, 10); stm.tm_mon = ERA_STRTOL (c + 1, &c, 10) - 1;
stm.tm_mday = ERA_STRTOL (c + 1, &c, 10); stm.tm_mday = ERA_STRTOL (c + 1, &c, 10);
stm.tm_hour = stm.tm_min = stm.tm_sec = 0; stm.tm_hour = stm.tm_min = stm.tm_sec = 0;
era = c + 1; era = c + 1;
@ -440,7 +440,7 @@ get_era_info (const struct tm *tim_p, const char *era)
else if (era[0] == '+' && era[1] == '*') else if (era[0] == '+' && era[1] == '*')
{ {
etm.tm_year = INT_MAX; etm.tm_year = INT_MAX;
etm.tm_mon = 12; etm.tm_mon = 11;
etm.tm_mday = 31; etm.tm_mday = 31;
etm.tm_hour = 23; etm.tm_hour = 23;
etm.tm_min = etm.tm_sec = 59; etm.tm_min = etm.tm_sec = 59;
@ -452,7 +452,7 @@ get_era_info (const struct tm *tim_p, const char *era)
/* Adjust offset for negative gregorian dates. */ /* Adjust offset for negative gregorian dates. */
if (etm.tm_year <= -YEAR_BASE) if (etm.tm_year <= -YEAR_BASE)
++etm.tm_year; ++etm.tm_year;
etm.tm_mon = ERA_STRTOL (c + 1, &c, 10); etm.tm_mon = ERA_STRTOL (c + 1, &c, 10) - 1;
etm.tm_mday = ERA_STRTOL (c + 1, &c, 10); etm.tm_mday = ERA_STRTOL (c + 1, &c, 10);
etm.tm_mday = 31; etm.tm_mday = 31;
etm.tm_hour = 23; etm.tm_hour = 23;