) {
char newfilter[SIZ];
int a = 0;
- int len = snprintf(newfilter, SIZ, &el[23]); // strip off "urn:ietf:params:xml:ns:caldav:" for our purposes
+ int len = snprintf(newfilter, SIZ, &el[30]); // strip off "urn:ietf:params:xml:ns:caldav:" for our purposes
while (attr[a]) {
len += snprintf(&newfilter[len], SIZ-len, "|%s", attr[a++]); // now save the attributes
}
array_append(crp->filters, newfilter);
- syslog(LOG_DEBUG, "%s", newfilter);
}
}
// Returns 1 if the calendar item DOES match the filter.
int caldav_apply_one_filter(void *cal, char *filter) {
syslog(LOG_DEBUG, "applying filter: %s", filter);
+
+ char this_filter[SIZ]; // we have to copy the filter string because we will destructively tokenize it
+ safestrncpy(this_filter, filter, sizeof(this_filter));
+
+ char *t[10] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } ;
+ char *f = this_filter;
+ int num_tokens = 0;
+ while ( (t[num_tokens]=strtok_r(f, "|", &f)) && (num_tokens<10) ) {
+ ++num_tokens;
+ }
+
return(1);
}