felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-17 23:08:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug that didn't save trigger date for a fully-specified REM in the past.

Browse Source
This commit is contained in:
Dianne Skoll
2025-06-30 19:23:45 -04:00
parent 4fd62f9894
commit 0f83b98698
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.c
View File

@@ -1994,9 +1994,11 @@ SaveAllTriggerInfo(Trigger const *t, TimeTrig const *tt, int trigdate, int trigt
{ {
SaveLastTrigger(t); SaveLastTrigger(t);
SaveLastTimeTrig(tt); SaveLastTimeTrig(tt);
LastTriggerDate = trigdate; if (trigdate != -1) {
LastTriggerDate = trigdate;
LastTrigValid = valid;
}
LastTriggerTime = trigtime; LastTriggerTime = trigtime;
LastTrigValid = valid;
} }
void void

2
src/trigger.c
View File

@@ -541,6 +541,7 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
trig->expired = 0; trig->expired = 0;
if (save_in_globals) { if (save_in_globals) {
LastTrigValid = 0; LastTrigValid = 0;
LastTriggerDate = -1;
} }
/* Assume everything works */ /* Assume everything works */
@@ -579,7 +580,6 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
while (nattempts++ < TRIG_ATTEMPTS) { while (nattempts++ < TRIG_ATTEMPTS) {
result = GetNextTriggerDate(trig, start, err, &nextstart); result = GetNextTriggerDate(trig, start, err, &nextstart);
/* If there's an error, die immediately */ /* If there's an error, die immediately */
if (*err) return -1; if (*err) return -1;
if (result == -1) { if (result == -1) {

1
tests/test.cmp
View File

@@ -16577,6 +16577,7 @@ Base: 1991-02-09
Base: 1991-02-09 Base: 1991-02-09
../tests/test.rem(1611): Expired ../tests/test.rem(1611): Expired
../tests/test.rem(1612): Expired ../tests/test.rem(1612): Expired
trigvalid = 1; trigdate = 1991-01-14
Variable hash table statistics: Variable hash table statistics:
Entries: 100143; Buckets: 87719; Non-empty Buckets: 66301 Entries: 100143; Buckets: 87719; Non-empty Buckets: 66301
Maxlen: 5; Minlen: 0; Avglen: 1.142; Stddev: 0.878; Avg nonempty len: 1.510 Maxlen: 5; Minlen: 0; Avglen: 1.142; Stddev: 0.878; Avg nonempty len: 1.510

7
tests/test.rem
View File

@@ -1612,6 +1612,13 @@ REM SECOND SATURDAY +300 UNTIL 1991-02-02 MSG [$T]
REM SECOND SATURDAY +300 UNTIL 1991-02-16 MSG [$T] REM SECOND SATURDAY +300 UNTIL 1991-02-16 MSG [$T]
DEBUG -t DEBUG -t
# Fully-specified trigger date in the past
REM 14 Jan 1991 MSG In the past
set a trigvalid()
set b trigdate()
REM MSG trigvalid = [a]; trigdate = [b]
# Output expression-node stats # Output expression-node stats
DEBUG +h DEBUG +h