Add ADDMOMIT keyword; bump version to 03.03.10

src/dorem.c

@@ -141,6 +141,14 @@ int DoRem(ParsePtr p)
 	}
     }
 
+    /* Add to global OMITs if so indicated */
+    if (trig.addomit) {
+        r = AddGlobalOmit(jul);
+        if (r) {
+	    FreeTrig(&trig);
+            return r;
+        }
+    }
     if (PurgeMode) {
 	if (trig.expired || jul < JulianToday) {
 	    if (p->expr_happened) {
@@ -211,6 +219,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
     trig->localomit = NO_WD;
     trig->skip = NO_SKIP;
     trig->once = NO_ONCE;
+    trig->addomit = 0;
     trig->typ = NO_TYPE;
     trig->scanfrom = NO_DATE;
     trig->from = NO_DATE;
@@ -280,6 +289,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    break;
 
         case T_MaybeUncomputable:
+	    DBufFree(&buf);
             trig->maybe_uncomputable = 1;
             break;
 
@@ -374,6 +384,11 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    trig->once = ONCE_ONCE;
 	    break;
 
+        case T_AddOmit:
+	    DBufFree(&buf);
+            trig->addomit = 1;
+            break;
+
 	case T_Omit:
 	    DBufFree(&buf);
 	    if (trig->omitfunc[0]) {

src/omit.c

@@ -370,20 +370,30 @@ int DoOmit(ParsePtr p)
 	    NumPartialOmits++;
 	}
     } else {
-	if (NumFullOmits == MAX_FULL_OMITS) return E_2MANY_FULL;
 
 	if (d > DaysInMonth(m, y)) return E_BAD_DATE;
 	syndrome = Julian(y, m, d);
-	if (!BexistsIntArray(FullOmitArray, NumFullOmits, syndrome)) {
-	    InsertIntoSortedArray(FullOmitArray, NumFullOmits, syndrome);
-	    NumFullOmits++;
-	}
+        r = AddGlobalOmit(syndrome);
+        if (r) {
+            return r;
+        }
     }
     if (tok.type == T_Tag || tok.type == T_Duration || tok.type == T_RemType || tok.type == T_Priority) return E_PARSE_AS_REM;
     return OK;
 
 }
 
+int
+AddGlobalOmit(int jul)
+{
+    if (NumFullOmits == MAX_FULL_OMITS) return E_2MANY_FULL;
+    if (!BexistsIntArray(FullOmitArray, NumFullOmits, jul)) {
+        InsertIntoSortedArray(FullOmitArray, NumFullOmits, jul);
+        NumFullOmits++;
+    }
+    return OK;
+}
+
 static int
 DoThroughOmit(ParsePtr p, int ystart, int mstart, int dstart)
 {

src/protos.h

@@ -163,3 +163,4 @@ void PrintJSONKeyPairDateTime(char const *name, int dt);
 void PrintJSONKeyPairTime(char const *name, int t);
 void System(char const *cmd);
 int ShellEscape(char const *in, DynamicBuffer *out);
+int AddGlobalOmit(int jul);

src/token.c

@@ -37,7 +37,7 @@ while (isdigit(*(string))) { \
    Keep this array sorted, or software will not work. */
 Token TokArray[] = {
     /* NAME          MINLEN      TYPE           VALUE */
-
+    { "addomit",        7,      T_AddOmit,      0 },
     { "after",		3,	T_Skip,	AFTER_SKIP },
     { "april",		3,	T_Month,	3 },
     { "at",		2,	T_At,		0 },

src/types.h

@@ -74,6 +74,7 @@ typedef struct {
     int eventstart;              /* Original event start (datetime) */
     int eventduration;           /* Original event duration (minutes) */
     int maybe_uncomputable;      /* Suppress "can't compute trigger" warnings */
+    int addomit;                 /* Add trigger date to global OMITs */
     char sched[VAR_NAME_LEN+1];  /* Scheduling function */
     char warn[VAR_NAME_LEN+1];   /* Warning function    */
     char omitfunc[VAR_NAME_LEN+1]; /* OMITFUNC function */
@@ -153,6 +154,7 @@ enum TokTypes
   T_Rem, T_Push, T_Pop, T_Preserve, T_Include, T_IncludeCmd, T_If, T_Else, T_EndIf,
   T_IfTrig, T_ErrMsg,
   T_Set, T_UnSet, T_Fset, T_Omit, T_Banner, T_Exit,
+  T_AddOmit,
   T_WkDay,
   T_Month, T_Time, T_Date, T_DateTime,
   T_Skip, T_At, T_RemType, T_Until, T_Year, T_Day, T_Rep, T_Delta, T_Back,