| -rw-r--r-- | cgitrc | 7 | ||||
| -rw-r--r-- | parsing.c | 14 | ||||
| -rw-r--r-- | shared.c | 2 |
3 files changed, 15 insertions, 8 deletions
@@ -50,44 +50,47 @@ ## Url loaded when clicking a submodule link #module-link=./?repo=%s&page=commit&id=%s ## Number of chars shown of commit subject message (in log view) #max-message-length=60 ## Number of commits per page in log view #max-commit-count=50 ## Root of cached output #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) ## ## ttl for root page #cache-root-ttl=5 ## 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) #cache-static-ttl=-1 ## Example repository entry. Required values are repo.url and repo.path (each ## repository section must start with repo.url). #repo.url=cgit #repo.name=cgit #repo.desc=the caching cgi for git #repo.path=/pub/git/cgit #repo.owner=Lars Hjemli #repo.snapshots=1 # override a sitewide snapshot-setting #repo.module-link=/git/%s/commit/?id=%s # override the standard module-link @@ -51,45 +51,47 @@ int read_config_line(FILE *f, char *line, const char **value, int bufsize) continue; } else if (c=='\n' || c==EOF) { line[i] = 0; break; } else { line[i]=c; } isname = 1; i++; } line[i+1] = 0; return i; } 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) { int d1, d2; if (strlen(txt) < 3) { *txt = '\0'; return txt-1; } d1 = hextoint(*(txt+1)); d2 = hextoint(*(txt+2)); if (d1<0 || d2<0) { strcpy(txt, txt+3); return txt-1; } else { *txt = d1 * 16 + d2; @@ -124,32 +124,34 @@ void cgit_global_config_cb(const char *name, const char *value) else if (!strcmp(name, "max-commit-count")) cgit_max_commit_count = atoi(value); else if (!strcmp(name, "repo.url")) cgit_repo = add_repo(value); else if (!strcmp(name, "repo.name")) cgit_repo->name = xstrdup(value); else if (cgit_repo && !strcmp(name, "repo.path")) cgit_repo->path = xstrdup(value); else if (cgit_repo && !strcmp(name, "repo.desc")) cgit_repo->desc = xstrdup(value); else if (cgit_repo && !strcmp(name, "repo.owner")) cgit_repo->owner = xstrdup(value); else if (cgit_repo && !strcmp(name, "repo.snapshots")) 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) { if (!strcmp(name, "name")) cgit_repo_name = xstrdup(value); else if (!strcmp(name, "desc")) cgit_repo_desc = xstrdup(value); else if (!strcmp(name, "owner")) cgit_repo_owner = xstrdup(value); } void cgit_querystring_cb(const char *name, const char *value) { if (!strcmp(name,"r")) { cgit_query_repo = xstrdup(value); |