summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index 6bb712d..6c7e811 100644
--- a/cgit.c
+++ b/cgit.c
@@ -155,193 +155,193 @@ void config_cb(const char *name, const char *value)
155 ctx.cfg.cache_static_ttl = atoi(value); 155 ctx.cfg.cache_static_ttl = atoi(value);
156 else if (!strcmp(name, "cache-dynamic-ttl")) 156 else if (!strcmp(name, "cache-dynamic-ttl"))
157 ctx.cfg.cache_dynamic_ttl = atoi(value); 157 ctx.cfg.cache_dynamic_ttl = atoi(value);
158 else if (!strcmp(name, "about-filter")) 158 else if (!strcmp(name, "about-filter"))
159 ctx.cfg.about_filter = new_filter(value, 0); 159 ctx.cfg.about_filter = new_filter(value, 0);
160 else if (!strcmp(name, "commit-filter")) 160 else if (!strcmp(name, "commit-filter"))
161 ctx.cfg.commit_filter = new_filter(value, 0); 161 ctx.cfg.commit_filter = new_filter(value, 0);
162 else if (!strcmp(name, "embedded")) 162 else if (!strcmp(name, "embedded"))
163 ctx.cfg.embedded = atoi(value); 163 ctx.cfg.embedded = atoi(value);
164 else if (!strcmp(name, "max-message-length")) 164 else if (!strcmp(name, "max-message-length"))
165 ctx.cfg.max_msg_len = atoi(value); 165 ctx.cfg.max_msg_len = atoi(value);
166 else if (!strcmp(name, "max-repodesc-length")) 166 else if (!strcmp(name, "max-repodesc-length"))
167 ctx.cfg.max_repodesc_len = atoi(value); 167 ctx.cfg.max_repodesc_len = atoi(value);
168 else if (!strcmp(name, "max-repo-count")) 168 else if (!strcmp(name, "max-repo-count"))
169 ctx.cfg.max_repo_count = atoi(value); 169 ctx.cfg.max_repo_count = atoi(value);
170 else if (!strcmp(name, "max-commit-count")) 170 else if (!strcmp(name, "max-commit-count"))
171 ctx.cfg.max_commit_count = atoi(value); 171 ctx.cfg.max_commit_count = atoi(value);
172 else if (!strcmp(name, "scan-path")) 172 else if (!strcmp(name, "scan-path"))
173 if (!ctx.cfg.nocache && ctx.cfg.cache_size) 173 if (!ctx.cfg.nocache && ctx.cfg.cache_size)
174 process_cached_repolist(value); 174 process_cached_repolist(value);
175 else 175 else
176 scan_tree(value, repo_config); 176 scan_tree(value, repo_config);
177 else if (!strcmp(name, "source-filter")) 177 else if (!strcmp(name, "source-filter"))
178 ctx.cfg.source_filter = new_filter(value, 1); 178 ctx.cfg.source_filter = new_filter(value, 1);
179 else if (!strcmp(name, "summary-log")) 179 else if (!strcmp(name, "summary-log"))
180 ctx.cfg.summary_log = atoi(value); 180 ctx.cfg.summary_log = atoi(value);
181 else if (!strcmp(name, "summary-branches")) 181 else if (!strcmp(name, "summary-branches"))
182 ctx.cfg.summary_branches = atoi(value); 182 ctx.cfg.summary_branches = atoi(value);
183 else if (!strcmp(name, "summary-tags")) 183 else if (!strcmp(name, "summary-tags"))
184 ctx.cfg.summary_tags = atoi(value); 184 ctx.cfg.summary_tags = atoi(value);
185 else if (!strcmp(name, "agefile")) 185 else if (!strcmp(name, "agefile"))
186 ctx.cfg.agefile = xstrdup(value); 186 ctx.cfg.agefile = xstrdup(value);
187 else if (!strcmp(name, "renamelimit")) 187 else if (!strcmp(name, "renamelimit"))
188 ctx.cfg.renamelimit = atoi(value); 188 ctx.cfg.renamelimit = atoi(value);
189 else if (!strcmp(name, "robots")) 189 else if (!strcmp(name, "robots"))
190 ctx.cfg.robots = xstrdup(value); 190 ctx.cfg.robots = xstrdup(value);
191 else if (!strcmp(name, "clone-prefix")) 191 else if (!strcmp(name, "clone-prefix"))
192 ctx.cfg.clone_prefix = xstrdup(value); 192 ctx.cfg.clone_prefix = xstrdup(value);
193 else if (!strcmp(name, "local-time")) 193 else if (!strcmp(name, "local-time"))
194 ctx.cfg.local_time = atoi(value); 194 ctx.cfg.local_time = atoi(value);
195 else if (!prefixcmp(name, "mimetype.")) 195 else if (!prefixcmp(name, "mimetype."))
196 add_mimetype(name + 9, value); 196 add_mimetype(name + 9, value);
197 else if (!strcmp(name, "include")) 197 else if (!strcmp(name, "include"))
198 parse_configfile(value, config_cb); 198 parse_configfile(value, config_cb);
199} 199}
200 200
201static void querystring_cb(const char *name, const char *value) 201static void querystring_cb(const char *name, const char *value)
202{ 202{
203 if (!value) 203 if (!value)
204 value = ""; 204 value = "";
205 205
206 if (!strcmp(name,"r")) { 206 if (!strcmp(name,"r")) {
207 ctx.qry.repo = xstrdup(value); 207 ctx.qry.repo = xstrdup(value);
208 ctx.repo = cgit_get_repoinfo(value); 208 ctx.repo = cgit_get_repoinfo(value);
209 } else if (!strcmp(name, "p")) { 209 } else if (!strcmp(name, "p")) {
210 ctx.qry.page = xstrdup(value); 210 ctx.qry.page = xstrdup(value);
211 } else if (!strcmp(name, "url")) { 211 } else if (!strcmp(name, "url")) {
212 ctx.qry.url = xstrdup(value); 212 ctx.qry.url = xstrdup(value);
213 cgit_parse_url(value); 213 cgit_parse_url(value);
214 } else if (!strcmp(name, "qt")) { 214 } else if (!strcmp(name, "qt")) {
215 ctx.qry.grep = xstrdup(value); 215 ctx.qry.grep = xstrdup(value);
216 } else if (!strcmp(name, "q")) { 216 } else if (!strcmp(name, "q")) {
217 ctx.qry.search = xstrdup(value); 217 ctx.qry.search = xstrdup(value);
218 } else if (!strcmp(name, "h")) { 218 } else if (!strcmp(name, "h")) {
219 ctx.qry.head = xstrdup(value); 219 ctx.qry.head = xstrdup(value);
220 ctx.qry.has_symref = 1; 220 ctx.qry.has_symref = 1;
221 } else if (!strcmp(name, "id")) { 221 } else if (!strcmp(name, "id")) {
222 ctx.qry.sha1 = xstrdup(value); 222 ctx.qry.sha1 = xstrdup(value);
223 ctx.qry.has_sha1 = 1; 223 ctx.qry.has_sha1 = 1;
224 } else if (!strcmp(name, "id2")) { 224 } else if (!strcmp(name, "id2")) {
225 ctx.qry.sha2 = xstrdup(value); 225 ctx.qry.sha2 = xstrdup(value);
226 ctx.qry.has_sha1 = 1; 226 ctx.qry.has_sha1 = 1;
227 } else if (!strcmp(name, "ofs")) { 227 } else if (!strcmp(name, "ofs")) {
228 ctx.qry.ofs = atoi(value); 228 ctx.qry.ofs = atoi(value);
229 } else if (!strcmp(name, "path")) { 229 } else if (!strcmp(name, "path")) {
230 ctx.qry.path = trim_end(value, '/'); 230 ctx.qry.path = trim_end(value, '/');
231 } else if (!strcmp(name, "name")) { 231 } else if (!strcmp(name, "name")) {
232 ctx.qry.name = xstrdup(value); 232 ctx.qry.name = xstrdup(value);
233 } else if (!strcmp(name, "mimetype")) { 233 } else if (!strcmp(name, "mimetype")) {
234 ctx.qry.mimetype = xstrdup(value); 234 ctx.qry.mimetype = xstrdup(value);
235 } else if (!strcmp(name, "s")){ 235 } else if (!strcmp(name, "s")){
236 ctx.qry.sort = xstrdup(value); 236 ctx.qry.sort = xstrdup(value);
237 } else if (!strcmp(name, "showmsg")) { 237 } else if (!strcmp(name, "showmsg")) {
238 ctx.qry.showmsg = atoi(value); 238 ctx.qry.showmsg = atoi(value);
239 } else if (!strcmp(name, "period")) { 239 } else if (!strcmp(name, "period")) {
240 ctx.qry.period = xstrdup(value); 240 ctx.qry.period = xstrdup(value);
241 } 241 }
242} 242}
243 243
244char *xstrdupn(const char *str) 244char *xstrdupn(const char *str)
245{ 245{
246 return (str ? xstrdup(str) : NULL); 246 return (str ? xstrdup(str) : NULL);
247} 247}
248 248
249static void prepare_context(struct cgit_context *ctx) 249static void prepare_context(struct cgit_context *ctx)
250{ 250{
251 memset(ctx, 0, sizeof(ctx)); 251 memset(ctx, 0, sizeof(*ctx));
252 ctx->cfg.agefile = "info/web/last-modified"; 252 ctx->cfg.agefile = "info/web/last-modified";
253 ctx->cfg.nocache = 0; 253 ctx->cfg.nocache = 0;
254 ctx->cfg.cache_size = 0; 254 ctx->cfg.cache_size = 0;
255 ctx->cfg.cache_dynamic_ttl = 5; 255 ctx->cfg.cache_dynamic_ttl = 5;
256 ctx->cfg.cache_max_create_time = 5; 256 ctx->cfg.cache_max_create_time = 5;
257 ctx->cfg.cache_repo_ttl = 5; 257 ctx->cfg.cache_repo_ttl = 5;
258 ctx->cfg.cache_root = CGIT_CACHE_ROOT; 258 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
259 ctx->cfg.cache_root_ttl = 5; 259 ctx->cfg.cache_root_ttl = 5;
260 ctx->cfg.cache_scanrc_ttl = 15; 260 ctx->cfg.cache_scanrc_ttl = 15;
261 ctx->cfg.cache_static_ttl = -1; 261 ctx->cfg.cache_static_ttl = -1;
262 ctx->cfg.css = "/cgit.css"; 262 ctx->cfg.css = "/cgit.css";
263 ctx->cfg.logo = "/cgit.png"; 263 ctx->cfg.logo = "/cgit.png";
264 ctx->cfg.local_time = 0; 264 ctx->cfg.local_time = 0;
265 ctx->cfg.enable_tree_linenumbers = 1; 265 ctx->cfg.enable_tree_linenumbers = 1;
266 ctx->cfg.max_repo_count = 50; 266 ctx->cfg.max_repo_count = 50;
267 ctx->cfg.max_commit_count = 50; 267 ctx->cfg.max_commit_count = 50;
268 ctx->cfg.max_lock_attempts = 5; 268 ctx->cfg.max_lock_attempts = 5;
269 ctx->cfg.max_msg_len = 80; 269 ctx->cfg.max_msg_len = 80;
270 ctx->cfg.max_repodesc_len = 80; 270 ctx->cfg.max_repodesc_len = 80;
271 ctx->cfg.max_stats = 0; 271 ctx->cfg.max_stats = 0;
272 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; 272 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
273 ctx->cfg.renamelimit = -1; 273 ctx->cfg.renamelimit = -1;
274 ctx->cfg.robots = "index, nofollow"; 274 ctx->cfg.robots = "index, nofollow";
275 ctx->cfg.root_title = "Git repository browser"; 275 ctx->cfg.root_title = "Git repository browser";
276 ctx->cfg.root_desc = "a fast webinterface for the git dscm"; 276 ctx->cfg.root_desc = "a fast webinterface for the git dscm";
277 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 277 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
278 ctx->cfg.section = ""; 278 ctx->cfg.section = "";
279 ctx->cfg.summary_branches = 10; 279 ctx->cfg.summary_branches = 10;
280 ctx->cfg.summary_log = 10; 280 ctx->cfg.summary_log = 10;
281 ctx->cfg.summary_tags = 10; 281 ctx->cfg.summary_tags = 10;
282 ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); 282 ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
283 ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); 283 ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
284 ctx->env.https = xstrdupn(getenv("HTTPS")); 284 ctx->env.https = xstrdupn(getenv("HTTPS"));
285 ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); 285 ctx->env.no_http = xstrdupn(getenv("NO_HTTP"));
286 ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); 286 ctx->env.path_info = xstrdupn(getenv("PATH_INFO"));
287 ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); 287 ctx->env.query_string = xstrdupn(getenv("QUERY_STRING"));
288 ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); 288 ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD"));
289 ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); 289 ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME"));
290 ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); 290 ctx->env.server_name = xstrdupn(getenv("SERVER_NAME"));
291 ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); 291 ctx->env.server_port = xstrdupn(getenv("SERVER_PORT"));
292 ctx->page.mimetype = "text/html"; 292 ctx->page.mimetype = "text/html";
293 ctx->page.charset = PAGE_ENCODING; 293 ctx->page.charset = PAGE_ENCODING;
294 ctx->page.filename = NULL; 294 ctx->page.filename = NULL;
295 ctx->page.size = 0; 295 ctx->page.size = 0;
296 ctx->page.modified = time(NULL); 296 ctx->page.modified = time(NULL);
297 ctx->page.expires = ctx->page.modified; 297 ctx->page.expires = ctx->page.modified;
298 ctx->page.etag = NULL; 298 ctx->page.etag = NULL;
299 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); 299 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
300 if (ctx->env.script_name) 300 if (ctx->env.script_name)
301 ctx->cfg.script_name = ctx->env.script_name; 301 ctx->cfg.script_name = ctx->env.script_name;
302 if (ctx->env.query_string) 302 if (ctx->env.query_string)
303 ctx->qry.raw = ctx->env.query_string; 303 ctx->qry.raw = ctx->env.query_string;
304 if (!ctx->env.cgit_config) 304 if (!ctx->env.cgit_config)
305 ctx->env.cgit_config = CGIT_CONFIG; 305 ctx->env.cgit_config = CGIT_CONFIG;
306} 306}
307 307
308struct refmatch { 308struct refmatch {
309 char *req_ref; 309 char *req_ref;
310 char *first_ref; 310 char *first_ref;
311 int match; 311 int match;
312}; 312};
313 313
314int find_current_ref(const char *refname, const unsigned char *sha1, 314int find_current_ref(const char *refname, const unsigned char *sha1,
315 int flags, void *cb_data) 315 int flags, void *cb_data)
316{ 316{
317 struct refmatch *info; 317 struct refmatch *info;
318 318
319 info = (struct refmatch *)cb_data; 319 info = (struct refmatch *)cb_data;
320 if (!strcmp(refname, info->req_ref)) 320 if (!strcmp(refname, info->req_ref))
321 info->match = 1; 321 info->match = 1;
322 if (!info->first_ref) 322 if (!info->first_ref)
323 info->first_ref = xstrdup(refname); 323 info->first_ref = xstrdup(refname);
324 return info->match; 324 return info->match;
325} 325}
326 326
327char *find_default_branch(struct cgit_repo *repo) 327char *find_default_branch(struct cgit_repo *repo)
328{ 328{
329 struct refmatch info; 329 struct refmatch info;
330 char *ref; 330 char *ref;
331 331
332 info.req_ref = repo->defbranch; 332 info.req_ref = repo->defbranch;
333 info.first_ref = NULL; 333 info.first_ref = NULL;
334 info.match = 0; 334 info.match = 0;
335 for_each_branch_ref(find_current_ref, &info); 335 for_each_branch_ref(find_current_ref, &info);
336 if (info.match) 336 if (info.match)
337 ref = info.req_ref; 337 ref = info.req_ref;
338 else 338 else
339 ref = info.first_ref; 339 ref = info.first_ref;
340 if (ref) 340 if (ref)
341 ref = xstrdup(ref); 341 ref = xstrdup(ref);
342 return ref; 342 return ref;
343} 343}
344 344
345static int prepare_repo_cmd(struct cgit_context *ctx) 345static int prepare_repo_cmd(struct cgit_context *ctx)
346{ 346{
347 char *tmp; 347 char *tmp;