ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cal: fix julian calendars for large years 

Before:
cal --r julian 31 12 2147483646
 December 2147483646
Su Mo Tu We Th Fr Sa
 1  2  3  4  5  6  7
 8  9 10 11 12 13 14
15 16 17 18 19 20 21
22 23 24 25 26 27 28
29 30 31

Patched:
cal --r julian 31 12 2147483646
 December 2147483646
Su Mo Tu We Th Fr Sa
                   1
 2  3  4  5  6  7  8
 9 10 11 12 13 14 15
16 17 18 19 20 21 22
23 24 25 26 27 28 29
30 31

Signed-off-by: J William Piggott <elseifthen@gmx.com>
This commit is contained in:
J William Piggott 2018-01-17 21:21:02 -05:00 committed by Karel Zak
parent af1bc027db
commit 1dca3edc36
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
misc-utils/cal.c
View File

@ -924,14 +924,15 @@ static int day_in_week(const struct cal_control *ctl, int day,
|| (year == ctl->reform_year && REFORMATION_MONTH < month)
|| (year == ctl->reform_year
&& month == REFORMATION_MONTH && 13 < day)) {
int64_t long_year = year;
return (long_year + (year / 4) - (year / 100) + (year / 400) +
reform[month - 1] + day) % DAYS_IN_WEEK;
return ((int64_t) year + (year / 4)
- (year / 100) + (year / 400)
+ reform[month - 1] + day) % DAYS_IN_WEEK;
}
if (year < ctl->reform_year
|| (year == ctl->reform_year && month < REFORMATION_MONTH)
|| (year == ctl->reform_year && month == REFORMATION_MONTH && day < 3))
return (year + year / 4 + old[month - 1] + day) % DAYS_IN_WEEK;
return ((int64_t) year + year / 4 + old[month - 1] + day)
% DAYS_IN_WEEK;
return NONEDAY;
}