1 files changed, 22 insertions, 8 deletions

diff --git a/scan-tree.c b/scan-tree.c
index 67f4550..dbca797 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,3 +1,4 @@
 #include "cgit.h"
+#include "configfile.h"
 #include "html.h"
 
@@ -36,7 +37,14 @@ 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;
         struct passwd *pwd;
@@ -77,7 +85,13 @@ static void add_repo(const char *base, const char *path)
         if (!stat(p, &st))
                 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)
 {
         DIR *dir;
@@ -87,9 +101,9 @@ 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));
+                add_repo(base, fmt("%s/.git", path), fn);
                 return;
         }
@@ -121,5 +135,5 @@ 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);
         }
@@ -127,6 +141,6 @@ 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);
 }