Merge branch 'lh/repo-scan'

1 files changed, 25 insertions, 7 deletions

diff --git a/scan-tree.c b/scan-tree.c
index 4da21a4..dbca797 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,2 +1,3 @@
 #include "cgit.h"
+#include "configfile.h"
 #include "html.h"
@@ -37,5 +38,12 @@ static int is_git_dir(const char *path)
 
-static void add_repo(const char *base, const char *path)
+struct cgit_repo *repo;
+repo_config_fn config_fn;
+
+static void repo_config(const char *name, const char *value)
+{
+	config_fn(repo, name, value);
+}
+
+static void add_repo(const char *base, const char *path, repo_config_fn fn)
 {
-	struct cgit_repo *repo;
 	struct stat st;
@@ -78,5 +86,11 @@ static void add_repo(const char *base, const char *path)
 		repo->readme = "README.html";
+
+	p = fmt("%s/cgitrc", path);
+	if (!stat(p, &st)) {
+		config_fn = fn;
+		parse_configfile(xstrdup(p), &repo_config);
+	}
 }
 
-static void scan_path(const char *base, const char *path)
+static void scan_path(const char *base, const char *path, repo_config_fn fn)
 {
@@ -88,3 +102,7 @@ static void scan_path(const char *base, const char *path)
 	if (is_git_dir(path)) {
-		add_repo(base, path);
+		add_repo(base, path, fn);
+		return;
+	}
+	if (is_git_dir(fmt("%s/.git", path))) {
+		add_repo(base, fmt("%s/.git", path), fn);
 		return;
@@ -118,3 +136,3 @@ static void scan_path(const char *base, const char *path)
 		if (S_ISDIR(st.st_mode))
-			scan_path(base, buf);
+			scan_path(base, buf, fn);
 		free(buf);
@@ -124,5 +142,5 @@ static void scan_path(const char *base, const char *path)
 
-void scan_tree(const char *path)
+void scan_tree(const char *path, repo_config_fn fn)
 {
-	scan_path(path, path);
+	scan_path(path, path, fn);
 }