[Remind-Fans] Remind 03.01.03 SATISFY-related bug [Was: wyrd parse error]

[David F. Skoll]

Paul Pelzl wrote:

> When I use the same command with 03.01.03, I see
> "/home/paul/bug2.rem(3): Parse error" printed numerous times on stderr,

Ah, found it!  The minimal bad input file I could come up with was this:

#==========================================
OMIT 22 November
REM 22 November SKIP SATISFY [1] MSG foo
#==========================================

and the proper patch is below.

Regards,

David.

diff --git a/src/trigger.c b/src/trigger.c
index ecf606b..f8a3c45 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -419,6 +419,14 @@ int ComputeTrigger(int today, Trigger *trig, int *err)
 	    }
 	    return -1;
 	}
+
+	if (trig->skip == SKIP_SKIP &&
+	    IsOmitted(result, trig->localomit) &&
+	    nextstart <= start &&
+	    result >= start) {
+	    nextstart = result + 1;
+	}
+
 	/* Keep scanning... unless there's no point in doing it.*/
 	if (nextstart <= start) {
 	    if (result != -1) {