|
diff --git a/cgit.c b/cgit.c index 3b3f8d9..96900bb 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -72,11 +72,7 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
72 | else if (!strcmp(name, "section")) |
72 | else if (!strcmp(name, "section")) |
73 | repo->section = xstrdup(value); |
73 | repo->section = xstrdup(value); |
74 | else if (!strcmp(name, "readme") && value != NULL) { |
74 | else if (!strcmp(name, "readme") && value != NULL) { |
75 | char *colon; |
75 | repo->readme = xstrdup(value); |
76 | if (*value == '/' || ((colon = strchr(value, ':')) != NULL && colon != value && *(colon + 1) != '\0')) |
| |
77 | repo->readme = xstrdup(value); |
| |
78 | else |
| |
79 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); |
| |
80 | } else if (ctx.cfg.enable_filter_overrides) { |
76 | } else if (ctx.cfg.enable_filter_overrides) { |
81 | if (!strcmp(name, "about-filter")) |
77 | if (!strcmp(name, "about-filter")) |
82 | repo->about_filter = new_filter(value, 0); |
78 | repo->about_filter = new_filter(value, 0); |
@@ -97,6 +93,8 @@ void config_cb(const char *name, const char *value) |
97 | ctx.repo->path = trim_end(value, '/'); |
93 | ctx.repo->path = trim_end(value, '/'); |
98 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
94 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
99 | repo_config(ctx.repo, name + 5, value); |
95 | repo_config(ctx.repo, name + 5, value); |
| |
96 | else if (!strcmp(name, "readme")) |
| |
97 | ctx.cfg.readme = xstrdup(value); |
100 | else if (!strcmp(name, "root-title")) |
98 | else if (!strcmp(name, "root-title")) |
101 | ctx.cfg.root_title = xstrdup(value); |
99 | ctx.cfg.root_title = xstrdup(value); |
102 | else if (!strcmp(name, "root-desc")) |
100 | else if (!strcmp(name, "root-desc")) |
@@ -195,6 +193,8 @@ void config_cb(const char *name, const char *value) |
195 | ctx.cfg.project_list, repo_config); |
193 | ctx.cfg.project_list, repo_config); |
196 | else |
194 | else |
197 | scan_tree(expand_macros(value), repo_config); |
195 | scan_tree(expand_macros(value), repo_config); |
| |
196 | else if (!strcmp(name, "section-from-path")) |
| |
197 | ctx.cfg.section_from_path = atoi(value); |
198 | else if (!strcmp(name, "source-filter")) |
198 | else if (!strcmp(name, "source-filter")) |
199 | ctx.cfg.source_filter = new_filter(value, 1); |
199 | ctx.cfg.source_filter = new_filter(value, 1); |
200 | else if (!strcmp(name, "summary-log")) |
200 | else if (!strcmp(name, "summary-log")) |
|