Merge branch 'master' into timeheap

[ashd.git] / src / dirplex / conf.c

diff --git a/src/dirplex/conf.c b/src/dirplex/conf.c
index e2b1481..9ae4ca7 100644 (file)
--- a/src/dirplex/conf.c
+++ b/src/dirplex/conf.c
@@ -86,6 +86,8 @@ static void freeconfig(struct config *cf)
     freeca(cf->index);
     if(cf->capture != NULL)
        free(cf->capture);
+    if(cf->reparse != NULL)
+       free(cf->reparse);
     free(cf);
 }
 
@@ -150,6 +152,10 @@ static struct pattern *parsepattern(struct cfstate *s)
     
     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);
@@ -185,13 +191,16 @@ static struct pattern *parsepattern(struct cfstate *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")) {
+       } 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 `set' directive", s->file, s->lno);
+               flog(LOG_WARNING, "%s:%i: missing header name or pattern for `%s' directive", s->file, s->lno, s->argv[0]);
                continue;
            }
            omalloc(head);
-           head->name = sstrdup(s->argv[1]);
+           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;
@@ -248,9 +257,7 @@ struct config *readconfig(char *file)
            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);
@@ -259,6 +266,20 @@ struct config *readconfig(char *file)
            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], "reparse")) {
+           if(s->argc < 2) {
+               flog(LOG_WARNING, "%s:%i: missing argument to reparse declaration", s->file, s->lno);
+               continue;
+           }
+           if(cf->reparse != NULL)
+               free(cf->reparse);
+           cf->reparse = sstrdup(s->argv[1]);
+           cf->parsecomb = 0;
+           if((s->argc > 2) && strchr(s->argv[2], 'c'))
+               cf->parsecomb = 1;
        } else if(!strcmp(s->argv[0], "eof")) {
            break;
        } else {
@@ -326,6 +347,8 @@ struct config **getconfigs(char *file)
     if(ret != NULL)
        free(ret);
     bufinit(buf);
+    if(!strncmp(file, "./", 2))
+       file += 2;
     tmp = sstrdup(file);
     while(1) {
        if((p = strrchr(tmp, '/')) == NULL)
@@ -366,10 +389,10 @@ struct child *findchild(char *file, char *name, struct config **cf)
     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;
@@ -381,10 +404,17 @@ struct pattern *findmatch(char *file, int trydefault, int dir)
        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) {
@@ -396,7 +426,7 @@ struct pattern *findmatch(char *file, int trydefault, int dir)
                        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)
@@ -406,10 +436,7 @@ struct pattern *findmatch(char *file, int trydefault, int dir)
                    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;
                }
            }
@@ -418,7 +445,7 @@ struct pattern *findmatch(char *file, int trydefault, int dir)
        }
     }
     if(!trydefault)
-       return(findmatch(file, 1, dir));
+       return(findmatch(file, 1, type));
     return(NULL);
 }