Introduce struct cgit_context

This struct will hold all the cgit runtime information currently found in
a multitude of global variables.

The first cleanup removes all querystring-related variables.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 14 insertions, 29 deletions

diff --git a/shared.c b/shared.c
index f063894..6c1a762 100644
--- a/shared.c
+++ b/shared.c
@@ -12,2 +12,3 @@ struct repolist cgit_repolist;
 struct repoinfo *cgit_repo;
+struct cgit_context ctx;
 int cgit_cmd;
@@ -51,20 +52,4 @@ int cgit_max_commit_count = 50;
 
-int cgit_query_has_symref = 0;
-int cgit_query_has_sha1   = 0;
-
-char *cgit_querystring  = NULL;
-char *cgit_query_repo   = NULL;
-char *cgit_query_page   = NULL;
-char *cgit_query_head   = NULL;
-char *cgit_query_search = NULL;
-char *cgit_query_grep   = NULL;
-char *cgit_query_sha1   = NULL;
-char *cgit_query_sha2   = NULL;
-char *cgit_query_path   = NULL;
-char *cgit_query_name   = NULL;
-int   cgit_query_ofs    = 0;
-
 int htmlfd = 0;
 
-
 int cgit_get_cmd_index(const char *cmd)
@@ -241,6 +226,6 @@ void cgit_querystring_cb(const char *name, const char *value)
         if (!strcmp(name,"r")) {
-                cgit_query_repo = xstrdup(value);
+                ctx.qry.repo = xstrdup(value);
                 cgit_repo = cgit_get_repoinfo(value);
         } else if (!strcmp(name, "p")) {
-                cgit_query_page = xstrdup(value);
+                ctx.qry.page = xstrdup(value);
                 cgit_cmd = cgit_get_cmd_index(value);
@@ -249,20 +234,20 @@ void cgit_querystring_cb(const char *name, const char *value)
         } else if (!strcmp(name, "qt")) {
-                cgit_query_grep = xstrdup(value);
+                ctx.qry.grep = xstrdup(value);
         } else if (!strcmp(name, "q")) {
-                cgit_query_search = xstrdup(value);
+                ctx.qry.search = xstrdup(value);
         } else if (!strcmp(name, "h")) {
-                cgit_query_head = xstrdup(value);
-                cgit_query_has_symref = 1;
+                ctx.qry.head = xstrdup(value);
+                ctx.qry.has_symref = 1;
         } else if (!strcmp(name, "id")) {
-                cgit_query_sha1 = xstrdup(value);
-                cgit_query_has_sha1 = 1;
+                ctx.qry.sha1 = xstrdup(value);
+                ctx.qry.has_sha1 = 1;
         } else if (!strcmp(name, "id2")) {
-                cgit_query_sha2 = xstrdup(value);
-                cgit_query_has_sha1 = 1;
+                ctx.qry.sha2 = xstrdup(value);
+                ctx.qry.has_sha1 = 1;
         } else if (!strcmp(name, "ofs")) {
-                cgit_query_ofs = atoi(value);
+                ctx.qry.ofs = atoi(value);
         } else if (!strcmp(name, "path")) {
-                cgit_query_path = trim_end(value, '/');
+                ctx.qry.path = trim_end(value, '/');
         } else if (!strcmp(name, "name")) {
-                cgit_query_name = xstrdup(value);
+                ctx.qry.name = xstrdup(value);
         }