| -rw-r--r-- | cgitrc | 3 | ||||
| -rw-r--r-- | parsing.c | 14 | ||||
| -rw-r--r-- | shared.c | 2 |
3 files changed, 13 insertions, 6 deletions
@@ -64,4 +64,7 @@ +## Include another config-file +#include=/var/cgit/repolist + ## ## Time-To-Live settings: specifies how long (in minutes) different pages @@ -65,17 +65,19 @@ 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; } @@ -138,4 +138,6 @@ void cgit_global_config_cb(const char *name, const char *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); } |