@ -148,7 +148,7 @@ void config_cb(const char *name, const char *value)
else if ( ! strcmp ( name , " cache-size " ) )
else if ( ! strcmp ( name , " cache-size " ) )
ctx . cfg . cache_size = atoi ( value ) ;
ctx . cfg . cache_size = atoi ( value ) ;
else if ( ! strcmp ( name , " cache-root " ) )
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 " ) )
else if ( ! strcmp ( name , " cache-root-ttl " ) )
ctx . cfg . cache_root_ttl = atoi ( value ) ;
ctx . cfg . cache_root_ttl = atoi ( value ) ;
else if ( ! strcmp ( name , " cache-repo-ttl " ) )
else if ( ! strcmp ( name , " cache-repo-ttl " ) )
@ -177,9 +177,9 @@ void config_cb(const char *name, const char *value)
ctx . cfg . max_commit_count = atoi ( value ) ;
ctx . cfg . max_commit_count = atoi ( value ) ;
else if ( ! strcmp ( name , " scan-path " ) )
else if ( ! strcmp ( name , " scan-path " ) )
if ( ! ctx . cfg . nocache & & ctx . cfg . cache_size )
if ( ! ctx . cfg . nocache & & ctx . cfg . cache_size )
process_cached_repolist ( value ) ;
process_cached_repolist ( expand_macros ( value ) ) ;
else
else
scan_tree ( value , repo_config ) ;
scan_tree ( expand_macros ( value ) , repo_config ) ;
else if ( ! strcmp ( name , " source-filter " ) )
else if ( ! strcmp ( name , " source-filter " ) )
ctx . cfg . source_filter = new_filter ( value , 1 ) ;
ctx . cfg . source_filter = new_filter ( value , 1 ) ;
else if ( ! strcmp ( name , " summary-log " ) )
else if ( ! strcmp ( name , " summary-log " ) )
@ -203,7 +203,7 @@ void config_cb(const char *name, const char *value)
else if ( ! prefixcmp ( name , " mimetype. " ) )
else if ( ! prefixcmp ( name , " mimetype. " ) )
add_mimetype ( name + 9 , value ) ;
add_mimetype ( name + 9 , value ) ;
else if ( ! strcmp ( name , " include " ) )
else if ( ! strcmp ( name , " include " ) )
parse_configfile ( value , config_cb ) ;
parse_configfile ( expand_macros ( value ) , config_cb ) ;
}
}
static void querystring_cb ( const char * name , const char * value )
static void querystring_cb ( const char * name , const char * value )
@ -688,7 +688,7 @@ int main(int argc, const char **argv)
cgit_repolist . repos = NULL ;
cgit_repolist . repos = NULL ;
cgit_parse_args ( argc , 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 ;
ctx . repo = NULL ;
http_parse_querystring ( ctx . qry . raw , querystring_cb ) ;
http_parse_querystring ( ctx . qry . raw , querystring_cb ) ;