13 files changed, 156 insertions, 164 deletions

diff --git a/cache.c b/cache.c
index 372e38d..b162952 100644
--- a/cache.c
+++ b/cache.c
@@ -57,10 +57,10 @@ int cache_create_dirs()
         if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                 return 0;
 
-        if (cgit_query_page) {
+        if (ctx.qry.page) {
                 path = fmt("%s/%s/%s", cgit_cache_root,
                            cache_safe_filename(cgit_repo->url),
-                           cgit_query_page);
+                           ctx.qry.page);
                 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                         return 0;
         }
diff --git a/cgit.c b/cgit.c
index e8acc03..8a30c3c 100644
--- a/cgit.c
+++ b/cgit.c
@@ -10,11 +10,11 @@
 
 static int cgit_prepare_cache(struct cacheitem *item)
 {
-        if (!cgit_repo && cgit_query_repo) {
+        if (!cgit_repo && ctx.qry.repo) {
                 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                 cgit_print_docstart(title, item);
                 cgit_print_pageheader(title, 0);
-                cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo));
+                cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo));
                 cgit_print_docend();
                 return 0;
         }
@@ -28,16 +28,16 @@ static int cgit_prepare_cache(struct cacheitem *item)
         if (!cgit_cmd) {
                 item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root,
                                          cache_safe_filename(cgit_repo->url),
-                                         cache_safe_filename(cgit_querystring)));
+                                         cache_safe_filename(ctx.qry.raw)));
                 item->ttl = cgit_cache_repo_ttl;
         } else {
                 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
                                          cache_safe_filename(cgit_repo->url),
-                                         cgit_query_page,
-                                         cache_safe_filename(cgit_querystring)));
-                if (cgit_query_has_symref)
+                                         ctx.qry.page,
+                                         cache_safe_filename(ctx.qry.raw)));
+                if (ctx.qry.has_symref)
                         item->ttl = cgit_cache_dynamic_ttl;
-                else if (cgit_query_has_sha1)
+                else if (ctx.qry.has_sha1)
                         item->ttl = cgit_cache_static_ttl;
                 else
                         item->ttl = cgit_cache_repo_ttl;
@@ -98,12 +98,12 @@ static void cgit_print_repo_page(struct cacheitem *item)
         show_search = 0;
         setenv("GIT_DIR", cgit_repo->path, 1);
 
-        if (!cgit_query_head) {
-                cgit_query_head = xstrdup(find_default_branch(cgit_repo));
-                cgit_repo->defbranch = cgit_query_head;
+        if (!ctx.qry.head) {
+                ctx.qry.head = xstrdup(find_default_branch(cgit_repo));
+                cgit_repo->defbranch = ctx.qry.head;
         }
 
-        if (!cgit_query_head) {
+        if (!ctx.qry.head) {
                 cgit_print_docstart(title, item);
                 cgit_print_pageheader(title, 0);
                 cgit_print_error("Repository seems to be empty");
@@ -111,9 +111,9 @@ static void cgit_print_repo_page(struct cacheitem *item)
                 return;
         }
 
-        if (get_sha1(cgit_query_head, sha1)) {
-                tmp = xstrdup(cgit_query_head);
-                cgit_query_head = cgit_repo->defbranch;
+        if (get_sha1(ctx.qry.head, sha1)) {
+                tmp = xstrdup(ctx.qry.head);
+                ctx.qry.head = cgit_repo->defbranch;
                 cgit_print_docstart(title, item);
                 cgit_print_pageheader(title, 0);
                 cgit_print_error(fmt("Invalid branch: %s", tmp));
@@ -122,20 +122,20 @@ static void cgit_print_repo_page(struct cacheitem *item)
         }
 
         if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
-                cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1,
+                cgit_print_snapshot(item, ctx.qry.head, ctx.qry.sha1,
                                     cgit_repobasename(cgit_repo->url),
-                                    cgit_query_path,
+                                    ctx.qry.path,
                                     cgit_repo->snapshots );
                 return;
         }
 
         if (cgit_cmd == CMD_PATCH) {
-                cgit_print_patch(cgit_query_sha1, item);
+                cgit_print_patch(ctx.qry.sha1, item);
                 return;
         }
 
         if (cgit_cmd == CMD_BLOB) {
-                cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
+                cgit_print_blob(item, ctx.qry.sha1, ctx.qry.path);
                 return;
         }
 
@@ -148,28 +148,28 @@ static void cgit_print_repo_page(struct cacheitem *item)
                 return;
         }
 
-        cgit_print_pageheader(cgit_query_page, show_search);
+        cgit_print_pageheader(ctx.qry.page, show_search);
 
         switch(cgit_cmd) {
         case CMD_LOG:
-                cgit_print_log(cgit_query_sha1, cgit_query_ofs,
+                cgit_print_log(ctx.qry.sha1, ctx.qry.ofs,