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

Don't loop forever if a reminder moves backwards because of a time zone difference.

Browse Source 
If we are not making progress, it's because the reminder has expired.
This commit is contained in:
Dianne Skoll
2025-09-19 13:18:53 -04:00
parent 131e77fa18
commit af69f8779d
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/trigger.c
View File

@@ -554,6 +554,7 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig const *tim
y, m, d, omit, y, m, d, omit,
result; result;
int save_nextstart = 0;
trig->expired = 0; trig->expired = 0;
if (save_in_globals) { if (save_in_globals) {
LastTrigValid = 0; LastTrigValid = 0;
@@ -617,14 +618,24 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig const *tim
/** FIXME: If a timed reminder moves to yesterday because of a time /** FIXME: If a timed reminder moves to yesterday because of a time
zone adjustment, try again! */ zone adjustment, try again! */
if (trig->tz) { if (trig->tz) {
TimeTrig copy = *tim; TimeTrig copy = *tim;
int new_result; int new_result;
ExitTimezone(trig->tz); ExitTimezone(trig->tz);
new_result = AdjustTriggerForTimeZone(trig, result, &copy); new_result = AdjustTriggerForTimeZone(trig, result, &copy);
EnterTimezone(trig->tz); EnterTimezone(trig->tz);
if (new_result + duration_days < today) { if (result + duration_days >= today &&
new_result + duration_days < today) {
/* If we are not making progress, then give up: It's expired */
if (nextstart <= save_nextstart) {
trig->expired = 1;
if (DebugFlag & DB_PRTTRIG) {
fprintf(ErrFp, "%s(%s): %s\n",
GetCurrentFilename(), line_range(LineNoStart, LineNo), GetErr(E_EXPIRED));
}
return -1;
}
save_nextstart = nextstart;
nextstart = start+1; nextstart = start+1;
start = nextstart; start = nextstart;
continue; continue;

3
tests/test-timezone-support
View File

@@ -161,6 +161,9 @@ debug -t
EOF EOF
TZ=America/Toronto $REMIND -s - 2025-09-01@00:00 <<'EOF' >> $OUT 2>&1
REM 2025-09-24 AT 09:00 TZ America/Denver MSG Dr. Smith
EOF
cmp -s $OUT $CMP cmp -s $OUT $CMP
if [ "$?" = "0" ] ; then if [ "$?" = "0" ] ; then
echo "Remind: Time zone test PASSED" echo "Remind: Time zone test PASSED"

1
tests/tz.cmp
View File

@@ -78,3 +78,4 @@ trig("Mon at 00:00 TZ Australia/Sydney", "Tue at 00:00 TZ America/Toronto", "Wed
-stdin-(14:21): Trig(tz_adj Australia/Sydney) = Saturday, 6 September, 2025 AT 10:00 -stdin-(14:21): Trig(tz_adj Australia/Sydney) = Saturday, 6 September, 2025 AT 10:00
-stdin-(14:21): Trig = Monday, 1 September, 2025 AT 14:42 -stdin-(14:21): Trig = Monday, 1 September, 2025 AT 14:42
2025-09-01 2025-09-01
2025/09/24 * * * 660 11:00am Dr. Smith