summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-14 21:40:33 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-14 21:40:33 (UTC)
commit5ec6e02bd1cc0c05b7cfd0d53371e7d176daec39 (patch) (side-by-side diff)
tree5c844c0ba53cfd2e838368ffbbd4583ac63d3608
parent9ecde6568a9e39c942f4c5585ffa494c5df870e4 (diff)
downloadcgit-5ec6e02bd1cc0c05b7cfd0d53371e7d176daec39.zip
cgit-5ec6e02bd1cc0c05b7cfd0d53371e7d176daec39.tar.gz
cgit-5ec6e02bd1cc0c05b7cfd0d53371e7d176daec39.tar.bz2
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>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgitrc3
-rw-r--r--parsing.c14
-rw-r--r--shared.c2
3 files changed, 13 insertions, 6 deletions
diff --git a/cgitrc b/cgitrc
index 019781e..e7e731c 100644
--- a/cgitrc
+++ b/cgitrc
@@ -63,6 +63,9 @@
#cache-root=/var/cache/cgit
+## Include another config-file
+#include=/var/cgit/repolist
+
##
## Time-To-Live settings: specifies how long (in minutes) different pages
## should be cached (0 for instant expiration, -1 for immortal pages)
diff --git a/parsing.c b/parsing.c
index 332d61c..8e15e5a 100644
--- a/parsing.c
+++ b/parsing.c
@@ -64,19 +64,21 @@ int read_config_line(FILE *f, char *line, const char **value, int bufsize)
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;
}
char *convert_query_hexchar(char *txt)
diff --git a/shared.c b/shared.c
index ffecac8..072bb6d 100644
--- a/shared.c
+++ b/shared.c
@@ -137,6 +137,8 @@ void cgit_global_config_cb(const char *name, const char *value)
cgit_repo->snapshots = atoi(value);
else if (cgit_repo && !strcmp(name, "repo.module-link"))
cgit_repo->module_link= xstrdup(value);
+ else if (!strcmp(name, "include"))
+ cgit_read_config(value, cgit_global_config_cb);
}
void cgit_repo_config_cb(const char *name, const char *value)