From 60a26272e0ca529407fe6b613f061f04ba585d53 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Mon, 10 Aug 2009 08:21:09 +0200 Subject: Cleanup handling of environment variables Signed-off-by: Lars Hjemli --- cgit.c | 33 +++++++++++++++++++++++---------- cgit.h | 13 +++++++++++++ ui-shared.c | 32 +++++++++----------------------- 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) } } +char *xstrdupn(const char *str) +{ + return (str ? xstrdup(str) : NULL); +} + static void prepare_context(struct cgit_context *ctx) { memset(ctx, 0, sizeof(ctx)); @@ -245,6 +250,15 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.summary_branches = 10; ctx->cfg.summary_log = 10; ctx->cfg.summary_tags = 10; + ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); + ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); + ctx->env.https = xstrdupn(getenv("HTTPS")); + ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); + ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); + ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); + ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); + ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); + ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); ctx->page.mimetype = "text/html"; ctx->page.charset = PAGE_ENCODING; ctx->page.filename = NULL; @@ -253,6 +267,12 @@ static void prepare_context(struct cgit_context *ctx) ctx->page.expires = ctx->page.modified; ctx->page.etag = NULL; memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); + if (ctx->env.script_name) + ctx->cfg.script_name = ctx->env.script_name; + if (ctx->env.query_string) + ctx->qry.raw = ctx->env.query_string; + if (!ctx->env.cgit_config) + ctx->env.cgit_config = CGIT_CONFIG; } struct refmatch { @@ -477,8 +497,6 @@ static int calc_ttl() int main(int argc, const char **argv) { - const char *cgit_config_env = getenv("CGIT_CONFIG"); - const char *method = getenv("REQUEST_METHOD"); const char *path; char *qry; int err, ttl; @@ -488,13 +506,8 @@ int main(int argc, const char **argv) cgit_repolist.count = 0; cgit_repolist.repos = NULL; - if (getenv("SCRIPT_NAME")) - ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); - if (getenv("QUERY_STRING")) - ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); cgit_parse_args(argc, argv); - parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, - config_cb); + parse_configfile(ctx.env.cgit_config, config_cb); ctx.repo = NULL; http_parse_querystring(ctx.qry.raw, querystring_cb); @@ -509,7 +522,7 @@ int main(int argc, const char **argv) * urls without the need for rewriterules in the webserver (as * long as PATH_INFO is included in the cache lookup key). */ - path = getenv("PATH_INFO"); + path = ctx.env.path_info; if (!ctx.qry.url && path) { if (path[0] == '/') path++; @@ -525,7 +538,7 @@ int main(int argc, const char **argv) ttl = calc_ttl(); ctx.page.expires += ttl*60; - if (method && !strcmp(method, "HEAD")) + if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD")) ctx.cfg.nocache = 1; if (ctx.cfg.nocache) 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 { char *statusmsg; }; +struct cgit_environment { + char *cgit_config; + char *http_host; + char *https; + char *path_info; + char *query_string; + char *request_method; + char *script_name; + char *server_name; + char *server_port; +}; + struct cgit_context { + struct cgit_environment env; struct cgit_query qry; struct cgit_config cfg; 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) char *cgit_httpscheme() { - char *https; - - https = getenv("HTTPS"); - if (https != NULL && strcmp(https, "on") == 0) + if (ctx.env.https && !strcmp(ctx.env.https, "on")) return "https://"; else return "http://"; @@ -47,22 +44,13 @@ char *cgit_httpscheme() char *cgit_hosturl() { - char *host, *port; - - host = getenv("HTTP_HOST"); - if (host) { - host = xstrdup(host); - } else { - host = getenv("SERVER_NAME"); - if (!host) - return NULL; - port = getenv("SERVER_PORT"); - if (port && atoi(port) != 80) - host = xstrdup(fmt("%s:%d", host, atoi(port))); - else - host = xstrdup(host); - } - return host; + if (ctx.env.http_host) + return ctx.env.http_host; + if (!ctx.env.server_name) + return NULL; + if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80) + return ctx.env.server_name; + return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port)); } char *cgit_rooturl() @@ -467,8 +455,6 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) void cgit_print_http_headers(struct cgit_context *ctx) { - const char *method = getenv("REQUEST_METHOD"); - if (ctx->cfg.embedded) return; @@ -489,7 +475,7 @@ void cgit_print_http_headers(struct cgit_context *ctx) if (ctx->page.etag) htmlf("ETag: \"%s\"\n", ctx->page.etag); html("\n"); - if (method && !strcmp(method, "HEAD")) + if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) exit(0); } -- cgit v1.2.3-70-g09d2