Move cgit_repo into cgit_context

This removes the global variable which is used to keep track of the
currently selected repository, and adds a new variable in the cgit_context
structure.

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

1 files changed, 30 insertions, 31 deletions

diff --git a/shared.c b/shared.c
index 8dd2b00..808e674 100644
--- a/shared.c
+++ b/shared.c
@@ -1,28 +1,27 @@
 /* shared.c: global vars + some callback functions
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
-struct repolist cgit_repolist;
-struct repoinfo *cgit_repo;
+struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
 int cgit_cmd;
 
 const char *cgit_version = CGIT_VERSION;
 
 int htmlfd = 0;
 
 void cgit_prepare_context(struct cgit_context *ctx)
 {
         memset(ctx, 0, sizeof(ctx));
         ctx->cfg.agefile = "info/web/last-modified";
         ctx->cfg.cache_dynamic_ttl = 5;
         ctx->cfg.cache_max_create_time = 5;
         ctx->cfg.cache_repo_ttl = 5;
         ctx->cfg.cache_root = CGIT_CACHE_ROOT;
         ctx->cfg.cache_root_ttl = 5;
@@ -60,66 +59,66 @@ int chk_zero(int result, char *msg)
 }
 
 int chk_positive(int result, char *msg)
 {
         if (result <= 0)
                 die("%s: %s", msg, strerror(errno));
         return result;
 }
 
 int chk_non_negative(int result, char *msg)
 {
             if (result < 0)
                     die("%s: %s",msg, strerror(errno));
         return result;
 }
 
-struct repoinfo *add_repo(const char *url)
+struct cgit_repo *add_repo(const char *url)
 {
-        struct repoinfo *ret;
+        struct cgit_repo *ret;
 
         if (++cgit_repolist.count > cgit_repolist.length) {
                 if (cgit_repolist.length == 0)
                         cgit_repolist.length = 8;
                 else
                         cgit_repolist.length *= 2;
                 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
                                                cgit_repolist.length *
-                                               sizeof(struct repoinfo));
+                                               sizeof(struct cgit_repo));
         }
 
         ret = &cgit_repolist.repos[cgit_repolist.count-1];
         ret->url = trim_end(url, '/');
         ret->name = ret->url;
         ret->path = NULL;
         ret->desc = "[no description]";
         ret->owner = NULL;
         ret->group = ctx.cfg.repo_group;
         ret->defbranch = "master";
         ret->snapshots = ctx.cfg.snapshots;
         ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
         ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
         ret->module_link = ctx.cfg.module_link;
         ret->readme = NULL;
         return ret;
 }
 
-struct repoinfo *cgit_get_repoinfo(const char *url)
+struct cgit_repo *cgit_get_repoinfo(const char *url)
 {
         int i;
-        struct repoinfo *repo;
+        struct cgit_repo *repo;
 
         for (i=0; i<cgit_repolist.count; i++) {
                 repo = &cgit_repolist.repos[i];
                 if (!strcmp(repo->url, url))
                         return repo;
         }
         return NULL;
 }
 
 void cgit_global_config_cb(const char *name, const char *value)
 {
         if (!strcmp(name, "root-title"))
                 ctx.cfg.root_title = xstrdup(value);
         else if (!strcmp(name, "css"))
                 ctx.cfg.css = xstrdup(value);
         else if (!strcmp(name, "logo"))
@@ -166,67 +165,67 @@ void cgit_global_config_cb(const char *name, const char *value)
                 ctx.cfg.summary_log = atoi(value);
         else if (!strcmp(name, "summary-branches"))
                 ctx.cfg.summary_branches = atoi(value);
         else if (!strcmp(name, "summary-tags"))
                 ctx.cfg.summary_tags = atoi(value);
         else if (!strcmp(name, "agefile"))
                 ctx.cfg.agefile = xstrdup(value);
         else if (!strcmp(name, "renamelimit"))
                 ctx.cfg.renamelimit = atoi(value);
         else if (!strcmp(name, "robots"))
                 ctx.cfg.robots = xstrdup(value);
         else if (!strcmp(name, "clone-prefix"))
                 ctx.cfg.clone_prefix = xstrdup(value);
         else if (!strcmp(name, "repo.group"))
                 ctx.cfg.repo_group = xstrdup(value);
         else if (!strcmp(name, "repo.url"))
-                cgit_repo = add_repo(value);
+                ctx.repo = add_repo(value);
         else if (!strcmp(name, "repo.name"))
-                cgit_repo->name = xstrdup(value);
-        else if (cgit_repo && !strcmp(name, "repo.path"))
-                cgit_repo->path = trim_end(value, '/');
-        else if (cgit_repo && !strcmp(name, "repo.clone-url"))
-                cgit_repo->clone_url = xstrdup(value);
-        else if (cgit_repo && !strcmp(name, "repo.desc"))
-                cgit_repo->desc = xstrdup(value);
-        else if (cgit_repo && !strcmp(name, "repo.owner"))
-                cgit_repo->owner = xstrdup(value);
-        else if (cgit_repo && !strcmp(name, "repo.defbranch"))
-                cgit_repo->defbranch = xstrdup(value);
-        else if (cgit_repo && !strcmp(name, "repo.snapshots"))
-                cgit_repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
-        else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
-                cgit_repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
-        else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
-                cgit_repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
-        else if (cgit_repo && !strcmp(name, "repo.module-link"))
-                cgit_repo->module_link= xstrdup(value);
-        else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) {
+                ctx.repo->name = xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.path"))
+                ctx.repo->path = trim_end(value, '/');
+        else if (ctx.repo && !strcmp(name, "repo.clone-url"))
+                ctx.repo->clone_url = xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.desc"))
+                ctx.repo->desc = xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.owner"))
+                ctx.repo->owner = xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.defbranch"))
+                ctx.repo->defbranch = xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.snapshots"))
+                ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
+        else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
+                ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
+        else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
+                ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
+        else if (ctx.repo && !strcmp(name, "repo.module-link"))
+                ctx.repo->module_link= xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
                 if (*value == '/')
-                        cgit_repo->readme = xstrdup(value);
+                        ctx.repo->readme = xstrdup(value);
                 else
-                        cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value));
+                        ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
         } else if (!strcmp(name, "include"))
                 cgit_read_config(value, cgit_global_config_cb);
 }
 
 void cgit_querystring_cb(const char *name, const char *value)
 {
         if (!strcmp(name,"r")) {
                 ctx.qry.repo = xstrdup(value);
-                cgit_repo = cgit_get_repoinfo(value);
+                ctx.repo = cgit_get_repoinfo(value);
         } else if (!strcmp(name, "p")) {
                 ctx.qry.page = xstrdup(value);
                 cgit_cmd = cgit_get_cmd_index(value);
         } else if (!strcmp(name, "url")) {
                 cgit_parse_url(value);
         } else if (!strcmp(name, "qt")) {
                 ctx.qry.grep = xstrdup(value);
         } else if (!strcmp(name, "q")) {
                 ctx.qry.search = xstrdup(value);
         } else if (!strcmp(name, "h")) {
                 ctx.qry.head = xstrdup(value);
                 ctx.qry.has_symref = 1;
         } else if (!strcmp(name, "id")) {
                 ctx.qry.sha1 = xstrdup(value);
                 ctx.qry.has_sha1 = 1;
         } else if (!strcmp(name, "id2")) {