X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fdirplex%2Fconf.c;h=76624a7644a3e050be3734b8061c350ba8a601e3;hb=257cd4a2bfad06198e9b0fb0e01476e1f65eff24;hp=3f9f9e88529650ae7baa167803da37a4028edc81;hpb=8cc893f5a55ad27a6971524b41e99589576eade5;p=ashd.git

diff --git a/src/dirplex/conf.c b/src/dirplex/conf.c
index 3f9f9e8..76624a7 100644
--- a/src/dirplex/conf.c
+++ b/src/dirplex/conf.c
@@ -150,6 +150,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);
@@ -262,6 +266,9 @@ 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], "eof")) {
 	    break;
 	} else {
@@ -329,6 +336,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)
@@ -369,10 +378,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;
@@ -384,10 +393,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) {
@@ -399,7 +415,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)
@@ -409,10 +425,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;
 		}
 	    }
@@ -421,7 +434,7 @@ struct pattern *findmatch(char *file, int trydefault, int dir)
 	}
     }
     if(!trydefault)
-	return(findmatch(file, 1, dir));
+	return(findmatch(file, 1, type));
     return(NULL);
 }