X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fdirplex%2Fconf.c;h=9ae4ca702f67fcd00bc09eb3b89634e21f9b374e;hb=539c7b9f70c856a6451685e405b3a6c870d34ee4;hp=84c035d204957e10e4d8650d3042760783c376c4;hpb=edcd094e7e9c1f018f0664f78cf7d6c625e1f476;p=ashd.git

diff --git a/src/dirplex/conf.c b/src/dirplex/conf.c
index 84c035d..9ae4ca7 100644
--- 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);
@@ -251,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);
@@ -262,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 {
@@ -371,7 +389,7 @@ 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, *ln;
@@ -396,9 +414,7 @@ struct pattern *findmatch(char *file, int trydefault, int dir)
 		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) {
@@ -429,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);
 }