Change behaviour: OMITFUNC ignores local/global OMIT context. Only sane

way to solve garbage-day problem; also allows for more flexibility.
This commit is contained in:
David F. Skoll
2008-08-31 10:29:28 -04:00
parent 6845e72fd5
commit a67d9e2524
5 changed files with 63 additions and 30 deletions
+7
View File
@@ -258,6 +258,10 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
case T_Omit:
DBufFree(&buf);
if (trig->omitfunc[0]) {
Eprint("Warning: OMIT is ignored if you use OMITFUNC");
}
r = ParseLocalOmit(s, trig);
if (r) return r;
break;
@@ -268,6 +272,9 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
return OK;
case T_OmitFunc:
if (trig->localomit) {
Eprint("Warning: OMIT is ignored if you use OMITFUNC");
}
r=ParseToken(s, &buf);
if (r) return r;
StrnCpy(trig->omitfunc, DBufValue(&buf), VAR_NAME_LEN);