summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c37
-rw-r--r--cgit.h14
-rw-r--r--ui-shared.c51
3 files changed, 63 insertions, 39 deletions
diff --git a/cgit.c b/cgit.c
index bf46b5a..66dd140 100644
--- a/cgit.c
+++ b/cgit.c
@@ -194,86 +194,107 @@ static void querystring_cb(const char *name, const char *value)
194 ctx.qry.has_symref = 1; 194 ctx.qry.has_symref = 1;
195 } else if (!strcmp(name, "id")) { 195 } else if (!strcmp(name, "id")) {
196 ctx.qry.sha1 = xstrdup(value); 196 ctx.qry.sha1 = xstrdup(value);
197 ctx.qry.has_sha1 = 1; 197 ctx.qry.has_sha1 = 1;
198 } else if (!strcmp(name, "id2")) { 198 } else if (!strcmp(name, "id2")) {
199 ctx.qry.sha2 = xstrdup(value); 199 ctx.qry.sha2 = xstrdup(value);
200 ctx.qry.has_sha1 = 1; 200 ctx.qry.has_sha1 = 1;
201 } else if (!strcmp(name, "ofs")) { 201 } else if (!strcmp(name, "ofs")) {
202 ctx.qry.ofs = atoi(value); 202 ctx.qry.ofs = atoi(value);
203 } else if (!strcmp(name, "path")) { 203 } else if (!strcmp(name, "path")) {
204 ctx.qry.path = trim_end(value, '/'); 204 ctx.qry.path = trim_end(value, '/');
205 } else if (!strcmp(name, "name")) { 205 } else if (!strcmp(name, "name")) {
206 ctx.qry.name = xstrdup(value); 206 ctx.qry.name = xstrdup(value);
207 } else if (!strcmp(name, "mimetype")) { 207 } else if (!strcmp(name, "mimetype")) {
208 ctx.qry.mimetype = xstrdup(value); 208 ctx.qry.mimetype = xstrdup(value);
209 } else if (!strcmp(name, "s")){ 209 } else if (!strcmp(name, "s")){
210 ctx.qry.sort = xstrdup(value); 210 ctx.qry.sort = xstrdup(value);
211 } else if (!strcmp(name, "showmsg")) { 211 } else if (!strcmp(name, "showmsg")) {
212 ctx.qry.showmsg = atoi(value); 212 ctx.qry.showmsg = atoi(value);
213 } else if (!strcmp(name, "period")) { 213 } else if (!strcmp(name, "period")) {
214 ctx.qry.period = xstrdup(value); 214 ctx.qry.period = xstrdup(value);
215 } 215 }
216} 216}
217 217
218char *xstrdupn(const char *str)
219{
220 return (str ? xstrdup(str) : NULL);
221}
222
218static void prepare_context(struct cgit_context *ctx) 223static void prepare_context(struct cgit_context *ctx)
219{ 224{
220 memset(ctx, 0, sizeof(ctx)); 225 memset(ctx, 0, sizeof(ctx));
221 ctx->cfg.agefile = "info/web/last-modified"; 226 ctx->cfg.agefile = "info/web/last-modified";
222 ctx->cfg.nocache = 0; 227 ctx->cfg.nocache = 0;
223 ctx->cfg.cache_size = 0; 228 ctx->cfg.cache_size = 0;
224 ctx->cfg.cache_dynamic_ttl = 5; 229 ctx->cfg.cache_dynamic_ttl = 5;
225 ctx->cfg.cache_max_create_time = 5; 230 ctx->cfg.cache_max_create_time = 5;
226 ctx->cfg.cache_repo_ttl = 5; 231 ctx->cfg.cache_repo_ttl = 5;
227 ctx->cfg.cache_root = CGIT_CACHE_ROOT; 232 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
228 ctx->cfg.cache_root_ttl = 5; 233 ctx->cfg.cache_root_ttl = 5;
229 ctx->cfg.cache_static_ttl = -1; 234 ctx->cfg.cache_static_ttl = -1;
230 ctx->cfg.css = "/cgit.css"; 235 ctx->cfg.css = "/cgit.css";
231 ctx->cfg.logo = "/cgit.png"; 236 ctx->cfg.logo = "/cgit.png";
232 ctx->cfg.local_time = 0; 237 ctx->cfg.local_time = 0;
233 ctx->cfg.max_repo_count = 50; 238 ctx->cfg.max_repo_count = 50;
234 ctx->cfg.max_commit_count = 50; 239 ctx->cfg.max_commit_count = 50;
235 ctx->cfg.max_lock_attempts = 5; 240 ctx->cfg.max_lock_attempts = 5;
236 ctx->cfg.max_msg_len = 80; 241 ctx->cfg.max_msg_len = 80;
237 ctx->cfg.max_repodesc_len = 80; 242 ctx->cfg.max_repodesc_len = 80;
238 ctx->cfg.max_stats = 0; 243 ctx->cfg.max_stats = 0;
239 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; 244 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
240 ctx->cfg.renamelimit = -1; 245 ctx->cfg.renamelimit = -1;
241 ctx->cfg.robots = "index, nofollow"; 246 ctx->cfg.robots = "index, nofollow";
242 ctx->cfg.root_title = "Git repository browser"; 247 ctx->cfg.root_title = "Git repository browser";
243 ctx->cfg.root_desc = "a fast webinterface for the git dscm"; 248 ctx->cfg.root_desc = "a fast webinterface for the git dscm";
244 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 249 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
245 ctx->cfg.summary_branches = 10; 250 ctx->cfg.summary_branches = 10;
246 ctx->cfg.summary_log = 10; 251 ctx->cfg.summary_log = 10;
247 ctx->cfg.summary_tags = 10; 252 ctx->cfg.summary_tags = 10;
253 ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
254 ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
255 ctx->env.https = xstrdupn(getenv("HTTPS"));
256 ctx->env.no_http = xstrdupn(getenv("NO_HTTP"));
257 ctx->env.path_info = xstrdupn(getenv("PATH_INFO"));
258 ctx->env.query_string = xstrdupn(getenv("QUERY_STRING"));
259 ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD"));
260 ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME"));
261 ctx->env.server_name = xstrdupn(getenv("SERVER_NAME"));
262 ctx->env.server_port = xstrdupn(getenv("SERVER_PORT"));
248 ctx->page.mimetype = "text/html"; 263 ctx->page.mimetype = "text/html";
249 ctx->page.charset = PAGE_ENCODING; 264 ctx->page.charset = PAGE_ENCODING;
250 ctx->page.filename = NULL; 265 ctx->page.filename = NULL;
251 ctx->page.size = 0; 266 ctx->page.size = 0;
252 ctx->page.modified = time(NULL); 267 ctx->page.modified = time(NULL);
253 ctx->page.expires = ctx->page.modified; 268 ctx->page.expires = ctx->page.modified;
254 ctx->page.etag = NULL; 269 ctx->page.etag = NULL;
255 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); 270 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
271 if (ctx->env.script_name)
272 ctx->cfg.script_name = ctx->env.script_name;
273 if (ctx->env.query_string)
274 ctx->qry.raw = ctx->env.query_string;
275 if (!ctx->env.cgit_config)
276 ctx->env.cgit_config = CGIT_CONFIG;
256} 277}
257 278
258struct refmatch { 279struct refmatch {
259 char *req_ref; 280 char *req_ref;
260 char *first_ref; 281 char *first_ref;
261 int match; 282 int match;
262}; 283};
263 284
264int find_current_ref(const char *refname, const unsigned char *sha1, 285int find_current_ref(const char *refname, const unsigned char *sha1,
265 int flags, void *cb_data) 286 int flags, void *cb_data)
266{ 287{
267 struct refmatch *info; 288 struct refmatch *info;
268 289
269 info = (struct refmatch *)cb_data; 290 info = (struct refmatch *)cb_data;
270 if (!strcmp(refname, info->req_ref)) 291 if (!strcmp(refname, info->req_ref))
271 info->match = 1; 292 info->match = 1;
272 if (!info->first_ref) 293 if (!info->first_ref)
273 info->first_ref = xstrdup(refname); 294 info->first_ref = xstrdup(refname);
274 return info->match; 295 return info->match;
275} 296}
276 297
277char *find_default_branch(struct cgit_repo *repo) 298char *find_default_branch(struct cgit_repo *repo)
278{ 299{
279 struct refmatch info; 300 struct refmatch info;
@@ -404,48 +425,51 @@ void print_repo(struct cgit_repo *repo)
404 printf("\n"); 425 printf("\n");
405} 426}
406 427
407void print_repolist(struct cgit_repolist *list) 428void print_repolist(struct cgit_repolist *list)
408{ 429{
409 int i; 430 int i;
410 431
411 for(i = 0; i < list->count; i++) 432 for(i = 0; i < list->count; i++)
412 print_repo(&list->repos[i]); 433 print_repo(&list->repos[i]);
413} 434}
414 435
415 436
416static void cgit_parse_args(int argc, const char **argv) 437static void cgit_parse_args(int argc, const char **argv)
417{ 438{
418 int i; 439 int i;
419 int scan = 0; 440 int scan = 0;
420 441
421 for (i = 1; i < argc; i++) { 442 for (i = 1; i < argc; i++) {
422 if (!strncmp(argv[i], "--cache=", 8)) { 443 if (!strncmp(argv[i], "--cache=", 8)) {
423 ctx.cfg.cache_root = xstrdup(argv[i]+8); 444 ctx.cfg.cache_root = xstrdup(argv[i]+8);
424 } 445 }
425 if (!strcmp(argv[i], "--nocache")) { 446 if (!strcmp(argv[i], "--nocache")) {
426 ctx.cfg.nocache = 1; 447 ctx.cfg.nocache = 1;
427 } 448 }
449 if (!strcmp(argv[i], "--nohttp")) {
450 ctx.env.no_http = "1";
451 }
428 if (!strncmp(argv[i], "--query=", 8)) { 452 if (!strncmp(argv[i], "--query=", 8)) {
429 ctx.qry.raw = xstrdup(argv[i]+8); 453 ctx.qry.raw = xstrdup(argv[i]+8);
430 } 454 }
431 if (!strncmp(argv[i], "--repo=", 7)) { 455 if (!strncmp(argv[i], "--repo=", 7)) {
432 ctx.qry.repo = xstrdup(argv[i]+7); 456 ctx.qry.repo = xstrdup(argv[i]+7);
433 } 457 }
434 if (!strncmp(argv[i], "--page=", 7)) { 458 if (!strncmp(argv[i], "--page=", 7)) {
435 ctx.qry.page = xstrdup(argv[i]+7); 459 ctx.qry.page = xstrdup(argv[i]+7);
436 } 460 }
437 if (!strncmp(argv[i], "--head=", 7)) { 461 if (!strncmp(argv[i], "--head=", 7)) {
438 ctx.qry.head = xstrdup(argv[i]+7); 462 ctx.qry.head = xstrdup(argv[i]+7);
439 ctx.qry.has_symref = 1; 463 ctx.qry.has_symref = 1;
440 } 464 }
441 if (!strncmp(argv[i], "--sha1=", 7)) { 465 if (!strncmp(argv[i], "--sha1=", 7)) {
442 ctx.qry.sha1 = xstrdup(argv[i]+7); 466 ctx.qry.sha1 = xstrdup(argv[i]+7);
443 ctx.qry.has_sha1 = 1; 467 ctx.qry.has_sha1 = 1;
444 } 468 }
445 if (!strncmp(argv[i], "--ofs=", 6)) { 469 if (!strncmp(argv[i], "--ofs=", 6)) {
446 ctx.qry.ofs = atoi(argv[i]+6); 470 ctx.qry.ofs = atoi(argv[i]+6);
447 } 471 }
448 if (!strncmp(argv[i], "--scan-tree=", 12)) { 472 if (!strncmp(argv[i], "--scan-tree=", 12)) {
449 scan++; 473 scan++;
450 scan_tree(argv[i] + 12); 474 scan_tree(argv[i] + 12);
451 } 475 }
@@ -456,83 +480,76 @@ static void cgit_parse_args(int argc, const char **argv)
456 print_repolist(&cgit_repolist); 480 print_repolist(&cgit_repolist);
457 exit(0); 481 exit(0);
458 } 482 }
459} 483}
460 484
461static int calc_ttl() 485static int calc_ttl()
462{ 486{
463 if (!ctx.repo) 487 if (!ctx.repo)
464 return ctx.cfg.cache_root_ttl; 488 return ctx.cfg.cache_root_ttl;
465 489
466 if (!ctx.qry.page) 490 if (!ctx.qry.page)
467 return ctx.cfg.cache_repo_ttl; 491 return ctx.cfg.cache_repo_ttl;
468 492
469 if (ctx.qry.has_symref) 493 if (ctx.qry.has_symref)
470 return ctx.cfg.cache_dynamic_ttl; 494 return ctx.cfg.cache_dynamic_ttl;
471 495
472 if (ctx.qry.has_sha1) 496 if (ctx.qry.has_sha1)
473 return ctx.cfg.cache_static_ttl; 497 return ctx.cfg.cache_static_ttl;
474 498
475 return ctx.cfg.cache_repo_ttl; 499 return ctx.cfg.cache_repo_ttl;
476} 500}
477 501
478int main(int argc, const char **argv) 502int main(int argc, const char **argv)
479{ 503{
480 const char *cgit_config_env = getenv("CGIT_CONFIG");
481 const char *method = getenv("REQUEST_METHOD");
482 const char *path; 504 const char *path;
483 char *qry; 505 char *qry;
484 int err, ttl; 506 int err, ttl;
485 507
486 prepare_context(&ctx); 508 prepare_context(&ctx);
487 cgit_repolist.length = 0; 509 cgit_repolist.length = 0;
488 cgit_repolist.count = 0; 510 cgit_repolist.count = 0;
489 cgit_repolist.repos = NULL; 511 cgit_repolist.repos = NULL;
490 512
491 if (getenv("SCRIPT_NAME"))
492 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
493 if (getenv("QUERY_STRING"))
494 ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
495 cgit_parse_args(argc, argv); 513 cgit_parse_args(argc, argv);
496 parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, 514 parse_configfile(ctx.env.cgit_config, config_cb);
497 config_cb);
498 ctx.repo = NULL; 515 ctx.repo = NULL;
499 http_parse_querystring(ctx.qry.raw, querystring_cb); 516 http_parse_querystring(ctx.qry.raw, querystring_cb);
500 517
501 /* If virtual-root isn't specified in cgitrc, lets pretend 518 /* If virtual-root isn't specified in cgitrc, lets pretend
502 * that virtual-root equals SCRIPT_NAME. 519 * that virtual-root equals SCRIPT_NAME.
503 */ 520 */
504 if (!ctx.cfg.virtual_root) 521 if (!ctx.cfg.virtual_root)
505 ctx.cfg.virtual_root = ctx.cfg.script_name; 522 ctx.cfg.virtual_root = ctx.cfg.script_name;
506 523
507 /* If no url parameter is specified on the querystring, lets 524 /* If no url parameter is specified on the querystring, lets
508 * use PATH_INFO as url. This allows cgit to work with virtual 525 * use PATH_INFO as url. This allows cgit to work with virtual
509 * urls without the need for rewriterules in the webserver (as 526 * urls without the need for rewriterules in the webserver (as
510 * long as PATH_INFO is included in the cache lookup key). 527 * long as PATH_INFO is included in the cache lookup key).
511 */ 528 */
512 path = getenv("PATH_INFO"); 529 path = ctx.env.path_info;
513 if (!ctx.qry.url && path) { 530 if (!ctx.qry.url && path) {
514 if (path[0] == '/') 531 if (path[0] == '/')
515 path++; 532 path++;
516 ctx.qry.url = xstrdup(path); 533 ctx.qry.url = xstrdup(path);
517 if (ctx.qry.raw) { 534 if (ctx.qry.raw) {
518 qry = ctx.qry.raw; 535 qry = ctx.qry.raw;
519 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); 536 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
520 free(qry); 537 free(qry);
521 } else 538 } else
522 ctx.qry.raw = ctx.qry.url; 539 ctx.qry.raw = ctx.qry.url;
523 cgit_parse_url(ctx.qry.url); 540 cgit_parse_url(ctx.qry.url);
524 } 541 }
525 542
526 ttl = calc_ttl(); 543 ttl = calc_ttl();
527 ctx.page.expires += ttl*60; 544 ctx.page.expires += ttl*60;
528 if (method && !strcmp(method, "HEAD")) 545 if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
529 ctx.cfg.nocache = 1; 546 ctx.cfg.nocache = 1;
530 if (ctx.cfg.nocache) 547 if (ctx.cfg.nocache)
531 ctx.cfg.cache_size = 0; 548 ctx.cfg.cache_size = 0;
532 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, 549 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
533 ctx.qry.raw, ttl, process_request, &ctx); 550 ctx.qry.raw, ttl, process_request, &ctx);
534 if (err) 551 if (err)
535 cgit_print_error(fmt("Error processing page: %s (%d)", 552 cgit_print_error(fmt("Error processing page: %s (%d)",
536 strerror(err), err)); 553 strerror(err), err));
537 return err; 554 return err;
538} 555}
diff --git a/cgit.h b/cgit.h
index 4c854ea..d90ccdc 100644
--- a/cgit.h
+++ b/cgit.h
@@ -186,49 +186,63 @@ struct cgit_config {
186 int renamelimit; 186 int renamelimit;
187 int snapshots; 187 int snapshots;
188 int summary_branches; 188 int summary_branches;
189 int summary_log; 189 int summary_log;
190 int summary_tags; 190 int summary_tags;
191 struct string_list mimetypes; 191 struct string_list mimetypes;
192 struct cgit_filter *about_filter; 192 struct cgit_filter *about_filter;
193 struct cgit_filter *commit_filter; 193 struct cgit_filter *commit_filter;
194 struct cgit_filter *source_filter; 194 struct cgit_filter *source_filter;
195}; 195};
196 196
197struct cgit_page { 197struct cgit_page {
198 time_t modified; 198 time_t modified;
199 time_t expires; 199 time_t expires;
200 size_t size; 200 size_t size;
201 char *mimetype; 201 char *mimetype;
202 char *charset; 202 char *charset;
203 char *filename; 203 char *filename;
204 char *etag; 204 char *etag;
205 char *title; 205 char *title;
206 int status; 206 int status;
207 char *statusmsg; 207 char *statusmsg;
208}; 208};
209 209
210struct cgit_environment {
211 char *cgit_config;
212 char *http_host;
213 char *https;
214 char *no_http;
215 char *path_info;
216 char *query_string;
217 char *request_method;
218 char *script_name;
219 char *server_name;
220 char *server_port;
221};
222
210struct cgit_context { 223struct cgit_context {
224 struct cgit_environment env;
211 struct cgit_query qry; 225 struct cgit_query qry;
212 struct cgit_config cfg; 226 struct cgit_config cfg;
213 struct cgit_repo *repo; 227 struct cgit_repo *repo;
214 struct cgit_page page; 228 struct cgit_page page;
215}; 229};
216 230
217struct cgit_snapshot_format { 231struct cgit_snapshot_format {
218 const char *suffix; 232 const char *suffix;
219 const char *mimetype; 233 const char *mimetype;
220 write_archive_fn_t write_func; 234 write_archive_fn_t write_func;
221 int bit; 235 int bit;
222}; 236};
223 237
224extern const char *cgit_version; 238extern const char *cgit_version;
225 239
226extern struct cgit_repolist cgit_repolist; 240extern struct cgit_repolist cgit_repolist;
227extern struct cgit_context ctx; 241extern struct cgit_context ctx;
228extern const struct cgit_snapshot_format cgit_snapshot_formats[]; 242extern const struct cgit_snapshot_format cgit_snapshot_formats[];
229 243
230extern struct cgit_repo *cgit_add_repo(const char *url); 244extern struct cgit_repo *cgit_add_repo(const char *url);
231extern struct cgit_repo *cgit_get_repoinfo(const char *url); 245extern struct cgit_repo *cgit_get_repoinfo(const char *url);
232extern void cgit_repo_config_cb(const char *name, const char *value); 246extern void cgit_repo_config_cb(const char *name, const char *value);
233 247
234extern int chk_zero(int result, char *msg); 248extern int chk_zero(int result, char *msg);
diff --git a/ui-shared.c b/ui-shared.c
index 015c52b..cf06511 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -15,75 +15,63 @@ const char cgit_doctype[] =
15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; 15" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
16 16
17static char *http_date(time_t t) 17static char *http_date(time_t t)
18{ 18{
19 static char day[][4] = 19 static char day[][4] =
20 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; 20 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
21 static char month[][4] = 21 static char month[][4] =
22 {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 22 {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
23 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; 23 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
24 struct tm *tm = gmtime(&t); 24 struct tm *tm = gmtime(&t);
25 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], 25 return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
26 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, 26 tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
27 tm->tm_hour, tm->tm_min, tm->tm_sec); 27 tm->tm_hour, tm->tm_min, tm->tm_sec);
28} 28}
29 29
30void cgit_print_error(char *msg) 30void cgit_print_error(char *msg)
31{ 31{
32 html("<div class='error'>"); 32 html("<div class='error'>");
33 html_txt(msg); 33 html_txt(msg);
34 html("</div>\n"); 34 html("</div>\n");
35} 35}
36 36
37char *cgit_httpscheme() 37char *cgit_httpscheme()
38{ 38{
39 char *https; 39 if (ctx.env.https && !strcmp(ctx.env.https, "on"))
40
41 https = getenv("HTTPS");
42 if (https != NULL && strcmp(https, "on") == 0)
43 return "https://"; 40 return "https://";
44 else 41 else
45 return "http://"; 42 return "http://";
46} 43}
47 44
48char *cgit_hosturl() 45char *cgit_hosturl()
49{ 46{
50 char *host, *port; 47 if (ctx.env.http_host)
51 48 return ctx.env.http_host;
52 host = getenv("HTTP_HOST"); 49 if (!ctx.env.server_name)
53 if (host) { 50 return NULL;
54 host = xstrdup(host); 51 if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
55 } else { 52 return ctx.env.server_name;
56 host = getenv("SERVER_NAME"); 53 return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));
57 if (!host)
58 return NULL;
59 port = getenv("SERVER_PORT");
60 if (port && atoi(port) != 80)
61 host = xstrdup(fmt("%s:%d", host, atoi(port)));
62 else
63 host = xstrdup(host);
64 }
65 return host;
66} 54}
67 55
68char *cgit_rooturl() 56char *cgit_rooturl()
69{ 57{
70 if (ctx.cfg.virtual_root) 58 if (ctx.cfg.virtual_root)
71 return fmt("%s/", ctx.cfg.virtual_root); 59 return fmt("%s/", ctx.cfg.virtual_root);
72 else 60 else
73 return ctx.cfg.script_name; 61 return ctx.cfg.script_name;
74} 62}
75 63
76char *cgit_repourl(const char *reponame) 64char *cgit_repourl(const char *reponame)
77{ 65{
78 if (ctx.cfg.virtual_root) { 66 if (ctx.cfg.virtual_root) {
79 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame); 67 return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
80 } else { 68 } else {
81 return fmt("?r=%s", reponame); 69 return fmt("?r=%s", reponame);
82 } 70 }
83} 71}
84 72
85char *cgit_fileurl(const char *reponame, const char *pagename, 73char *cgit_fileurl(const char *reponame, const char *pagename,
86 const char *filename, const char *query) 74 const char *filename, const char *query)
87{ 75{
88 char *tmp; 76 char *tmp;
89 char *delim; 77 char *delim;
@@ -446,127 +434,132 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
446 secs * 1.0 / TM_HOUR); 434 secs * 1.0 / TM_HOUR);
447 return; 435 return;
448 } 436 }
449 if (secs < TM_WEEK * 2) { 437 if (secs < TM_WEEK * 2) {
450 htmlf("<span class='age-days'>%.0f days</span>", 438 htmlf("<span class='age-days'>%.0f days</span>",
451 secs * 1.0 / TM_DAY); 439 secs * 1.0 / TM_DAY);
452 return; 440 return;
453 } 441 }
454 if (secs < TM_MONTH * 2) { 442 if (secs < TM_MONTH * 2) {
455 htmlf("<span class='age-weeks'>%.0f weeks</span>", 443 htmlf("<span class='age-weeks'>%.0f weeks</span>",
456 secs * 1.0 / TM_WEEK); 444 secs * 1.0 / TM_WEEK);
457 return; 445 return;
458 } 446 }
459 if (secs < TM_YEAR * 2) { 447 if (secs < TM_YEAR * 2) {
460 htmlf("<span class='age-months'>%.0f months</span>", 448 htmlf("<span class='age-months'>%.0f months</span>",
461 secs * 1.0 / TM_MONTH); 449 secs * 1.0 / TM_MONTH);
462 return; 450 return;
463 } 451 }
464 htmlf("<span class='age-years'>%.0f years</span>", 452 htmlf("<span class='age-years'>%.0f years</span>",
465 secs * 1.0 / TM_YEAR); 453 secs * 1.0 / TM_YEAR);
466} 454}
467 455
468void cgit_print_http_headers(struct cgit_context *ctx) 456void cgit_print_http_headers(struct cgit_context *ctx)
469{ 457{
470 const char *method = getenv("REQUEST_METHOD"); 458 if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
471
472 if (ctx->cfg.embedded)
473 return; 459 return;
474 460
475 if (ctx->page.status) 461 if (ctx->page.status)
476 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); 462 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
477 if (ctx->page.mimetype && ctx->page.charset) 463 if (ctx->page.mimetype && ctx->page.charset)
478 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, 464 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
479 ctx->page.charset); 465 ctx->page.charset);
480 else if (ctx->page.mimetype) 466 else if (ctx->page.mimetype)
481 htmlf("Content-Type: %s\n", ctx->page.mimetype); 467 htmlf("Content-Type: %s\n", ctx->page.mimetype);
482 if (ctx->page.size) 468 if (ctx->page.size)
483 htmlf("Content-Length: %ld\n", ctx->page.size); 469 htmlf("Content-Length: %ld\n", ctx->page.size);
484 if (ctx->page.filename) 470 if (ctx->page.filename)
485 htmlf("Content-Disposition: inline; filename=\"%s\"\n", 471 htmlf("Content-Disposition: inline; filename=\"%s\"\n",
486 ctx->page.filename); 472 ctx->page.filename);
487 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); 473 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
488 htmlf("Expires: %s\n", http_date(ctx->page.expires)); 474 htmlf("Expires: %s\n", http_date(ctx->page.expires));
489 if (ctx->page.etag) 475 if (ctx->page.etag)
490 htmlf("ETag: \"%s\"\n", ctx->page.etag); 476 htmlf("ETag: \"%s\"\n", ctx->page.etag);
491 html("\n"); 477 html("\n");
492 if (method && !strcmp(method, "HEAD")) 478 if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
493 exit(0); 479 exit(0);
494} 480}
495 481
496void cgit_print_docstart(struct cgit_context *ctx) 482void cgit_print_docstart(struct cgit_context *ctx)
497{ 483{
498 if (ctx->cfg.embedded) 484 if (ctx->cfg.embedded) {
485 if (ctx->cfg.header)
486 html_include(ctx->cfg.header);
499 return; 487 return;
488 }
500 489
501 char *host = cgit_hosturl(); 490 char *host = cgit_hosturl();
502 html(cgit_doctype); 491 html(cgit_doctype);
503 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 492 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
504 html("<head>\n"); 493 html("<head>\n");
505 html("<title>"); 494 html("<title>");
506 html_txt(ctx->page.title); 495 html_txt(ctx->page.title);
507 html("</title>\n"); 496 html("</title>\n");
508 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 497 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
509 if (ctx->cfg.robots && *ctx->cfg.robots) 498 if (ctx->cfg.robots && *ctx->cfg.robots)
510 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); 499 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
511 html("<link rel='stylesheet' type='text/css' href='"); 500 html("<link rel='stylesheet' type='text/css' href='");
512 html_attr(ctx->cfg.css); 501 html_attr(ctx->cfg.css);
513 html("'/>\n"); 502 html("'/>\n");
514 if (ctx->cfg.favicon) { 503 if (ctx->cfg.favicon) {
515 html("<link rel='shortcut icon' href='"); 504 html("<link rel='shortcut icon' href='");
516 html_attr(ctx->cfg.favicon); 505 html_attr(ctx->cfg.favicon);
517 html("'/>\n"); 506 html("'/>\n");
518 } 507 }
519 if (host && ctx->repo) { 508 if (host && ctx->repo) {
520 html("<link rel='alternate' title='Atom feed' href='"); 509 html("<link rel='alternate' title='Atom feed' href='");
521 html(cgit_httpscheme()); 510 html(cgit_httpscheme());
522 html_attr(cgit_hosturl()); 511 html_attr(cgit_hosturl());
523 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, 512 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
524 fmt("h=%s", ctx->qry.head))); 513 fmt("h=%s", ctx->qry.head)));
525 html("' type='application/atom+xml'/>\n"); 514 html("' type='application/atom+xml'/>\n");
526 } 515 }
527 if (ctx->cfg.head_include) 516 if (ctx->cfg.head_include)
528 html_include(ctx->cfg.head_include); 517 html_include(ctx->cfg.head_include);
529 html("</head>\n"); 518 html("</head>\n");
530 html("<body>\n"); 519 html("<body>\n");
531 if (ctx->cfg.header) 520 if (ctx->cfg.header)
532 html_include(ctx->cfg.header); 521 html_include(ctx->cfg.header);
533} 522}
534 523
535void cgit_print_docend() 524void cgit_print_docend()
536{ 525{
537 html("</div>"); 526 html("</div> <!-- class=content -->\n");
527 if (ctx.cfg.embedded) {
528 html("</div> <!-- id=cgit -->\n");
529 if (ctx.cfg.footer)
530 html_include(ctx.cfg.footer);
531 return;
532 }
538 if (ctx.cfg.footer) 533 if (ctx.cfg.footer)
539 html_include(ctx.cfg.footer); 534 html_include(ctx.cfg.footer);
540 else { 535 else {
541 htmlf("<div class='footer'>generated by cgit %s at ", 536 htmlf("<div class='footer'>generated by cgit %s at ",
542 cgit_version); 537 cgit_version);
543 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); 538 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
544 html("</div>\n"); 539 html("</div>\n");
545 } 540 }
546 html("</div>"); 541 html("</div> <!-- id=cgit -->\n");
547 if (ctx.cfg.embedded)
548 return;
549 html("</body>\n</html>\n"); 542 html("</body>\n</html>\n");
550} 543}
551 544
552int print_branch_option(const char *refname, const unsigned char *sha1, 545int print_branch_option(const char *refname, const unsigned char *sha1,
553 int flags, void *cb_data) 546 int flags, void *cb_data)
554{ 547{
555 char *name = (char *)refname; 548 char *name = (char *)refname;
556 html_option(name, name, ctx.qry.head); 549 html_option(name, name, ctx.qry.head);
557 return 0; 550 return 0;
558} 551}
559 552
560int print_archive_ref(const char *refname, const unsigned char *sha1, 553int print_archive_ref(const char *refname, const unsigned char *sha1,
561 int flags, void *cb_data) 554 int flags, void *cb_data)
562{ 555{
563 struct tag *tag; 556 struct tag *tag;
564 struct taginfo *info; 557 struct taginfo *info;
565 struct object *obj; 558 struct object *obj;
566 char buf[256], *url; 559 char buf[256], *url;
567 unsigned char fileid[20]; 560 unsigned char fileid[20];
568 int *header = (int *)cb_data; 561 int *header = (int *)cb_data;
569 562
570 if (prefixcmp(refname, "refs/archives")) 563 if (prefixcmp(refname, "refs/archives"))
571 return 0; 564 return 0;
572 strncpy(buf, refname+14, sizeof(buf)); 565 strncpy(buf, refname+14, sizeof(buf));