2004-10-22 Paul Eggert <eggert@cs.ucla.edu>
+ [BZ #471] Fix imported from gnulib.
+ * time/mktime.c (leapyear, ydms_tm_diff): Year is of type
+ long int, not int, to avoid problems when tm_year == INT_MAX
+ and tm_mon > 12.
+ (__mktime_intenral): Compute year using long int arithmetic,
+ not int arithmetic, to avoid problems on hosts where time_t
+ and long are 64 bits but int is 32.
+
[BZ #468] Import a fix from gnulib.
* time/mktime.c [! DEBUG]: Do not include <string.h>.
It's needed only if DEBUG is nonzero.
/* Return 1 if YEAR + TM_YEAR_BASE is a leap year. */
static inline int
-leapyear (int year)
+leapyear (long int year)
{
/* Don't add YEAR to TM_YEAR_BASE, as that might overflow.
Also, work even if YEAR is negative. */
If TP is null, return a nonzero value.
If overflow occurs, yield the low order bits of the correct answer. */
static time_t
-ydhms_tm_diff (int year, int yday, int hour, int min, int sec,
+ydhms_tm_diff (long int year, int yday, int hour, int min, int sec,
const struct tm *tp)
{
if (!tp)
int mon_remainder = mon % 12;
int negative_mon_remainder = mon_remainder < 0;
int mon_years = mon / 12 - negative_mon_remainder;
- int year = year_requested + mon_years;
+ long int lyear_requested = year_requested;
+ long int year = lyear_requested + mon_years;
/* The other values need not be in range:
the remaining code handles minor overflows correctly,