summaryrefslogtreecommitdiffstats
path: root/misc-utils/cal.c
diff options
context:
space:
mode:
authorSami Kerola2015-08-27 15:21:29 +0200
committerKarel Zak2015-08-31 10:15:12 +0200
commit03f8bc1f327b21d4a5311733f175ceabda5f3f2d (patch)
treed4235c77dbf21b5de3fa3f3797dbabec50b2b814 /misc-utils/cal.c
parentcal: replace magic constants with symbolical values (diff)
downloadkernel-qcow2-util-linux-03f8bc1f327b21d4a5311733f175ceabda5f3f2d.tar.gz
kernel-qcow2-util-linux-03f8bc1f327b21d4a5311733f175ceabda5f3f2d.tar.xz
kernel-qcow2-util-linux-03f8bc1f327b21d4a5311733f175ceabda5f3f2d.zip
cal: check biggest week number correctly when highlighting
This allows Sunday based week 54 be highlighted, and deny week 54 for Monday based weeks when year has only 52 weeks. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'misc-utils/cal.c')
-rw-r--r--misc-utils/cal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index dd26532b6..6faac5ca2 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -484,7 +484,7 @@ int main(int argc, char **argv)
ctl.req.year, ctl.req.week);
while (m <= DECEMBER && yday > days_in_month[leap][m])
yday -= days_in_month[leap][m++];
- if (m > DECEMBER) {
+ if (DECEMBER < m && ctl.weektype & WEEK_NUM_ISO) {
/* In some years (e.g. 2010 in ISO mode) it's possible
* to have a remnant of week 53 starting the year yet
* the year in question ends during 52, in this case