| -rw-r--r-- | cgitrc | 7 | ||||
| -rw-r--r-- | parsing.c | 14 | ||||
| -rw-r--r-- | shared.c | 2 |
3 files changed, 8 insertions, 15 deletions
@@ -63,11 +63,8 @@ #cache-root=/var/cache/cgit -## Include another config-file -#include=/var/cgit/repolist - ## -## Time-To-Live settings: specifies how long (in minutes) different pages +## Time-To-Live settings: specifies how long (in minutes) different pages ## should be cached (0 for instant expiration, -1 for immortal pages) ## @@ -77,7 +74,7 @@ ## ttl for repo summary page #cache-repo-ttl=5 -## ttl for other dynamic pages +## ttl for other dynamic pages #cache-dynamic-ttl=5 ## ttl for static pages (addressed by SHA-1) @@ -64,21 +64,19 @@ int read_config_line(FILE *f, char *line, const char **value, int bufsize) int cgit_read_config(const char *filename, configfn fn) { - static int nesting; - int len; + int ret = 0, len; char line[256]; const char *value; - FILE *f; + FILE *f = fopen(filename, "r"); - /* cancel the reading of yet another configfile after 16 invocations */ - if (nesting++ > 16) - return -1; - if (!(f = fopen(filename, "r"))) + if (!f) return -1; + while((len = read_config_line(f, line, &value, sizeof(line))) > 0) (*fn)(line, value); + fclose(f); - return 0; + return ret; } char *convert_query_hexchar(char *txt) @@ -137,8 +137,6 @@ 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) |