|
diff --git a/cgit.c b/cgit.c index 6c7e811..9305d0a 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -51,24 +51,26 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
51 | else if (!strcmp(name, "desc")) |
51 | else if (!strcmp(name, "desc")) |
52 | repo->desc = xstrdup(value); |
52 | repo->desc = xstrdup(value); |
53 | else if (!strcmp(name, "owner")) |
53 | else if (!strcmp(name, "owner")) |
54 | repo->owner = xstrdup(value); |
54 | repo->owner = xstrdup(value); |
55 | else if (!strcmp(name, "defbranch")) |
55 | else if (!strcmp(name, "defbranch")) |
56 | repo->defbranch = xstrdup(value); |
56 | repo->defbranch = xstrdup(value); |
57 | else if (!strcmp(name, "snapshots")) |
57 | else if (!strcmp(name, "snapshots")) |
58 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
58 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
59 | else if (!strcmp(name, "enable-log-filecount")) |
59 | else if (!strcmp(name, "enable-log-filecount")) |
60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
60 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
61 | else if (!strcmp(name, "enable-log-linecount")) |
61 | else if (!strcmp(name, "enable-log-linecount")) |
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
62 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
| |
63 | else if (!strcmp(name, "enable-remote-branches")) |
| |
64 | repo->enable_remote_branches = atoi(value); |
63 | else if (!strcmp(name, "max-stats")) |
65 | else if (!strcmp(name, "max-stats")) |
64 | repo->max_stats = cgit_find_stats_period(value, NULL); |
66 | repo->max_stats = cgit_find_stats_period(value, NULL); |
65 | else if (!strcmp(name, "module-link")) |
67 | else if (!strcmp(name, "module-link")) |
66 | repo->module_link= xstrdup(value); |
68 | repo->module_link= xstrdup(value); |
67 | else if (!strcmp(name, "section")) |
69 | else if (!strcmp(name, "section")) |
68 | repo->section = xstrdup(value); |
70 | repo->section = xstrdup(value); |
69 | else if (!strcmp(name, "readme") && value != NULL) { |
71 | else if (!strcmp(name, "readme") && value != NULL) { |
70 | if (*value == '/') |
72 | if (*value == '/') |
71 | repo->readme = xstrdup(value); |
73 | repo->readme = xstrdup(value); |
72 | else |
74 | else |
73 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); |
75 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); |
74 | } else if (ctx.cfg.enable_filter_overrides) { |
76 | } else if (ctx.cfg.enable_filter_overrides) { |
@@ -128,24 +130,26 @@ void config_cb(const char *name, const char *value) |
128 | else if (!strcmp(name, "noheader")) |
130 | else if (!strcmp(name, "noheader")) |
129 | ctx.cfg.noheader = atoi(value); |
131 | ctx.cfg.noheader = atoi(value); |
130 | else if (!strcmp(name, "snapshots")) |
132 | else if (!strcmp(name, "snapshots")) |
131 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
133 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
132 | else if (!strcmp(name, "enable-filter-overrides")) |
134 | else if (!strcmp(name, "enable-filter-overrides")) |
133 | ctx.cfg.enable_filter_overrides = atoi(value); |
135 | ctx.cfg.enable_filter_overrides = atoi(value); |
134 | else if (!strcmp(name, "enable-index-links")) |
136 | else if (!strcmp(name, "enable-index-links")) |
135 | ctx.cfg.enable_index_links = atoi(value); |
137 | ctx.cfg.enable_index_links = atoi(value); |
136 | else if (!strcmp(name, "enable-log-filecount")) |
138 | else if (!strcmp(name, "enable-log-filecount")) |
137 | ctx.cfg.enable_log_filecount = atoi(value); |
139 | ctx.cfg.enable_log_filecount = atoi(value); |
138 | else if (!strcmp(name, "enable-log-linecount")) |
140 | else if (!strcmp(name, "enable-log-linecount")) |
139 | ctx.cfg.enable_log_linecount = atoi(value); |
141 | ctx.cfg.enable_log_linecount = atoi(value); |
| |
142 | else if (!strcmp(name, "enable-remote-branches")) |
| |
143 | ctx.cfg.enable_remote_branches = atoi(value); |
140 | else if (!strcmp(name, "enable-tree-linenumbers")) |
144 | else if (!strcmp(name, "enable-tree-linenumbers")) |
141 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
145 | ctx.cfg.enable_tree_linenumbers = atoi(value); |
142 | else if (!strcmp(name, "max-stats")) |
146 | else if (!strcmp(name, "max-stats")) |
143 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
147 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
144 | else if (!strcmp(name, "cache-size")) |
148 | else if (!strcmp(name, "cache-size")) |
145 | ctx.cfg.cache_size = atoi(value); |
149 | ctx.cfg.cache_size = atoi(value); |
146 | else if (!strcmp(name, "cache-root")) |
150 | else if (!strcmp(name, "cache-root")) |
147 | ctx.cfg.cache_root = xstrdup(value); |
151 | ctx.cfg.cache_root = xstrdup(value); |
148 | else if (!strcmp(name, "cache-root-ttl")) |
152 | else if (!strcmp(name, "cache-root-ttl")) |
149 | ctx.cfg.cache_root_ttl = atoi(value); |
153 | ctx.cfg.cache_root_ttl = atoi(value); |
150 | else if (!strcmp(name, "cache-repo-ttl")) |
154 | else if (!strcmp(name, "cache-repo-ttl")) |
151 | ctx.cfg.cache_repo_ttl = atoi(value); |
155 | ctx.cfg.cache_repo_ttl = atoi(value); |
@@ -156,41 +160,45 @@ void config_cb(const char *name, const char *value) |
156 | else if (!strcmp(name, "cache-dynamic-ttl")) |
160 | else if (!strcmp(name, "cache-dynamic-ttl")) |
157 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
161 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
158 | else if (!strcmp(name, "about-filter")) |
162 | else if (!strcmp(name, "about-filter")) |
159 | ctx.cfg.about_filter = new_filter(value, 0); |
163 | ctx.cfg.about_filter = new_filter(value, 0); |
160 | else if (!strcmp(name, "commit-filter")) |
164 | else if (!strcmp(name, "commit-filter")) |
161 | ctx.cfg.commit_filter = new_filter(value, 0); |
165 | ctx.cfg.commit_filter = new_filter(value, 0); |
162 | else if (!strcmp(name, "embedded")) |
166 | else if (!strcmp(name, "embedded")) |
163 | ctx.cfg.embedded = atoi(value); |
167 | ctx.cfg.embedded = atoi(value); |
164 | else if (!strcmp(name, "max-message-length")) |
168 | else if (!strcmp(name, "max-message-length")) |
165 | ctx.cfg.max_msg_len = atoi(value); |
169 | ctx.cfg.max_msg_len = atoi(value); |
166 | else if (!strcmp(name, "max-repodesc-length")) |
170 | else if (!strcmp(name, "max-repodesc-length")) |
167 | ctx.cfg.max_repodesc_len = atoi(value); |
171 | ctx.cfg.max_repodesc_len = atoi(value); |
| |
172 | else if (!strcmp(name, "max-blob-size")) |
| |
173 | ctx.cfg.max_blob_size = atoi(value); |
168 | else if (!strcmp(name, "max-repo-count")) |
174 | else if (!strcmp(name, "max-repo-count")) |
169 | ctx.cfg.max_repo_count = atoi(value); |
175 | ctx.cfg.max_repo_count = atoi(value); |
170 | else if (!strcmp(name, "max-commit-count")) |
176 | else if (!strcmp(name, "max-commit-count")) |
171 | ctx.cfg.max_commit_count = atoi(value); |
177 | ctx.cfg.max_commit_count = atoi(value); |
172 | else if (!strcmp(name, "scan-path")) |
178 | else if (!strcmp(name, "scan-path")) |
173 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
179 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
174 | process_cached_repolist(value); |
180 | process_cached_repolist(value); |
175 | else |
181 | else |
176 | scan_tree(value, repo_config); |
182 | scan_tree(value, repo_config); |
177 | else if (!strcmp(name, "source-filter")) |
183 | else if (!strcmp(name, "source-filter")) |
178 | ctx.cfg.source_filter = new_filter(value, 1); |
184 | ctx.cfg.source_filter = new_filter(value, 1); |
179 | else if (!strcmp(name, "summary-log")) |
185 | else if (!strcmp(name, "summary-log")) |
180 | ctx.cfg.summary_log = atoi(value); |
186 | ctx.cfg.summary_log = atoi(value); |
181 | else if (!strcmp(name, "summary-branches")) |
187 | else if (!strcmp(name, "summary-branches")) |
182 | ctx.cfg.summary_branches = atoi(value); |
188 | ctx.cfg.summary_branches = atoi(value); |
183 | else if (!strcmp(name, "summary-tags")) |
189 | else if (!strcmp(name, "summary-tags")) |
184 | ctx.cfg.summary_tags = atoi(value); |
190 | ctx.cfg.summary_tags = atoi(value); |
| |
191 | else if (!strcmp(name, "side-by-side-diffs")) |
| |
192 | ctx.cfg.ssdiff = atoi(value); |
185 | else if (!strcmp(name, "agefile")) |
193 | else if (!strcmp(name, "agefile")) |
186 | ctx.cfg.agefile = xstrdup(value); |
194 | ctx.cfg.agefile = xstrdup(value); |
187 | else if (!strcmp(name, "renamelimit")) |
195 | else if (!strcmp(name, "renamelimit")) |
188 | ctx.cfg.renamelimit = atoi(value); |
196 | ctx.cfg.renamelimit = atoi(value); |
189 | else if (!strcmp(name, "robots")) |
197 | else if (!strcmp(name, "robots")) |
190 | ctx.cfg.robots = xstrdup(value); |
198 | ctx.cfg.robots = xstrdup(value); |
191 | else if (!strcmp(name, "clone-prefix")) |
199 | else if (!strcmp(name, "clone-prefix")) |
192 | ctx.cfg.clone_prefix = xstrdup(value); |
200 | ctx.cfg.clone_prefix = xstrdup(value); |
193 | else if (!strcmp(name, "local-time")) |
201 | else if (!strcmp(name, "local-time")) |
194 | ctx.cfg.local_time = atoi(value); |
202 | ctx.cfg.local_time = atoi(value); |
195 | else if (!prefixcmp(name, "mimetype.")) |
203 | else if (!prefixcmp(name, "mimetype.")) |
196 | add_mimetype(name + 9, value); |
204 | add_mimetype(name + 9, value); |
@@ -200,24 +208,26 @@ void config_cb(const char *name, const char *value) |
200 | |
208 | |
201 | static void querystring_cb(const char *name, const char *value) |
209 | static void querystring_cb(const char *name, const char *value) |
202 | { |
210 | { |
203 | if (!value) |
211 | if (!value) |
204 | value = ""; |
212 | value = ""; |
205 | |
213 | |
206 | if (!strcmp(name,"r")) { |
214 | if (!strcmp(name,"r")) { |
207 | ctx.qry.repo = xstrdup(value); |
215 | ctx.qry.repo = xstrdup(value); |
208 | ctx.repo = cgit_get_repoinfo(value); |
216 | ctx.repo = cgit_get_repoinfo(value); |
209 | } else if (!strcmp(name, "p")) { |
217 | } else if (!strcmp(name, "p")) { |
210 | ctx.qry.page = xstrdup(value); |
218 | ctx.qry.page = xstrdup(value); |
211 | } else if (!strcmp(name, "url")) { |
219 | } else if (!strcmp(name, "url")) { |
| |
220 | if (*value == '/') |
| |
221 | value++; |
212 | ctx.qry.url = xstrdup(value); |
222 | ctx.qry.url = xstrdup(value); |
213 | cgit_parse_url(value); |
223 | cgit_parse_url(value); |
214 | } else if (!strcmp(name, "qt")) { |
224 | } else if (!strcmp(name, "qt")) { |
215 | ctx.qry.grep = xstrdup(value); |
225 | ctx.qry.grep = xstrdup(value); |
216 | } else if (!strcmp(name, "q")) { |
226 | } else if (!strcmp(name, "q")) { |
217 | ctx.qry.search = xstrdup(value); |
227 | ctx.qry.search = xstrdup(value); |
218 | } else if (!strcmp(name, "h")) { |
228 | } else if (!strcmp(name, "h")) { |
219 | ctx.qry.head = xstrdup(value); |
229 | ctx.qry.head = xstrdup(value); |
220 | ctx.qry.has_symref = 1; |
230 | ctx.qry.has_symref = 1; |
221 | } else if (!strcmp(name, "id")) { |
231 | } else if (!strcmp(name, "id")) { |
222 | ctx.qry.sha1 = xstrdup(value); |
232 | ctx.qry.sha1 = xstrdup(value); |
223 | ctx.qry.has_sha1 = 1; |
233 | ctx.qry.has_sha1 = 1; |
@@ -229,24 +239,26 @@ static void querystring_cb(const char *name, const char *value) |
229 | } else if (!strcmp(name, "path")) { |
239 | } else if (!strcmp(name, "path")) { |
230 | ctx.qry.path = trim_end(value, '/'); |
240 | ctx.qry.path = trim_end(value, '/'); |
231 | } else if (!strcmp(name, "name")) { |
241 | } else if (!strcmp(name, "name")) { |
232 | ctx.qry.name = xstrdup(value); |
242 | ctx.qry.name = xstrdup(value); |
233 | } else if (!strcmp(name, "mimetype")) { |
243 | } else if (!strcmp(name, "mimetype")) { |
234 | ctx.qry.mimetype = xstrdup(value); |
244 | ctx.qry.mimetype = xstrdup(value); |
235 | } else if (!strcmp(name, "s")){ |
245 | } else if (!strcmp(name, "s")){ |
236 | ctx.qry.sort = xstrdup(value); |
246 | ctx.qry.sort = xstrdup(value); |
237 | } else if (!strcmp(name, "showmsg")) { |
247 | } else if (!strcmp(name, "showmsg")) { |
238 | ctx.qry.showmsg = atoi(value); |
248 | ctx.qry.showmsg = atoi(value); |
239 | } else if (!strcmp(name, "period")) { |
249 | } else if (!strcmp(name, "period")) { |
240 | ctx.qry.period = xstrdup(value); |
250 | ctx.qry.period = xstrdup(value); |
| |
251 | } else if (!strcmp(name, "ss")) { |
| |
252 | ctx.qry.ssdiff = atoi(value); |
241 | } |
253 | } |
242 | } |
254 | } |
243 | |
255 | |
244 | char *xstrdupn(const char *str) |
256 | char *xstrdupn(const char *str) |
245 | { |
257 | { |
246 | return (str ? xstrdup(str) : NULL); |
258 | return (str ? xstrdup(str) : NULL); |
247 | } |
259 | } |
248 | |
260 | |
249 | static void prepare_context(struct cgit_context *ctx) |
261 | static void prepare_context(struct cgit_context *ctx) |
250 | { |
262 | { |
251 | memset(ctx, 0, sizeof(*ctx)); |
263 | memset(ctx, 0, sizeof(*ctx)); |
252 | ctx->cfg.agefile = "info/web/last-modified"; |
264 | ctx->cfg.agefile = "info/web/last-modified"; |
@@ -259,35 +271,37 @@ static void prepare_context(struct cgit_context *ctx) |
259 | ctx->cfg.cache_root_ttl = 5; |
271 | ctx->cfg.cache_root_ttl = 5; |
260 | ctx->cfg.cache_scanrc_ttl = 15; |
272 | ctx->cfg.cache_scanrc_ttl = 15; |
261 | ctx->cfg.cache_static_ttl = -1; |
273 | ctx->cfg.cache_static_ttl = -1; |
262 | ctx->cfg.css = "/cgit.css"; |
274 | ctx->cfg.css = "/cgit.css"; |
263 | ctx->cfg.logo = "/cgit.png"; |
275 | ctx->cfg.logo = "/cgit.png"; |
264 | ctx->cfg.local_time = 0; |
276 | ctx->cfg.local_time = 0; |
265 | ctx->cfg.enable_tree_linenumbers = 1; |
277 | ctx->cfg.enable_tree_linenumbers = 1; |
266 | ctx->cfg.max_repo_count = 50; |
278 | ctx->cfg.max_repo_count = 50; |
267 | ctx->cfg.max_commit_count = 50; |
279 | ctx->cfg.max_commit_count = 50; |
268 | ctx->cfg.max_lock_attempts = 5; |
280 | ctx->cfg.max_lock_attempts = 5; |
269 | ctx->cfg.max_msg_len = 80; |
281 | ctx->cfg.max_msg_len = 80; |
270 | ctx->cfg.max_repodesc_len = 80; |
282 | ctx->cfg.max_repodesc_len = 80; |
| |
283 | ctx->cfg.max_blob_size = 0; |
271 | ctx->cfg.max_stats = 0; |
284 | ctx->cfg.max_stats = 0; |
272 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
285 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
273 | ctx->cfg.renamelimit = -1; |
286 | ctx->cfg.renamelimit = -1; |
274 | ctx->cfg.robots = "index, nofollow"; |
287 | ctx->cfg.robots = "index, nofollow"; |
275 | ctx->cfg.root_title = "Git repository browser"; |
288 | ctx->cfg.root_title = "Git repository browser"; |
276 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
289 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
277 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
290 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
278 | ctx->cfg.section = ""; |
291 | ctx->cfg.section = ""; |
279 | ctx->cfg.summary_branches = 10; |
292 | ctx->cfg.summary_branches = 10; |
280 | ctx->cfg.summary_log = 10; |
293 | ctx->cfg.summary_log = 10; |
281 | ctx->cfg.summary_tags = 10; |
294 | ctx->cfg.summary_tags = 10; |
| |
295 | ctx->cfg.ssdiff = 0; |
282 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
296 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
283 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
297 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
284 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
298 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
285 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
299 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
286 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
300 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
287 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
301 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
288 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
302 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
289 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
303 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
290 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
304 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
291 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
305 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
292 | ctx->page.mimetype = "text/html"; |
306 | ctx->page.mimetype = "text/html"; |
293 | ctx->page.charset = PAGE_ENCODING; |
307 | ctx->page.charset = PAGE_ENCODING; |
|