From 8dce6d19a5b9c10a15bb9f18e3885d74da075611 Mon Sep 17 00:00:00 2001
From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 25 Aug 2010 00:56:06 +0200
Subject: [PATCH] Made config lookup in dirplex much nicer.

---
 src/dirplex.c | 78 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/dirplex.c b/src/dirplex.c
index 699819f..0472159 100644
--- a/src/dirplex.c
+++ b/src/dirplex.c
@@ -261,36 +261,53 @@ static struct config *getconfig(char *path)
     return(cf);
 }
 
-static struct child *findchild(char *file, char *name)
+static struct config **getconfigs(char *file)
 {
-    char *buf, *p;
+    static struct config **ret = NULL;
+    struct {
+	struct config **b;
+	size_t s, d;
+    } buf;
     struct config *cf;
-    struct child *ch;
-
-    buf = sstrdup(file);
+    char *tmp, *p;
+    
+    if(ret != NULL)
+	free(ret);
+    bufinit(buf);
+    tmp = sstrdup(file);
     while(1) {
-	ch = NULL;
-	if(!strcmp(buf, "."))
+	if((p = strrchr(tmp, '/')) == NULL)
 	    break;
-	if((p = strrchr(buf, '/')) != NULL)
-	    *p = 0;
-	else
-	    strcpy(buf, ".");
-	cf = getconfig(buf);
-	if(cf == NULL)
-	    continue;
-	if((ch = getchild(cf, name)) != NULL)
+	*p = 0;
+	if((cf = getconfig(tmp)) != NULL)
+	    bufadd(buf, cf);
+    }
+    free(tmp);
+    if((cf = getconfig(".")) != NULL)
+	bufadd(buf, cf);
+    bufadd(buf, NULL);
+    return(ret = buf.b);
+}
+
+static struct child *findchild(char *file, char *name)
+{
+    int i;
+    struct config **cfs;
+    struct child *ch;
+    
+    cfs = getconfigs(file);
+    for(i = 0; cfs[i] != NULL; i++) {
+	if((ch = getchild(cfs[i], name)) != NULL)
 	    break;
     }
-    free(buf);
     return(ch);
 }
 
 static struct pattern *findmatch(char *file, int trydefault)
 {
-    int i;
-    char *buf, *p, *bn;
-    struct config *cf;
+    int i, c;
+    char *bn;
+    struct config **cfs;
     struct pattern *pat;
     struct rule *rule;
     
@@ -298,19 +315,9 @@ static struct pattern *findmatch(char *file, int trydefault)
 	bn++;
     else
 	bn = file;
-    buf = sstrdup(file);
-    while(1) {
-	pat = NULL;
-	if(!strcmp(buf, "."))
-	    break;
-	if((p = strrchr(buf, '/')) != NULL)
-	    *p = 0;
-	else
-	    strcpy(buf, ".");
-	cf = getconfig(buf);
-	if(cf == NULL)
-	    continue;
-	for(pat = cf->patterns; pat != NULL; pat = pat->next) {
+    cfs = getconfigs(file);
+    for(c = 0; cfs[c] != NULL; c++) {
+	for(pat = cfs[c]->patterns; pat != NULL; pat = pat->next) {
 	    for(i = 0; (rule = pat->rules[i]) != NULL; i++) {
 		if(rule->type == PAT_BASENAME) {
 		    if(fnmatch(rule->pattern, bn, 0))
@@ -325,13 +332,10 @@ static struct pattern *findmatch(char *file, int trydefault)
 		}
 	    }
 	    if(!rule)
-		goto out;
+		return(pat);
 	}
     }
-
-out:
-    free(buf);
-    return(pat);
+    return(NULL);
 }
 
 static void handlefile(struct hthead *req, int fd, char *path)
-- 
2.11.0