Add include-parameter to config files

This parameter can be used to include another config-file, like
a standalone repository listing.

Suggested in a patch by Kristian Høgsberg <krh@bitplanet.net>

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

3 files changed, 13 insertions, 6 deletions

diff --git a/cgitrc b/cgitrc
index 019781e..e7e731c 100644
--- a/cgitrc
+++ b/cgitrc
@@ -65,2 +65,5 @@
 
+## Include another config-file
+#include=/var/cgit/repolist
+
 ##
diff --git a/parsing.c b/parsing.c
index 332d61c..8e15e5a 100644
--- a/parsing.c
+++ b/parsing.c
@@ -66,15 +66,17 @@ int cgit_read_config(const char *filename, configfn fn)
 {
-	int ret = 0, len;
+	static int nesting;
+	int len;
 	char line[256];
 	const char *value;
-	FILE *f = fopen(filename, "r");
+	FILE *f;
 
-	if (!f)
+	/* cancel the reading of yet another configfile after 16 invocations */
+	if (nesting++ > 16)
+		return -1;
+	if (!(f = fopen(filename, "r")))
 		return -1;
-
 	while((len = read_config_line(f, line, &value, sizeof(line))) > 0)
 		(*fn)(line, value);
-
 	fclose(f);
-	return ret;
+	return 0;
 }
diff --git a/shared.c b/shared.c
index ffecac8..072bb6d 100644
--- a/shared.c
+++ b/shared.c
@@ -139,2 +139,4 @@ void cgit_global_config_cb(const char *name, const char *value)
 		cgit_repo->module_link= xstrdup(value);
+	else if (!strcmp(name, "include"))
+		cgit_read_config(value, cgit_global_config_cb);
 }