summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-08-10 06:21:09 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-10 06:21:09 (UTC)
commit60a26272e0ca529407fe6b613f061f04ba585d53 (patch) (unidiff)
treec2b6ee3c19a44bd276043650298229c481ca4535
parente6cd7121edf55c13f04cd5d6fca8f07c4035ce0a (diff)
downloadcgit-60a26272e0ca529407fe6b613f061f04ba585d53.zip
cgit-60a26272e0ca529407fe6b613f061f04ba585d53.tar.gz
cgit-60a26272e0ca529407fe6b613f061f04ba585d53.tar.bz2
Cleanup handling of environment variables
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c33
-rw-r--r--cgit.h13
-rw-r--r--ui-shared.c32
3 files changed, 45 insertions, 33 deletions
diff --git a/cgit.c b/cgit.c
index 7b228af..a92383d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -212,12 +212,17 @@ static void querystring_cb(const char *name, const char *value)
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;
@@ -242,20 +247,35 @@ static void prepare_context(struct cgit_context *ctx)
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.path_info = xstrdupn(getenv("PATH_INFO"));
257 ctx->env.query_string = xstrdupn(getenv("QUERY_STRING"));
258 ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD"));
259 ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME"));
260 ctx->env.server_name = xstrdupn(getenv("SERVER_NAME"));
261 ctx->env.server_port = xstrdupn(getenv("SERVER_PORT"));
248 ctx->page.mimetype = "text/html"; 262 ctx->page.mimetype = "text/html";
249 ctx->page.charset = PAGE_ENCODING; 263 ctx->page.charset = PAGE_ENCODING;
250 ctx->page.filename = NULL; 264 ctx->page.filename = NULL;
251 ctx->page.size = 0; 265 ctx->page.size = 0;
252 ctx->page.modified = time(NULL); 266 ctx->page.modified = time(NULL);
253 ctx->page.expires = ctx->page.modified; 267 ctx->page.expires = ctx->page.modified;
254 ctx->page.etag = NULL; 268 ctx->page.etag = NULL;
255 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); 269 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
270 if (ctx->env.script_name)
271 ctx->cfg.script_name = ctx->env.script_name;
272 if (ctx->env.query_string)
273 ctx->qry.raw = ctx->env.query_string;
274 if (!ctx->env.cgit_config)
275 ctx->env.cgit_config = CGIT_CONFIG;
256} 276}
257 277
258struct refmatch { 278struct refmatch {
259 char *req_ref; 279 char *req_ref;
260 char *first_ref; 280 char *first_ref;
261 int match; 281 int match;
@@ -474,30 +494,23 @@ static int calc_ttl()
474 494
475 return ctx.cfg.cache_repo_ttl; 495 return ctx.cfg.cache_repo_ttl;
476} 496}
477 497
478int main(int argc, const char **argv) 498int main(int argc, const char **argv)
479{ 499{
480 const char *cgit_config_env = getenv("CGIT_CONFIG");
481 const char *method = getenv("REQUEST_METHOD");
482 const char *path; 500 const char *path;
483 char *qry; 501 char *qry;
484 int err, ttl; 502 int err, ttl;
485 503
486 prepare_context(&ctx); 504 prepare_context(&ctx);
487 cgit_repolist.length = 0; 505 cgit_repolist.length = 0;
488 cgit_repolist.count = 0; 506 cgit_repolist.count = 0;
489 cgit_repolist.repos = NULL; 507 cgit_repolist.repos = NULL;
490 508
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); 509 cgit_parse_args(argc, argv);
496 parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, 510 parse_configfile(ctx.env.cgit_config, config_cb);
497 config_cb);
498 ctx.repo = NULL; 511 ctx.repo = NULL;
499 http_parse_querystring(ctx.qry.raw, querystring_cb); 512 http_parse_querystring(ctx.qry.raw, querystring_cb);
500 513
501 /* If virtual-root isn't specified in cgitrc, lets pretend 514 /* If virtual-root isn't specified in cgitrc, lets pretend
502 * that virtual-root equals SCRIPT_NAME. 515 * that virtual-root equals SCRIPT_NAME.
503 */ 516 */
@@ -506,13 +519,13 @@ int main(int argc, const char **argv)
506 519
507 /* If no url parameter is specified on the querystring, lets 520 /* If no url parameter is specified on the querystring, lets
508 * use PATH_INFO as url. This allows cgit to work with virtual 521 * use PATH_INFO as url. This allows cgit to work with virtual
509 * urls without the need for rewriterules in the webserver (as 522 * urls without the need for rewriterules in the webserver (as
510 * long as PATH_INFO is included in the cache lookup key). 523 * long as PATH_INFO is included in the cache lookup key).
511 */ 524 */
512 path = getenv("PATH_INFO"); 525 path = ctx.env.path_info;
513 if (!ctx.qry.url && path) { 526 if (!ctx.qry.url && path) {
514 if (path[0] == '/') 527 if (path[0] == '/')
515 path++; 528 path++;
516 ctx.qry.url = xstrdup(path); 529 ctx.qry.url = xstrdup(path);
517 if (ctx.qry.raw) { 530 if (ctx.qry.raw) {
518 qry = ctx.qry.raw; 531 qry = ctx.qry.raw;
@@ -522,13 +535,13 @@ int main(int argc, const char **argv)
522 ctx.qry.raw = ctx.qry.url; 535 ctx.qry.raw = ctx.qry.url;
523 cgit_parse_url(ctx.qry.url); 536 cgit_parse_url(ctx.qry.url);
524 } 537 }
525 538
526 ttl = calc_ttl(); 539 ttl = calc_ttl();
527 ctx.page.expires += ttl*60; 540 ctx.page.expires += ttl*60;
528 if (method && !strcmp(method, "HEAD")) 541 if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
529 ctx.cfg.nocache = 1; 542 ctx.cfg.nocache = 1;
530 if (ctx.cfg.nocache) 543 if (ctx.cfg.nocache)
531 ctx.cfg.cache_size = 0; 544 ctx.cfg.cache_size = 0;
532 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, 545 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
533 ctx.qry.raw, ttl, process_request, &ctx); 546 ctx.qry.raw, ttl, process_request, &ctx);
534 if (err) 547 if (err)
diff --git a/cgit.h b/cgit.h
index 4c854ea..893231d 100644
--- a/cgit.h
+++ b/cgit.h
@@ -204,13 +204,26 @@ struct cgit_page {
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 *path_info;
215 char *query_string;
216 char *request_method;
217 char *script_name;
218 char *server_name;
219 char *server_port;
220};
221
210struct cgit_context { 222struct cgit_context {
223 struct cgit_environment env;
211 struct cgit_query qry; 224 struct cgit_query qry;
212 struct cgit_config cfg; 225 struct cgit_config cfg;
213 struct cgit_repo *repo; 226 struct cgit_repo *repo;
214 struct cgit_page page; 227 struct cgit_page page;
215}; 228};
216 229
diff --git a/ui-shared.c b/ui-shared.c
index 015c52b..538ddda 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -33,39 +33,27 @@ void cgit_print_error(char *msg)
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);
@@ -464,14 +452,12 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
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");
471
472 if (ctx->cfg.embedded) 458 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)
@@ -486,13 +472,13 @@ void cgit_print_http_headers(struct cgit_context *ctx)
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)