author | Lars Hjemli <hjemli@gmail.com> | 2009-08-10 06:21:09 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-10 06:21:09 (UTC) |
commit | 60a26272e0ca529407fe6b613f061f04ba585d53 (patch) (unidiff) | |
tree | c2b6ee3c19a44bd276043650298229c481ca4535 | |
parent | e6cd7121edf55c13f04cd5d6fca8f07c4035ce0a (diff) | |
download | cgit-60a26272e0ca529407fe6b613f061f04ba585d53.zip cgit-60a26272e0ca529407fe6b613f061f04ba585d53.tar.gz cgit-60a26272e0ca529407fe6b613f061f04ba585d53.tar.bz2 |
Cleanup handling of environment variables
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 33 | ||||
-rw-r--r-- | cgit.h | 13 | ||||
-rw-r--r-- | ui-shared.c | 32 |
3 files changed, 45 insertions, 33 deletions
@@ -216,4 +216,9 @@ static void querystring_cb(const char *name, const char *value) | |||
216 | } | 216 | } |
217 | 217 | ||
218 | char *xstrdupn(const char *str) | ||
219 | { | ||
220 | return (str ? xstrdup(str) : NULL); | ||
221 | } | ||
222 | |||
218 | static void prepare_context(struct cgit_context *ctx) | 223 | static void prepare_context(struct cgit_context *ctx) |
219 | { | 224 | { |
@@ -246,4 +251,13 @@ static void prepare_context(struct cgit_context *ctx) | |||
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; |
@@ -254,4 +268,10 @@ static void prepare_context(struct cgit_context *ctx) | |||
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 | ||
@@ -478,6 +498,4 @@ static int calc_ttl() | |||
478 | int main(int argc, const char **argv) | 498 | int 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; |
@@ -489,11 +507,6 @@ int main(int argc, const char **argv) | |||
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); |
@@ -510,5 +523,5 @@ int main(int argc, const char **argv) | |||
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] == '/') |
@@ -526,5 +539,5 @@ int main(int argc, const char **argv) | |||
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) |
@@ -208,5 +208,18 @@ struct cgit_page { | |||
208 | }; | 208 | }; |
209 | 209 | ||
210 | struct 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 | |||
210 | struct cgit_context { | 222 | struct 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; |
diff --git a/ui-shared.c b/ui-shared.c index 015c52b..538ddda 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -37,8 +37,5 @@ void cgit_print_error(char *msg) | |||
37 | char *cgit_httpscheme() | 37 | char *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 |
@@ -48,20 +45,11 @@ char *cgit_httpscheme() | |||
48 | char *cgit_hosturl() | 45 | char *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 | ||
@@ -468,6 +456,4 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
468 | void cgit_print_http_headers(struct cgit_context *ctx) | 456 | void 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; |
@@ -490,5 +476,5 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
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 | } |