5 files changed, 39 insertions, 13 deletions

diff --git a/cgit.c b/cgit.cindex 90ae124..e281aa9 100644--- a/cgit.c+++ b/cgit.c@@ -168,7 +168,7 @@ void config_cb(const char *name, const char *value) 		if (!ctx.cfg.nocache && ctx.cfg.cache_size) 			process_cached_repolist(value); 		else-			scan_tree(value);+			scan_tree(value, repo_config); 	else if (!strcmp(name, "source-filter")) 		ctx.cfg.source_filter = new_filter(value, 1); 	else if (!strcmp(name, "summary-log"))@@ -476,7 +476,7 @@ static int generate_cached_repolist(const char *path, const char *cached_rc) 		return errno; 	} 	idx = cgit_repolist.count;-	scan_tree(path);+	scan_tree(path, repo_config); 	print_repolist(f, &cgit_repolist, idx); 	if (rename(locked_rc, cached_rc)) 		fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n",@@ -500,7 +500,7 @@ static void process_cached_repolist(const char *path) 		 * invoke scan_tree manually. 		 */ 		if (generate_cached_repolist(path, cached_rc))-			scan_tree(path);+			scan_tree(path, repo_config); 		return; 	} @@ -559,7 +559,7 @@ static void cgit_parse_args(int argc, const char **argv) 		if (!strncmp(argv[i], "--scan-tree=", 12) || 		    !strncmp(argv[i], "--scan-path=", 12)) { 			scan++;-			scan_tree(argv[i] + 12);+			scan_tree(argv[i] + 12, repo_config); 		} 	} 	if (scan) {
diff --git a/cgit.c b/cgit.c
index 90ae124..e281aa9 100644
--- a/cgit.c
+++ b/cgit.c
@@ -168,7 +168,7 @@ void config_cb(const char *name, const char *value)
 		if (!ctx.cfg.nocache && ctx.cfg.cache_size)
 			process_cached_repolist(value);
 		else
-			scan_tree(value);
+			scan_tree(value, repo_config);
 	else if (!strcmp(name, "source-filter"))
 		ctx.cfg.source_filter = new_filter(value, 1);
 	else if (!strcmp(name, "summary-log"))
@@ -476,7 +476,7 @@ static int generate_cached_repolist(const char *path, const char *cached_rc)
 		return errno;
 	}
 	idx = cgit_repolist.count;
-	scan_tree(path);
+	scan_tree(path, repo_config);
 	print_repolist(f, &cgit_repolist, idx);
 	if (rename(locked_rc, cached_rc))
 		fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n",
@@ -500,7 +500,7 @@ static void process_cached_repolist(const char *path)
 		 * invoke scan_tree manually.
 		 */
 		if (generate_cached_repolist(path, cached_rc))
-			scan_tree(path);
+			scan_tree(path, repo_config);
 		return;
 	}
 
@@ -559,7 +559,7 @@ static void cgit_parse_args(int argc, const char **argv)
 		if (!strncmp(argv[i], "--scan-tree=", 12) ||
 		    !strncmp(argv[i], "--scan-path=", 12)) {
 			scan++;
-			scan_tree(argv[i] + 12);
+			scan_tree(argv[i] + 12, repo_config);
 		}
 	}
 	if (scan) {
diff --git a/cgit.h b/cgit.hindex fc7c7d5..3359be9 100644--- a/cgit.h+++ b/cgit.h@@ -79,6 +79,9 @@ struct cgit_repo { 	struct cgit_filter *source_filter; }; +typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,+	      const char *value);+ struct cgit_repolist { 	int length; 	int count;
diff --git a/cgit.h b/cgit.h
index fc7c7d5..3359be9 100644
--- a/cgit.h
+++ b/cgit.h
@@ -79,6 +79,9 @@ struct cgit_repo {
 	struct cgit_filter *source_filter;
 };
 
+typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
+	      const char *value);
+
 struct cgit_repolist {
 	int length;
 	int count;
diff --git a/cgitrc.5.txt b/cgitrc.5.txtindex e99c9f7..df494aa 100644--- a/cgitrc.5.txt+++ b/cgitrc.5.txt@@ -326,6 +326,15 @@ repo.url:: 	setting specified for each repo. Default value: none.  +REPOSITORY-SPECIFIC CGITRC FILE+-------------------------------+When the option 'scan-path' is used to auto-discover git repositories, cgit+will try to parse the file 'cgitrc' within any found repository. Such a repo-+specific config file may contain any of the repo-specific options described+above, except 'repo.url' and 'repo.path'. Also, in a repo-specific config+file, the 'repo.' prefix is dropped from the config option names.++ EXAMPLE CGITRC FILE ------------------- 
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index e99c9f7..df494aa 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -326,6 +326,15 @@ repo.url::
 	setting specified for each repo. Default value: none.
 
 
+REPOSITORY-SPECIFIC CGITRC FILE
+-------------------------------
+When the option 'scan-path' is used to auto-discover git repositories, cgit
+will try to parse the file 'cgitrc' within any found repository. Such a repo-
+specific config file may contain any of the repo-specific options described
+above, except 'repo.url' and 'repo.path'. Also, in a repo-specific config
+file, the 'repo.' prefix is dropped from the config option names.
+
+
 EXAMPLE CGITRC FILE
 -------------------
 
diff --git a/scan-tree.c b/scan-tree.cindex 67f4550..dbca797 100644--- a/scan-tree.c+++ b/scan-tree.c@@ -1,4 +1,5 @@ #include "cgit.h"+#include "configfile.h" #include "html.h"  #define MAX_PATH 4096@@ -35,9 +36,16 @@ static int is_git_dir(const char *path) 	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 cgit_repo *repo; 	struct stat st; 	struct passwd *pwd; 	char *p;@@ -76,9 +84,15 @@ static void add_repo(const char *base, const char *path) 	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;@@ -86,11 +100,11 @@ static void scan_path(const char *base, const char *path) 	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));+		add_repo(base, fmt("%s/.git", path), fn); 		return; 	} 	dir = opendir(path);@@ -120,13 +134,13 @@ static void scan_path(const char *base, const char *path) 			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); }
diff --git a/scan-tree.c b/scan-tree.c
index 67f4550..dbca797 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,4 +1,5 @@
 #include "cgit.h"
+#include "configfile.h"
 #include "html.h"
 
 #define MAX_PATH 4096
@@ -35,9 +36,16 @@ static int is_git_dir(const char *path)
 	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 cgit_repo *repo;
 	struct stat st;
 	struct passwd *pwd;
 	char *p;
@@ -76,9 +84,15 @@ static void add_repo(const char *base, const char *path)
 	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;
@@ -86,11 +100,11 @@ static void scan_path(const char *base, const char *path)
 	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));
+		add_repo(base, fmt("%s/.git", path), fn);
 		return;
 	}
 	dir = opendir(path);
@@ -120,13 +134,13 @@ static void scan_path(const char *base, const char *path)
 			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);
 }
diff --git a/scan-tree.h b/scan-tree.hindex b103b16..11539f4 100644--- a/scan-tree.h+++ b/scan-tree.h@@ -1,3 +1,3 @@  -extern void scan_tree(const char *path);+extern void scan_tree(const char *path, repo_config_fn fn);
diff --git a/scan-tree.h b/scan-tree.h
index b103b16..11539f4 100644
--- a/scan-tree.h
+++ b/scan-tree.h
@@ -1,3 +1,3 @@
 
 
-extern void scan_tree(const char *path);
+extern void scan_tree(const char *path, repo_config_fn fn);