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,9 +1,10 @@
 #include "cgit.h"
+#include "configfile.h"
 #include "html.h"
 
 #define MAX_PATH 4096
 
 /* return 1 if path contains a objects/ directory and a HEAD file */
 static int is_git_dir(const char *path)
 {
 	struct stat st;
@@ -30,19 +31,26 @@ static int is_git_dir(const char *path)
 		return 0;
 	}
 	if (!S_ISREG(st.st_mode))
 		return 0;
 
 	return 1;
 }
 
-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 stat st;
 	struct passwd *pwd;
 	char *p;
 	size_t size;
 
 	if (stat(path, &st)) {
 		fprintf(stderr, "Error accessing %s: %s (%d)\n",
 			path, strerror(errno), errno);
@@ -71,27 +79,37 @@ static void add_repo(const char *base, const char *path)
 
 	p = fmt("%s/description", path);
 	if (!stat(p, &st))
 		readfile(p, &repo->desc, &size);
 
 	p = fmt("%s/README.html", 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;
 	struct dirent *ent;
 	char *buf;
 	struct stat st;
 
 	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;
 	}
 	dir = opendir(path);
 	if (!dir) {
 		fprintf(stderr, "Error opening directory %s: %s (%d)\n",
 			path, strerror(errno), errno);
 		return;
 	}
@@ -111,18 +129,18 @@ static void scan_path(const char *base, const char *path)
 		sprintf(buf, "%s/%s", path, ent->d_name);
 		if (stat(buf, &st)) {
 			fprintf(stderr, "Error checking path %s: %s (%d)\n",
 				buf, strerror(errno), errno);
 			free(buf);
 			continue;
 		}
 		if (S_ISDIR(st.st_mode))
-			scan_path(base, buf);
+			scan_path(base, buf, fn);
 		free(buf);
 	}
 	closedir(dir);
 }
 
-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);
 }