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 /cgit.c | |
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 |
1 files changed, 23 insertions, 10 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) |