static void freepattern(struct pattern *pat)
{
struct rule **rule;
+ struct headmod *head;
for(rule = pat->rules; *rule; rule++)
freerule(*rule);
+ while((head = pat->headers) != NULL) {
+ pat->headers = head->next;
+ free(head->name);
+ free(head->value);
+ free(head);
+ }
if(pat->childnm != NULL)
free(pat->childnm);
freeca(pat->fchild);
{
struct pattern *pat;
struct rule *rule;
+ struct headmod *head;
int sl;
if(!strcmp(s->argv[0], "match")) {
if((s->argc > 1) && !strcmp(s->argv[1], "directory"))
pat->type = PT_DIR;
+ else if((s->argc > 1) && !strcmp(s->argv[1], "notfound"))
+ pat->type = PT_NOTFOUND;
+ else
+ pat->type = PT_FILE;
sl = s->lno;
while(1) {
getcfline(s);
pat->childnm = sstrdup(s->argv[1]);
} else if(!strcmp(s->argv[0], "fork")) {
pat->fchild = cadup(s->argv + 1);
+ } else if(!strcmp(s->argv[0], "set") || !strcmp(s->argv[0], "xset")) {
+ if(s->argc < 3) {
+ flog(LOG_WARNING, "%s:%i: missing header name or pattern for `%s' directive", s->file, s->lno, s->argv[0]);
+ continue;
+ }
+ omalloc(head);
+ if(!strcmp(s->argv[0], "xset"))
+ head->name = sprintf2("X-Ash-%s", s->argv[1]);
+ else
+ head->name = sstrdup(s->argv[1]);
+ head->value = sstrdup(s->argv[2]);
+ head->next = pat->headers;
+ pat->headers = head;
} else if(!strcmp(s->argv[0], "end") || !strcmp(s->argv[0], "eof")) {
break;
} else {
cf->patterns = pat;
} else if(!strcmp(s->argv[0], "index-file")) {
freeca(cf->index);
- cf->index = NULL;
- if(s->argc > 1)
- cf->index = cadup(s->argv + 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);
if(cf->capture != NULL)
free(cf->capture);
cf->capture = sstrdup(s->argv[1]);
+ cf->caproot = 0;
+ if((s->argc > 2) && strchr(s->argv[2], 'D'))
+ cf->caproot = 1;
} else if(!strcmp(s->argv[0], "eof")) {
break;
} else {
if(ret != NULL)
free(ret);
bufinit(buf);
+ if(!strncmp(file, "./", 2))
+ file += 2;
tmp = sstrdup(file);
while(1) {
if((p = strrchr(tmp, '/')) == NULL)
return(NULL);
}
-struct pattern *findmatch(char *file, int trydefault, int dir)
+struct pattern *findmatch(char *file, int trydefault, int type)
{
int i, o, c;
- char *bn;
+ char *bn, *ln;
struct config **cfs;
struct pattern *pat;
struct rule *rule;
bn = file;
cfs = getconfigs(file);
for(c = 0; cfs[c] != NULL; c++) {
+ if(cfs[c]->path == NULL) {
+ ln = file;
+ } else {
+ pl = strlen(cfs[c]->path);
+ if((strlen(file) > pl) && !strncmp(file, cfs[c]->path, pl) && (file[pl] == '/'))
+ ln = file + pl + 1;
+ else
+ ln = file; /* This should only happen in the base directory. */
+ }
for(pat = cfs[c]->patterns; pat != NULL; pat = pat->next) {
- if(!dir && (pat->type == PT_DIR))
- continue;
- if(dir && (pat->type != PT_DIR))
+ if(pat->type != type)
continue;
for(i = 0; (rule = pat->rules[i]) != NULL; i++) {
if(rule->type == PAT_BASENAME) {
break;
} else if(rule->type == PAT_PATHNAME) {
for(o = 0; rule->patterns[o] != NULL; o++) {
- if(!fnmatch(rule->patterns[o], file, FNM_PATHNAME))
+ if(!fnmatch(rule->patterns[o], ln, FNM_PATHNAME))
break;
}
if(rule->patterns[o] == NULL)
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, '/')))
+ if(strchr(ln, '/'))
break;
}
}
}
}
if(!trydefault)
- return(findmatch(file, 1, dir));
+ return(findmatch(file, 1, type));
return(NULL);
}