|
diff --git a/cgit.c b/cgit.c index 73b1f02..1f46e0d 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -8,8 +8,9 @@ |
8 | |
8 | |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | #include "cache.h" |
10 | #include "cache.h" |
11 | #include "cmd.h" |
11 | #include "cmd.h" |
| |
12 | #include "configfile.h" |
12 | #include "ui-shared.h" |
13 | #include "ui-shared.h" |
13 | |
14 | |
14 | const char *cgit_version = CGIT_VERSION; |
15 | const char *cgit_version = CGIT_VERSION; |
15 | |
16 | |
@@ -102,9 +103,9 @@ void config_cb(const char *name, const char *value) |
102 | ctx.repo->readme = xstrdup(value); |
103 | ctx.repo->readme = xstrdup(value); |
103 | else |
104 | else |
104 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
105 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
105 | } else if (!strcmp(name, "include")) |
106 | } else if (!strcmp(name, "include")) |
106 | cgit_read_config(value, config_cb); |
107 | parse_configfile(value, config_cb); |
107 | } |
108 | } |
108 | |
109 | |
109 | static void querystring_cb(const char *name, const char *value) |
110 | static void querystring_cb(const char *name, const char *value) |
110 | { |
111 | { |
@@ -435,9 +436,9 @@ int main(int argc, const char **argv) |
435 | cgit_repolist.length = 0; |
436 | cgit_repolist.length = 0; |
436 | cgit_repolist.count = 0; |
437 | cgit_repolist.count = 0; |
437 | cgit_repolist.repos = NULL; |
438 | cgit_repolist.repos = NULL; |
438 | |
439 | |
439 | cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
440 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
440 | config_cb); |
441 | config_cb); |
441 | if (getenv("SCRIPT_NAME")) |
442 | if (getenv("SCRIPT_NAME")) |
442 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); |
443 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); |
443 | if (getenv("QUERY_STRING")) |
444 | if (getenv("QUERY_STRING")) |
|