|
diff --git a/cgit.c b/cgit.c index d6146e2..04cef23 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -51,73 +51,71 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
51 | repo->clone_url = xstrdup(value); |
51 | repo->clone_url = xstrdup(value); |
52 | else if (!strcmp(name, "desc")) |
52 | else if (!strcmp(name, "desc")) |
53 | repo->desc = xstrdup(value); |
53 | repo->desc = xstrdup(value); |
54 | else if (!strcmp(name, "owner")) |
54 | else if (!strcmp(name, "owner")) |
55 | repo->owner = xstrdup(value); |
55 | repo->owner = xstrdup(value); |
56 | else if (!strcmp(name, "defbranch")) |
56 | else if (!strcmp(name, "defbranch")) |
57 | repo->defbranch = xstrdup(value); |
57 | repo->defbranch = xstrdup(value); |
58 | else if (!strcmp(name, "snapshots")) |
58 | else if (!strcmp(name, "snapshots")) |
59 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
59 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
60 | else if (!strcmp(name, "enable-log-filecount")) |
60 | else if (!strcmp(name, "enable-log-filecount")) |
61 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
61 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
62 | else if (!strcmp(name, "enable-log-linecount")) |
62 | else if (!strcmp(name, "enable-log-linecount")) |
63 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
63 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
64 | else if (!strcmp(name, "enable-remote-branches")) |
64 | else if (!strcmp(name, "enable-remote-branches")) |
65 | repo->enable_remote_branches = atoi(value); |
65 | repo->enable_remote_branches = atoi(value); |
66 | else if (!strcmp(name, "enable-subject-links")) |
66 | else if (!strcmp(name, "enable-subject-links")) |
67 | repo->enable_subject_links = atoi(value); |
67 | repo->enable_subject_links = atoi(value); |
68 | else if (!strcmp(name, "max-stats")) |
68 | else if (!strcmp(name, "max-stats")) |
69 | repo->max_stats = cgit_find_stats_period(value, NULL); |
69 | repo->max_stats = cgit_find_stats_period(value, NULL); |
70 | else if (!strcmp(name, "module-link")) |
70 | else if (!strcmp(name, "module-link")) |
71 | repo->module_link= xstrdup(value); |
71 | repo->module_link= xstrdup(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); |
83 | else if (!strcmp(name, "commit-filter")) |
79 | else if (!strcmp(name, "commit-filter")) |
84 | repo->commit_filter = new_filter(value, 0); |
80 | repo->commit_filter = new_filter(value, 0); |
85 | else if (!strcmp(name, "source-filter")) |
81 | else if (!strcmp(name, "source-filter")) |
86 | repo->source_filter = new_filter(value, 1); |
82 | repo->source_filter = new_filter(value, 1); |
87 | } |
83 | } |
88 | } |
84 | } |
89 | |
85 | |
90 | void config_cb(const char *name, const char *value) |
86 | void config_cb(const char *name, const char *value) |
91 | { |
87 | { |
92 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
88 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
93 | ctx.cfg.section = xstrdup(value); |
89 | ctx.cfg.section = xstrdup(value); |
94 | else if (!strcmp(name, "repo.url")) |
90 | else if (!strcmp(name, "repo.url")) |
95 | ctx.repo = cgit_add_repo(value); |
91 | ctx.repo = cgit_add_repo(value); |
96 | else if (ctx.repo && !strcmp(name, "repo.path")) |
92 | else if (ctx.repo && !strcmp(name, "repo.path")) |
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")) |
103 | ctx.cfg.root_desc = xstrdup(value); |
101 | ctx.cfg.root_desc = xstrdup(value); |
104 | else if (!strcmp(name, "root-readme")) |
102 | else if (!strcmp(name, "root-readme")) |
105 | ctx.cfg.root_readme = xstrdup(value); |
103 | ctx.cfg.root_readme = xstrdup(value); |
106 | else if (!strcmp(name, "css")) |
104 | else if (!strcmp(name, "css")) |
107 | ctx.cfg.css = xstrdup(value); |
105 | ctx.cfg.css = xstrdup(value); |
108 | else if (!strcmp(name, "favicon")) |
106 | else if (!strcmp(name, "favicon")) |
109 | ctx.cfg.favicon = xstrdup(value); |
107 | ctx.cfg.favicon = xstrdup(value); |
110 | else if (!strcmp(name, "footer")) |
108 | else if (!strcmp(name, "footer")) |
111 | ctx.cfg.footer = xstrdup(value); |
109 | ctx.cfg.footer = xstrdup(value); |
112 | else if (!strcmp(name, "head-include")) |
110 | else if (!strcmp(name, "head-include")) |
113 | ctx.cfg.head_include = xstrdup(value); |
111 | ctx.cfg.head_include = xstrdup(value); |
114 | else if (!strcmp(name, "header")) |
112 | else if (!strcmp(name, "header")) |
115 | ctx.cfg.header = xstrdup(value); |
113 | ctx.cfg.header = xstrdup(value); |
116 | else if (!strcmp(name, "logo")) |
114 | else if (!strcmp(name, "logo")) |
117 | ctx.cfg.logo = xstrdup(value); |
115 | ctx.cfg.logo = xstrdup(value); |
118 | else if (!strcmp(name, "index-header")) |
116 | else if (!strcmp(name, "index-header")) |
119 | ctx.cfg.index_header = xstrdup(value); |
117 | ctx.cfg.index_header = xstrdup(value); |
120 | else if (!strcmp(name, "index-info")) |
118 | else if (!strcmp(name, "index-info")) |
121 | ctx.cfg.index_info = xstrdup(value); |
119 | ctx.cfg.index_info = xstrdup(value); |
122 | else if (!strcmp(name, "logo-link")) |
120 | else if (!strcmp(name, "logo-link")) |
123 | ctx.cfg.logo_link = xstrdup(value); |
121 | ctx.cfg.logo_link = xstrdup(value); |
|