3 files changed, 63 insertions, 39 deletions

diff --git a/cgit.c b/cgit.c
index bf46b5a..66dd140 100644
--- a/cgit.c
+++ b/cgit.c
@@ -216,4 +216,9 @@ 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)
 {
@@ -246,4 +251,14 @@ static void prepare_context(struct cgit_context *ctx)
         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.no_http = xstrdupn(getenv("NO_HTTP"));
+        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;
@@ -254,4 +269,10 @@ static void prepare_context(struct cgit_context *ctx)
         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;
 }
 
@@ -426,4 +447,7 @@ static void cgit_parse_args(int argc, const char **argv)
                         ctx.cfg.nocache = 1;
                 }
+                if (!strcmp(argv[i], "--nohttp")) {
+                        ctx.env.no_http = "1";
+                }
                 if (!strncmp(argv[i], "--query=", 8)) {
                         ctx.qry.raw = xstrdup(argv[i]+8);
@@ -478,6 +502,4 @@ 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;
@@ -489,11 +511,6 @@ int main(int argc, const char **argv)
         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);
@@ -510,5 +527,5 @@ int main(int argc, const char **argv)
          * 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] == '/')
@@ -526,5 +543,5 @@ 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)
diff --git a/cgit.h b/cgit.h
index 4c854ea..d90ccdc 100644
--- a/cgit.h
+++ b/cgit.h
@@ -208,5 +208,19 @@ struct cgit_page {
 };
 
+struct cgit_environment {
+        char *cgit_config;
+        char *http_host;
+        char *https;
+        char *no_http;
+        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;
diff --git a/ui-shared.c b/ui-shared.c
index 015c52b..cf06511 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -37,8 +37,5 @@ 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
@@ -48,20 +45,11 @@ 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));
 }
 
@@ -468,7 +456,5 @@ 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)
+        if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
                 return;
 
@@ -490,5 +476,5 @@ void cgit_print_http_headers(struct cgit_context *ctx)
                 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);
 }
@@ -496,6 +482,9 @@ void cgit_print_http_headers(struct cgit_context *ctx)
 void cgit_print_docstart(struct cgit_context *ctx)
 {
-        if (ctx->cfg.embedded)
+        if (ctx->cfg.embedded) {
+                if (ctx->cfg.header)
+                        html_include(ctx->cfg.header);
                 return;
+        }
 
         char *host = cgit_hosturl();
@@ -535,5 +524,11 @@ void cgit_print_docstart(struct cgit_context *ctx)
 void cgit_print_docend()
 {
-        html("</div>");
+        html("</div> <!-- class=content -->\n");
+        if (ctx.cfg.embedded) {
+                html("</div> <!-- id=cgit -->\n");
+                if (ctx.cfg.footer)
+                        html_include(ctx.cfg.footer);
+                return;
+        }
         if (ctx.cfg.footer)
                 html_include(ctx.cfg.footer);
@@ -544,7 +539,5 @@ void cgit_print_docend()
                 html("</div>\n");
         }
-        html("</div>");
-        if (ctx.cfg.embedded)
-                return;
+        html("</div> <!-- id=cgit -->\n");
         html("</body>\n</html>\n");
 }