|
diff --git a/cgit.c b/cgit.c index 96900bb..412fbf0 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -28,192 +28,194 @@ void add_mimetype(const char *name, const char *value) |
28 | |
28 | |
29 | struct cgit_filter *new_filter(const char *cmd, int extra_args) |
29 | struct cgit_filter *new_filter(const char *cmd, int extra_args) |
30 | { |
30 | { |
31 | struct cgit_filter *f; |
31 | struct cgit_filter *f; |
32 | |
32 | |
33 | if (!cmd || !cmd[0]) |
33 | if (!cmd || !cmd[0]) |
34 | return NULL; |
34 | return NULL; |
35 | |
35 | |
36 | f = xmalloc(sizeof(struct cgit_filter)); |
36 | f = xmalloc(sizeof(struct cgit_filter)); |
37 | f->cmd = xstrdup(cmd); |
37 | f->cmd = xstrdup(cmd); |
38 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
38 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
39 | f->argv[0] = f->cmd; |
39 | f->argv[0] = f->cmd; |
40 | f->argv[1] = NULL; |
40 | f->argv[1] = NULL; |
41 | return f; |
41 | return f; |
42 | } |
42 | } |
43 | |
43 | |
44 | static void process_cached_repolist(const char *path); |
44 | static void process_cached_repolist(const char *path); |
45 | |
45 | |
46 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
46 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
47 | { |
47 | { |
48 | if (!strcmp(name, "name")) |
48 | if (!strcmp(name, "name")) |
49 | repo->name = xstrdup(value); |
49 | repo->name = xstrdup(value); |
50 | else if (!strcmp(name, "clone-url")) |
50 | else if (!strcmp(name, "clone-url")) |
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 | repo->readme = xstrdup(value); |
75 | repo->readme = xstrdup(value); |
76 | } else if (ctx.cfg.enable_filter_overrides) { |
76 | } else if (ctx.cfg.enable_filter_overrides) { |
77 | if (!strcmp(name, "about-filter")) |
77 | if (!strcmp(name, "about-filter")) |
78 | repo->about_filter = new_filter(value, 0); |
78 | repo->about_filter = new_filter(value, 0); |
79 | else if (!strcmp(name, "commit-filter")) |
79 | else if (!strcmp(name, "commit-filter")) |
80 | repo->commit_filter = new_filter(value, 0); |
80 | repo->commit_filter = new_filter(value, 0); |
81 | else if (!strcmp(name, "source-filter")) |
81 | else if (!strcmp(name, "source-filter")) |
82 | repo->source_filter = new_filter(value, 1); |
82 | repo->source_filter = new_filter(value, 1); |
83 | } |
83 | } |
84 | } |
84 | } |
85 | |
85 | |
86 | void config_cb(const char *name, const char *value) |
86 | void config_cb(const char *name, const char *value) |
87 | { |
87 | { |
88 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
88 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
89 | ctx.cfg.section = xstrdup(value); |
89 | ctx.cfg.section = xstrdup(value); |
90 | else if (!strcmp(name, "repo.url")) |
90 | else if (!strcmp(name, "repo.url")) |
91 | ctx.repo = cgit_add_repo(value); |
91 | ctx.repo = cgit_add_repo(value); |
92 | else if (ctx.repo && !strcmp(name, "repo.path")) |
92 | else if (ctx.repo && !strcmp(name, "repo.path")) |
93 | ctx.repo->path = trim_end(value, '/'); |
93 | ctx.repo->path = trim_end(value, '/'); |
94 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
94 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
95 | repo_config(ctx.repo, name + 5, value); |
95 | repo_config(ctx.repo, name + 5, value); |
96 | else if (!strcmp(name, "readme")) |
96 | else if (!strcmp(name, "readme")) |
97 | ctx.cfg.readme = xstrdup(value); |
97 | ctx.cfg.readme = xstrdup(value); |
98 | else if (!strcmp(name, "root-title")) |
98 | else if (!strcmp(name, "root-title")) |
99 | ctx.cfg.root_title = xstrdup(value); |
99 | ctx.cfg.root_title = xstrdup(value); |
100 | else if (!strcmp(name, "root-desc")) |
100 | else if (!strcmp(name, "root-desc")) |
101 | ctx.cfg.root_desc = xstrdup(value); |
101 | ctx.cfg.root_desc = xstrdup(value); |
102 | else if (!strcmp(name, "root-readme")) |
102 | else if (!strcmp(name, "root-readme")) |
103 | ctx.cfg.root_readme = xstrdup(value); |
103 | ctx.cfg.root_readme = xstrdup(value); |
104 | else if (!strcmp(name, "css")) |
104 | else if (!strcmp(name, "css")) |
105 | ctx.cfg.css = xstrdup(value); |
105 | ctx.cfg.css = xstrdup(value); |
106 | else if (!strcmp(name, "favicon")) |
106 | else if (!strcmp(name, "favicon")) |
107 | ctx.cfg.favicon = xstrdup(value); |
107 | ctx.cfg.favicon = xstrdup(value); |
108 | else if (!strcmp(name, "footer")) |
108 | else if (!strcmp(name, "footer")) |
109 | ctx.cfg.footer = xstrdup(value); |
109 | ctx.cfg.footer = xstrdup(value); |
110 | else if (!strcmp(name, "head-include")) |
110 | else if (!strcmp(name, "head-include")) |
111 | ctx.cfg.head_include = xstrdup(value); |
111 | ctx.cfg.head_include = xstrdup(value); |
112 | else if (!strcmp(name, "header")) |
112 | else if (!strcmp(name, "header")) |
113 | ctx.cfg.header = xstrdup(value); |
113 | ctx.cfg.header = xstrdup(value); |
114 | else if (!strcmp(name, "logo")) |
114 | else if (!strcmp(name, "logo")) |
115 | ctx.cfg.logo = xstrdup(value); |
115 | ctx.cfg.logo = xstrdup(value); |
116 | else if (!strcmp(name, "index-header")) |
116 | else if (!strcmp(name, "index-header")) |
117 | ctx.cfg.index_header = xstrdup(value); |
117 | ctx.cfg.index_header = xstrdup(value); |
118 | else if (!strcmp(name, "index-info")) |
118 | else if (!strcmp(name, "index-info")) |
119 | ctx.cfg.index_info = xstrdup(value); |
119 | ctx.cfg.index_info = xstrdup(value); |
120 | else if (!strcmp(name, "logo-link")) |
120 | else if (!strcmp(name, "logo-link")) |
121 | ctx.cfg.logo_link = xstrdup(value); |
121 | ctx.cfg.logo_link = xstrdup(value); |
122 | else if (!strcmp(name, "module-link")) |
122 | else if (!strcmp(name, "module-link")) |
123 | ctx.cfg.module_link = xstrdup(value); |
123 | ctx.cfg.module_link = xstrdup(value); |
| |
124 | else if (!strcmp(name, "strict-export")) |
| |
125 | ctx.cfg.strict_export = xstrdup(value); |
124 | else if (!strcmp(name, "virtual-root")) { |
126 | else if (!strcmp(name, "virtual-root")) { |
125 | ctx.cfg.virtual_root = trim_end(value, '/'); |
127 | ctx.cfg.virtual_root = trim_end(value, '/'); |
126 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
128 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
127 | ctx.cfg.virtual_root = ""; |
129 | ctx.cfg.virtual_root = ""; |
128 | } else if (!strcmp(name, "nocache")) |
130 | } else if (!strcmp(name, "nocache")) |
129 | ctx.cfg.nocache = atoi(value); |
131 | ctx.cfg.nocache = atoi(value); |
130 | else if (!strcmp(name, "noplainemail")) |
132 | else if (!strcmp(name, "noplainemail")) |
131 | ctx.cfg.noplainemail = atoi(value); |
133 | ctx.cfg.noplainemail = atoi(value); |
132 | else if (!strcmp(name, "noheader")) |
134 | else if (!strcmp(name, "noheader")) |
133 | ctx.cfg.noheader = atoi(value); |
135 | ctx.cfg.noheader = atoi(value); |
134 | else if (!strcmp(name, "snapshots")) |
136 | else if (!strcmp(name, "snapshots")) |
135 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
137 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
136 | else if (!strcmp(name, "enable-filter-overrides")) |
138 | else if (!strcmp(name, "enable-filter-overrides")) |
137 | ctx.cfg.enable_filter_overrides = atoi(value); |
139 | ctx.cfg.enable_filter_overrides = atoi(value); |
138 | else if (!strcmp(name, "enable-gitweb-owner")) |
140 | else if (!strcmp(name, "enable-gitweb-owner")) |
139 | ctx.cfg.enable_gitweb_owner = atoi(value); |
141 | ctx.cfg.enable_gitweb_owner = atoi(value); |
140 | else if (!strcmp(name, "enable-index-links")) |
142 | else if (!strcmp(name, "enable-index-links")) |
141 | ctx.cfg.enable_index_links = atoi(value); |
143 | ctx.cfg.enable_index_links = atoi(value); |
142 | else if (!strcmp(name, "enable-log-filecount")) |
144 | else if (!strcmp(name, "enable-log-filecount")) |
143 | ctx.cfg.enable_log_filecount = atoi(value); |
145 | ctx.cfg.enable_log_filecount = atoi(value); |
144 | else if (!strcmp(name, "enable-log-linecount")) |
146 | else if (!strcmp(name, "enable-log-linecount")) |
145 | ctx.cfg.enable_log_linecount = atoi(value); |
147 | ctx.cfg.enable_log_linecount = atoi(value); |
146 | else if (!strcmp(name, "enable-remote-branches")) |
148 | else if (!strcmp(name, "enable-remote-branches")) |
147 | ctx.cfg.enable_remote_branches = atoi(value); |
149 | ctx.cfg.enable_remote_branches = atoi(value); |
148 | else if (!strcmp(name, "enable-subject-links")) |
150 | else if (!strcmp(name, "enable-subject-links")) |
149 | ctx.cfg.enable_subject_links = atoi(value); |
151 | ctx.cfg.enable_subject_links = atoi(value); |
150 | else if (!strcmp(name, "enable-tree-linenumbers")) |
152 | else if (!strcmp(name, "enable-tree-linenumbers")) |
151 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
153 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
152 | else if (!strcmp(name, "max-stats")) |
154 | else if (!strcmp(name, "max-stats")) |
153 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
155 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
154 | else if (!strcmp(name, "cache-size")) |
156 | else if (!strcmp(name, "cache-size")) |
155 | ctx.cfg.cache_size = atoi(value); |
157 | ctx.cfg.cache_size = atoi(value); |
156 | else if (!strcmp(name, "cache-root")) |
158 | else if (!strcmp(name, "cache-root")) |
157 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
159 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
158 | else if (!strcmp(name, "cache-root-ttl")) |
160 | else if (!strcmp(name, "cache-root-ttl")) |
159 | ctx.cfg.cache_root_ttl = atoi(value); |
161 | ctx.cfg.cache_root_ttl = atoi(value); |
160 | else if (!strcmp(name, "cache-repo-ttl")) |
162 | else if (!strcmp(name, "cache-repo-ttl")) |
161 | ctx.cfg.cache_repo_ttl = atoi(value); |
163 | ctx.cfg.cache_repo_ttl = atoi(value); |
162 | else if (!strcmp(name, "cache-scanrc-ttl")) |
164 | else if (!strcmp(name, "cache-scanrc-ttl")) |
163 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
165 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
164 | else if (!strcmp(name, "cache-static-ttl")) |
166 | else if (!strcmp(name, "cache-static-ttl")) |
165 | ctx.cfg.cache_static_ttl = atoi(value); |
167 | ctx.cfg.cache_static_ttl = atoi(value); |
166 | else if (!strcmp(name, "cache-dynamic-ttl")) |
168 | else if (!strcmp(name, "cache-dynamic-ttl")) |
167 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
169 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
168 | else if (!strcmp(name, "about-filter")) |
170 | else if (!strcmp(name, "about-filter")) |
169 | ctx.cfg.about_filter = new_filter(value, 0); |
171 | ctx.cfg.about_filter = new_filter(value, 0); |
170 | else if (!strcmp(name, "commit-filter")) |
172 | else if (!strcmp(name, "commit-filter")) |
171 | ctx.cfg.commit_filter = new_filter(value, 0); |
173 | ctx.cfg.commit_filter = new_filter(value, 0); |
172 | else if (!strcmp(name, "embedded")) |
174 | else if (!strcmp(name, "embedded")) |
173 | ctx.cfg.embedded = atoi(value); |
175 | ctx.cfg.embedded = atoi(value); |
174 | else if (!strcmp(name, "max-atom-items")) |
176 | else if (!strcmp(name, "max-atom-items")) |
175 | ctx.cfg.max_atom_items = atoi(value); |
177 | ctx.cfg.max_atom_items = atoi(value); |
176 | else if (!strcmp(name, "max-message-length")) |
178 | else if (!strcmp(name, "max-message-length")) |
177 | ctx.cfg.max_msg_len = atoi(value); |
179 | ctx.cfg.max_msg_len = atoi(value); |
178 | else if (!strcmp(name, "max-repodesc-length")) |
180 | else if (!strcmp(name, "max-repodesc-length")) |
179 | ctx.cfg.max_repodesc_len = atoi(value); |
181 | ctx.cfg.max_repodesc_len = atoi(value); |
180 | else if (!strcmp(name, "max-blob-size")) |
182 | else if (!strcmp(name, "max-blob-size")) |
181 | ctx.cfg.max_blob_size = atoi(value); |
183 | ctx.cfg.max_blob_size = atoi(value); |
182 | else if (!strcmp(name, "max-repo-count")) |
184 | else if (!strcmp(name, "max-repo-count")) |
183 | ctx.cfg.max_repo_count = atoi(value); |
185 | ctx.cfg.max_repo_count = atoi(value); |
184 | else if (!strcmp(name, "max-commit-count")) |
186 | else if (!strcmp(name, "max-commit-count")) |
185 | ctx.cfg.max_commit_count = atoi(value); |
187 | ctx.cfg.max_commit_count = atoi(value); |
186 | else if (!strcmp(name, "project-list")) |
188 | else if (!strcmp(name, "project-list")) |
187 | ctx.cfg.project_list = xstrdup(expand_macros(value)); |
189 | ctx.cfg.project_list = xstrdup(expand_macros(value)); |
188 | else if (!strcmp(name, "scan-path")) |
190 | else if (!strcmp(name, "scan-path")) |
189 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
191 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
190 | process_cached_repolist(expand_macros(value)); |
192 | process_cached_repolist(expand_macros(value)); |
191 | else if (ctx.cfg.project_list) |
193 | else if (ctx.cfg.project_list) |
192 | scan_projects(expand_macros(value), |
194 | scan_projects(expand_macros(value), |
193 | ctx.cfg.project_list, repo_config); |
195 | ctx.cfg.project_list, repo_config); |
194 | else |
196 | else |
195 | scan_tree(expand_macros(value), repo_config); |
197 | scan_tree(expand_macros(value), repo_config); |
196 | else if (!strcmp(name, "section-from-path")) |
198 | else if (!strcmp(name, "section-from-path")) |
197 | ctx.cfg.section_from_path = atoi(value); |
199 | ctx.cfg.section_from_path = atoi(value); |
198 | else if (!strcmp(name, "source-filter")) |
200 | else if (!strcmp(name, "source-filter")) |
199 | ctx.cfg.source_filter = new_filter(value, 1); |
201 | ctx.cfg.source_filter = new_filter(value, 1); |
200 | else if (!strcmp(name, "summary-log")) |
202 | else if (!strcmp(name, "summary-log")) |
201 | ctx.cfg.summary_log = atoi(value); |
203 | ctx.cfg.summary_log = atoi(value); |
202 | else if (!strcmp(name, "summary-branches")) |
204 | else if (!strcmp(name, "summary-branches")) |
203 | ctx.cfg.summary_branches = atoi(value); |
205 | ctx.cfg.summary_branches = atoi(value); |
204 | else if (!strcmp(name, "summary-tags")) |
206 | else if (!strcmp(name, "summary-tags")) |
205 | ctx.cfg.summary_tags = atoi(value); |
207 | ctx.cfg.summary_tags = atoi(value); |
206 | else if (!strcmp(name, "side-by-side-diffs")) |
208 | else if (!strcmp(name, "side-by-side-diffs")) |
207 | ctx.cfg.ssdiff = atoi(value); |
209 | ctx.cfg.ssdiff = atoi(value); |
208 | else if (!strcmp(name, "agefile")) |
210 | else if (!strcmp(name, "agefile")) |
209 | ctx.cfg.agefile = xstrdup(value); |
211 | ctx.cfg.agefile = xstrdup(value); |
210 | else if (!strcmp(name, "renamelimit")) |
212 | else if (!strcmp(name, "renamelimit")) |
211 | ctx.cfg.renamelimit = atoi(value); |
213 | ctx.cfg.renamelimit = atoi(value); |
212 | else if (!strcmp(name, "remove-suffix")) |
214 | else if (!strcmp(name, "remove-suffix")) |
213 | ctx.cfg.remove_suffix = atoi(value); |
215 | ctx.cfg.remove_suffix = atoi(value); |
214 | else if (!strcmp(name, "robots")) |
216 | else if (!strcmp(name, "robots")) |
215 | ctx.cfg.robots = xstrdup(value); |
217 | ctx.cfg.robots = xstrdup(value); |
216 | else if (!strcmp(name, "clone-prefix")) |
218 | else if (!strcmp(name, "clone-prefix")) |
217 | ctx.cfg.clone_prefix = xstrdup(value); |
219 | ctx.cfg.clone_prefix = xstrdup(value); |
218 | else if (!strcmp(name, "local-time")) |
220 | else if (!strcmp(name, "local-time")) |
219 | ctx.cfg.local_time = atoi(value); |
221 | ctx.cfg.local_time = atoi(value); |
|