about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2009-08-10 08:21:09 +0200
committerLars Hjemli2009-08-10 08:21:09 +0200
commit60a26272e0ca529407fe6b613f061f04ba585d53 (patch)
treec2b6ee3c19a44bd276043650298229c481ca4535
parentAdd some example filter scripts (diff)
downloadcgit-60a26272e0ca529407fe6b613f061f04ba585d53.tar.gz
cgit-60a26272e0ca529407fe6b613f061f04ba585d53.zip
Cleanup handling of environment variables
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-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
@@ -215,6 +215,11 @@ static void querystring_cb(const char *name, const char *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));
@@ -245,6 +250,15 @@ static void prepare_context(struct cgit_context *ctx)
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;
@@ -253,6 +267,12 @@ static void prepare_context(struct cgit_context *ctx)
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 {
@@ -477,8 +497,6 @@ static int calc_ttl()
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;
@@ -488,13 +506,8 @@ int main(int argc, const char **argv)
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
@@ -509,7 +522,7 @@ int main(int argc, const char **argv)
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++;
@@ -525,7 +538,7 @@ int main(int argc, const char **argv)
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;
diff --git a/cgit.h b/cgit.h index 4c854ea..893231d 100644 --- a/cgit.h +++ b/cgit.h
@@ -207,7 +207,20 @@ struct cgit_page {
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;
diff --git a/ui-shared.c b/ui-shared.c index 015c52b..538ddda 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -36,10 +36,7 @@ void cgit_print_error(char *msg)
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://";
@@ -47,22 +44,13 @@ char *cgit_httpscheme()
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()
@@ -467,8 +455,6 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
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
@@ -489,7 +475,7 @@ void cgit_print_http_headers(struct cgit_context *ctx)
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