summaryrefslogtreecommitdiffabout
path: root/cgit.c
authorLars Hjemli <hjemli@gmail.com>2010-07-18 13:03:08 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-07-18 13:03:08 (UTC)
commit5c5d189635287a3bfaa1a4aef133dc0c582a27c2 (patch) (side-by-side diff)
treecf14b0a5578c9d23a560690e7e256260633ce043 /cgit.c
parent60fcf600f5010701c20b63867999a802ca0e05c0 (diff)
parentba56a37e863d0f90e3e953047486905cfb959925 (diff)
downloadcgit-5c5d189635287a3bfaa1a4aef133dc0c582a27c2.zip
cgit-5c5d189635287a3bfaa1a4aef133dc0c582a27c2.tar.gz
cgit-5c5d189635287a3bfaa1a4aef133dc0c582a27c2.tar.bz2
Merge branch 'lh/macros'
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/cgit.c b/cgit.c
index ab25b6a..fde0757 100644
--- a/cgit.c
+++ b/cgit.c
@@ -153,5 +153,5 @@ void config_cb(const char *name, const char *value)
ctx.cfg.cache_size = atoi(value);
else if (!strcmp(name, "cache-root"))
- ctx.cfg.cache_root = xstrdup(value);
+ ctx.cfg.cache_root = xstrdup(expand_macros(value));
else if (!strcmp(name, "cache-root-ttl"))
ctx.cfg.cache_root_ttl = atoi(value);
@@ -184,7 +184,7 @@ void config_cb(const char *name, const char *value)
else if (!strcmp(name, "scan-path"))
if (!ctx.cfg.nocache && ctx.cfg.cache_size)
- process_cached_repolist(value);
+ process_cached_repolist(expand_macros(value));
else
- scan_tree(value, repo_config);
+ scan_tree(expand_macros(value), repo_config);
else if (!strcmp(name, "source-filter"))
ctx.cfg.source_filter = new_filter(value, 1);
@@ -210,5 +210,5 @@ void config_cb(const char *name, const char *value)
add_mimetype(name + 9, value);
else if (!strcmp(name, "include"))
- parse_configfile(value, config_cb);
+ parse_configfile(expand_macros(value), config_cb);
}
@@ -706,5 +706,5 @@ int main(int argc, const char **argv)
cgit_parse_args(argc, argv);
- parse_configfile(ctx.env.cgit_config, config_cb);
+ parse_configfile(expand_macros(ctx.env.cgit_config), config_cb);
ctx.repo = NULL;
http_parse_querystring(ctx.qry.raw, querystring_cb);