freepattern(pat);
}
freeca(cf->index);
+ if(cf->capture != NULL)
+ free(cf->capture);
free(cf);
}
newrule(pat)->type = PAT_ALL;
} else if(!strcmp(s->argv[0], "default")) {
newrule(pat)->type = PAT_DEFAULT;
+ } else if(!strcmp(s->argv[0], "local")) {
+ newrule(pat)->type = PAT_LOCAL;
} else if(!strcmp(s->argv[0], "handler")) {
if(s->argc < 2) {
flog(LOG_WARNING, "%s:%i: missing child name for `handler' directive", s->file, s->lno);
cf->index = NULL;
if(s->argc > 1)
cf->index = cadup(s->argv + 1);
+ } else if(!strcmp(s->argv[0], "capture")) {
+ if(s->argc < 2) {
+ flog(LOG_WARNING, "%s:%i: missing argument to capture declaration", s->file, s->lno);
+ continue;
+ }
+ if(cf->capture != NULL)
+ free(cf->capture);
+ cf->capture = sstrdup(s->argv[1]);
} else if(!strcmp(s->argv[0], "eof")) {
break;
} else {
return(ret = buf.b);
}
-struct child *findchild(char *file, char *name)
+struct child *findchild(char *file, char *name, struct config **cf)
{
int i;
struct config **cfs;
cfs = getconfigs(file);
for(i = 0; cfs[i] != NULL; i++) {
- if((ch = getchild(cfs[i], name)) != NULL)
- break;
+ if((ch = getchild(cfs[i], name)) != NULL) {
+ if(cf != NULL)
+ *cf = cfs[i];
+ return(ch);
+ }
}
- return(ch);
+ return(NULL);
}
struct pattern *findmatch(char *file, int trydefault, int dir)
struct config **cfs;
struct pattern *pat;
struct rule *rule;
+ size_t pl;
if((bn = strrchr(file, '/')) != NULL)
bn++;
} else if(rule->type == PAT_DEFAULT) {
if(!trydefault)
break;
+ } else if(rule->type == PAT_LOCAL) {
+ if(cfs[c]->path == NULL)
+ break;
+ pl = strlen(cfs[c]->path);
+ if(!((strlen(file) > pl) && !strncmp(file, cfs[c]->path, pl) && (file[pl] == '/') && !strchr(file + pl + 1, '/')))
+ break;
}
}
if(!rule)