d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix calculation of the recurring weekdays

Browse Source 
Both the result of the first_dayofweek_of_year and the target
weekday are zero-based (0 fo sunday) while the target month-day
or year-day is 1-based. Adjust logic accordingly.

Also add testcase for this PR to the kyua test suite

PR:		201062
Submitted by:	Richard Narron <comet.berkeley@gmail.com>
MFC after:	1 week
This commit is contained in:
gonzo 2020-04-03 01:17:43 +00:00
parent 471c4e6b0b
commit a5bee545b3
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/calendar/parsedata.c
View File

@ -578,7 +578,9 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
/* Every dayofweek of the year */
if (lflags == (F_DAYOFWEEK | F_VARIABLE)) {
dow = first_dayofweek_of_year(year);
d = (idayofweek - dow + 8) % 7;
if (dow < 0)
continue;
d = (idayofweek - dow + 7) % 7 + 1;
while (d <= 366) {
if (remember_yd(year, d, &rm, &rd))
remember(&remindex,
@ -616,7 +618,9 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
(F_MONTH | F_DAYOFWEEK | F_MODIFIERINDEX | F_VARIABLE)) {
offset = indextooffset(modifierindex);
dow = first_dayofweek_of_month(year, imonth);
d = (idayofweek - dow + 8) % 7;
if (dow < 0)
continue;
d = (idayofweek - dow + 7) % 7 + 1;
if (offset > 0) {
while (d <= yearinfo->monthdays[imonth]) {
@ -650,7 +654,9 @@ parsedaymonth(char *date, int *yearp, int *monthp, int *dayp, int *flags,
/* Every dayofweek of the month */
if (lflags == (F_DAYOFWEEK | F_MONTH | F_VARIABLE)) {
dow = first_dayofweek_of_month(year, imonth);
d = (idayofweek - dow + 8) % 7;
if (dow < 0)
continue;
d = (idayofweek - dow + 7) % 7 + 1;
while (d <= yearinfo->monthdays[imonth]) {
if (remember_ymd(year, imonth, d))
remember(&remindex,

1
usr.bin/calendar/tests/calendar.calibrate
View File

@ -188,6 +188,7 @@ LANG=C
06/28 jun 28
06/29 jun 29
06/30 jun 30
06/SunThird sunthird
07/01 jul 1
07/02 jul 2
07/03 jul 3

3
usr.bin/calendar/tests/regress.s5.out Normal file
View File

@ -0,0 +1,3 @@
Jun 21* sunthird
Jun 21 jun 21
Jun 22 jun 22

3
usr.bin/calendar/tests/regress.sh
View File

@ -7,12 +7,13 @@ CALENDAR="${CALENDAR_BIN} ${CALENDAR_FILE}"
REGRESSION_START($1)
echo 1..28
echo 1..29
REGRESSION_TEST(`s1',`$CALENDAR -t 29.12.2006')
REGRESSION_TEST(`s2',`$CALENDAR -t 30.12.2006')
REGRESSION_TEST(`s3',`$CALENDAR -t 31.12.2006')
REGRESSION_TEST(`s4',`$CALENDAR -t 01.01.2007')
REGRESSION_TEST(`s5',`$CALENDAR -t 21.06.2015')
REGRESSION_TEST(`a1',`$CALENDAR -A 3 -t 28.12.2006')
REGRESSION_TEST(`a2',`$CALENDAR -A 3 -t 29.12.2006')