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>

11 files changed, 101 insertions, 103 deletions

diff --git a/cache.c b/cache.c
index 2ed0d6f..7860fc7 100644
--- a/cache.c
+++ b/cache.c
@@ -50,3 +50,3 @@ int cache_create_dirs()
 
-	if (!cgit_repo)
+	if (!ctx.repo)
 		return 0;
@@ -54,3 +54,3 @@ int cache_create_dirs()
 	path = fmt("%s/%s", ctx.cfg.cache_root,
-		   cache_safe_filename(cgit_repo->url));
+		   cache_safe_filename(ctx.repo->url));
 
@@ -61,3 +61,3 @@ int cache_create_dirs()
 		path = fmt("%s/%s/%s", ctx.cfg.cache_root,
-			   cache_safe_filename(cgit_repo->url),
+			   cache_safe_filename(ctx.repo->url),
 			   ctx.qry.page);
diff --git a/cgit.c b/cgit.c
index f0907a1..b270fdc 100644
--- a/cgit.c
+++ b/cgit.c
@@ -12,3 +12,3 @@ static int cgit_prepare_cache(struct cacheitem *item)
 {
-	if (!cgit_repo && ctx.qry.repo) {
+	if (!ctx.repo && ctx.qry.repo) {
 		char *title = fmt("%s - %s", ctx.cfg.root_title, "Bad request");
@@ -21,3 +21,3 @@ static int cgit_prepare_cache(struct cacheitem *item)
 
-	if (!cgit_repo) {
+	if (!ctx.repo) {
 		item->name = xstrdup(fmt("%s/index.html", ctx.cfg.cache_root));
@@ -29,3 +29,3 @@ static int cgit_prepare_cache(struct cacheitem *item)
 		item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root,
-					 cache_safe_filename(cgit_repo->url),
+					 cache_safe_filename(ctx.repo->url),
 					 cache_safe_filename(ctx.qry.raw)));
@@ -34,3 +34,3 @@ static int cgit_prepare_cache(struct cacheitem *item)
 		item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root,
-					 cache_safe_filename(cgit_repo->url),
+					 cache_safe_filename(ctx.repo->url),
 					 ctx.qry.page,
@@ -66,3 +66,3 @@ int find_current_ref(const char *refname, const unsigned char *sha1,
 
-char *find_default_branch(struct repoinfo *repo)
+char *find_default_branch(struct cgit_repo *repo)
 {
@@ -86,3 +86,3 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
-	if (chdir(cgit_repo->path)) {
+	if (chdir(ctx.repo->path)) {
 		title = fmt("%s - %s", ctx.cfg.root_title, "Bad request");
@@ -96,9 +96,9 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
-	title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
+	title = fmt("%s - %s", ctx.repo->name, ctx.repo->desc);
 	show_search = 0;
-	setenv("GIT_DIR", cgit_repo->path, 1);
+	setenv("GIT_DIR", ctx.repo->path, 1);
 
 	if (!ctx.qry.head) {
-		ctx.qry.head = xstrdup(find_default_branch(cgit_repo));
-		cgit_repo->defbranch = ctx.qry.head;
+		ctx.qry.head = xstrdup(find_default_branch(ctx.repo));
+		ctx.repo->defbranch = ctx.qry.head;
 	}
@@ -115,3 +115,3 @@ static void cgit_print_repo_page(struct cacheitem *item)
 		tmp = xstrdup(ctx.qry.head);
-		ctx.qry.head = cgit_repo->defbranch;
+		ctx.qry.head = ctx.repo->defbranch;
 		cgit_print_docstart(title, item);
@@ -123,7 +123,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
-	if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
+	if ((cgit_cmd == CMD_SNAPSHOT) && ctx.repo->snapshots) {
 		cgit_print_snapshot(item, ctx.qry.head, ctx.qry.sha1,
-				    cgit_repobasename(cgit_repo->url),
+				    cgit_repobasename(ctx.repo->url),
 				    ctx.qry.path,
-				    cgit_repo->snapshots );
+				    ctx.repo->snapshots );
 		return;
@@ -194,3 +194,3 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
 
-	if (cgit_repo)
+	if (ctx.repo)
 		cgit_print_repo_page(item);
@@ -302,3 +302,2 @@ int main(int argc, const char **argv)
 			 cgit_global_config_cb);
-	cgit_repo = NULL;
 	if (getenv("SCRIPT_NAME"))
diff --git a/cgit.h b/cgit.h
index 0338ebd..598d8c3 100644
--- a/cgit.h
+++ b/cgit.h
@@ -68,3 +68,3 @@ struct cacheitem {
 
-struct repoinfo {
+struct cgit_repo {
 	char *url;
@@ -84,6 +84,6 @@ struct repoinfo {
 
-struct repolist {
+struct cgit_repolist {
 	int length;
 	int count;
-	struct repoinfo *repos;
+	struct cgit_repo *repos;
 };
@@ -179,2 +179,3 @@ struct cgit_context {
 	struct cgit_config cfg;
+	struct cgit_repo *repo;
 };
@@ -183,4 +184,3 @@ extern const char *cgit_version;
 
-extern struct repolist cgit_repolist;
-extern struct repoinfo *cgit_repo;
+extern struct cgit_repolist cgit_repolist;
 extern struct cgit_context ctx;
@@ -192,3 +192,3 @@ extern void cgit_prepare_context(struct cgit_context *ctx);
 extern int cgit_get_cmd_index(const char *cmd);
-extern struct repoinfo *cgit_get_repoinfo(const char *url);
+extern struct cgit_repo *cgit_get_repoinfo(const char *url);
 extern void cgit_global_config_cb(const char *name, const char *value);
diff --git a/parsing.c b/parsing.c
index 8cf56a4..027f06b 100644
--- a/parsing.c
+++ b/parsing.c
@@ -145,3 +145,3 @@ void cgit_parse_url(const char *url)
 
-	cgit_repo = NULL;
+	ctx.repo = NULL;
 	if (!url || url[0] == '\0')
@@ -149,5 +149,5 @@ void cgit_parse_url(const char *url)
 
-	cgit_repo = cgit_get_repoinfo(url);
-	if (cgit_repo) {
-		ctx.qry.repo = cgit_repo->url;
+	ctx.repo = cgit_get_repoinfo(url);
+	if (ctx.repo) {
+		ctx.qry.repo = ctx.repo->url;
 		return;
@@ -156,6 +156,6 @@ void cgit_parse_url(const char *url)
 	cmd = strchr(url, '/');
-	while (!cgit_repo && cmd) {
+	while (!ctx.repo && cmd) {
 		cmd[0] = '\0';
-		cgit_repo = cgit_get_repoinfo(url);
-		if (cgit_repo == NULL) {
+		ctx.repo = cgit_get_repoinfo(url);
+		if (ctx.repo == NULL) {
 			cmd[0] = '/';
@@ -165,3 +165,3 @@ void cgit_parse_url(const char *url)
 
-		ctx.qry.repo = cgit_repo->url;
+		ctx.qry.repo = ctx.repo->url;
 		p = strchr(cmd + 1, '/');
diff --git a/shared.c b/shared.c
index 8dd2b00..808e674 100644
--- a/shared.c
+++ b/shared.c
@@ -10,4 +10,3 @@
 
-struct repolist cgit_repolist;
-struct repoinfo *cgit_repo;
+struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
@@ -75,5 +74,5 @@ int chk_non_negative(int result, char *msg)
 
-struct repoinfo *add_repo(const char *url)
+struct cgit_repo *add_repo(const char *url)
 {
-	struct repoinfo *ret;
+	struct cgit_repo *ret;
 
@@ -86,3 +85,3 @@ struct repoinfo *add_repo(const char *url)
 					       cgit_repolist.length *
-					       sizeof(struct repoinfo));
+					       sizeof(struct cgit_repo));
 	}
@@ -105,6 +104,6 @@ struct repoinfo *add_repo(const char *url)
 
-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;
 
@@ -181,28 +180,28 @@ void cgit_global_config_cb(const char *name, const char *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"))
@@ -215,3 +214,3 @@ void cgit_querystring_cb(const char *name, const char *value)
 		ctx.qry.repo = xstrdup(value);
-		cgit_repo = cgit_get_repoinfo(value);
+		ctx.repo = cgit_get_repoinfo(value);
 	} else if (!strcmp(name, "p")) {
diff --git a/ui-commit.c b/ui-commit.c
index 3b0919b..25721ca 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -196,6 +196,6 @@ void cgit_print_commit(char *hex)
 	}
-	if (cgit_repo->snapshots) {
+	if (ctx.repo->snapshots) {
 		html("<tr><th>download</th><td colspan='2' class='sha1'>");
 		cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
-					  hex, cgit_repo->snapshots);
+					  hex, ctx.repo->snapshots);
 		html("</td></tr>");
diff --git a/ui-log.c b/ui-log.c
index a39474b..72e2a4b 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -27,3 +27,3 @@ void inspect_files(struct diff_filepair *pair)
 	files++;
-	if (cgit_repo->enable_log_linecount)
+	if (ctx.repo->enable_log_linecount)
 		cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
@@ -41,3 +41,3 @@ void print_commit(struct commit *commit)
 			 sha1_to_hex(commit->object.sha1));
-	if (cgit_repo->enable_log_filecount) {
+	if (ctx.repo->enable_log_filecount) {
 		files = 0;
@@ -48,3 +48,3 @@ void print_commit(struct commit *commit)
 		htmlf("%d", files);
-		if (cgit_repo->enable_log_linecount) {
+		if (ctx.repo->enable_log_linecount) {
 			html("</td><td class='right'>");
@@ -96,5 +96,5 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 
-	if (cgit_repo->enable_log_filecount) {
+	if (ctx.repo->enable_log_filecount) {
 		html("<th class='right'>Files</th>");
-		if (cgit_repo->enable_log_linecount)
+		if (ctx.repo->enable_log_linecount)
 			html("<th class='right'>Lines</th>");
diff --git a/ui-repolist.c b/ui-repolist.c
index a6cc2cc..5fde174 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -27,3 +27,3 @@ time_t read_agefile(char *path)
 
-static void print_modtime(struct repoinfo *repo)
+static void print_modtime(struct cgit_repo *repo)
 {
@@ -72,24 +72,24 @@ void cgit_print_repolist(struct cacheitem *item)
 	for (i=0; i<cgit_repolist.count; i++) {
-		cgit_repo = &cgit_repolist.repos[i];
-		if ((last_group == NULL && cgit_repo->group != NULL) ||
-		    (last_group != NULL && cgit_repo->group == NULL) ||
-		    (last_group != NULL && cgit_repo->group != NULL &&
-		     strcmp(cgit_repo->group, last_group))) {
+		ctx.repo = &cgit_repolist.repos[i];
+		if ((last_group == NULL && ctx.repo->group != NULL) ||
+		    (last_group != NULL && ctx.repo->group == NULL) ||
+		    (last_group != NULL && ctx.repo->group != NULL &&
+		     strcmp(ctx.repo->group, last_group))) {
 			htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
 			      columns);
-			html_txt(cgit_repo->group);
+			html_txt(ctx.repo->group);
 			html("</td></tr>");
-			last_group = cgit_repo->group;
+			last_group = ctx.repo->group;
 		}
 		htmlf("<tr><td class='%s'>",
-		      cgit_repo->group ? "sublevel-repo" : "toplevel-repo");
-		html_link_open(cgit_repourl(cgit_repo->url), NULL, NULL);
-		html_txt(cgit_repo->name);
+		      ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
+		html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
+		html_txt(ctx.repo->name);
 		html_link_close();
 		html("</td><td>");
-		html_ntxt(ctx.cfg.max_repodesc_len, cgit_repo->desc);
+		html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
 		html("</td><td>");
-		html_txt(cgit_repo->owner);
+		html_txt(ctx.repo->owner);
 		html("</td><td>");
-		print_modtime(cgit_repo);
+		print_modtime(ctx.repo);
 		html("</td>");
@@ -97,3 +97,3 @@ void cgit_print_repolist(struct cacheitem *item)
 			html("<td>");
-			html_link_open(cgit_repourl(cgit_repo->url),
+			html_link_open(cgit_repourl(ctx.repo->url),
 				       NULL, "button");
diff --git a/ui-shared.c b/ui-shared.c
index b96237d..b9f487a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -143,4 +143,4 @@ static char *repolink(char *title, char *class, char *page, char *head,
 			html("/");
-		html_attr(cgit_repo->url);
-		if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+		html_attr(ctx.repo->url);
+		if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
 			html("/");
@@ -155,4 +155,4 @@ static char *repolink(char *title, char *class, char *page, char *head,
 		html("?url=");
-		html_attr(cgit_repo->url);
-		if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+		html_attr(ctx.repo->url);
+		if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
 			html("/");
@@ -166,3 +166,3 @@ static char *repolink(char *title, char *class, char *page, char *head,
 	}
-	if (head && strcmp(head, cgit_repo->defbranch)) {
+	if (head && strcmp(head, ctx.repo->defbranch)) {
 		html(delim);
@@ -448,3 +448,3 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
 
-	if (incl_head && strcmp(ctx.qry.head, cgit_repo->defbranch))
+	if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
 		html_hidden("h", ctx.qry.head);
@@ -480,8 +480,8 @@ void cgit_print_pageheader(char *title, int show_search)
 		html("<h1 class='first'>");
-		html_txt(strrpart(cgit_repo->name, 20));
+		html_txt(strrpart(ctx.repo->name, 20));
 		html("</h1>\n");
-		html_txt(cgit_repo->desc);
-		if (cgit_repo->owner) {
+		html_txt(ctx.repo->desc);
+		if (ctx.repo->owner) {
 			html("<h1>owner</h1>\n");
-			html_txt(cgit_repo->owner);
+			html_txt(ctx.repo->owner);
 		}
@@ -503,9 +503,9 @@ void cgit_print_pageheader(char *title, int show_search)
 
-		if (cgit_repo->clone_url || ctx.cfg.clone_prefix) {
+		if (ctx.repo->clone_url || ctx.cfg.clone_prefix) {
 			html("<h1>clone</h1>\n");
-			if (cgit_repo->clone_url)
-				url = cgit_repo->clone_url;
+			if (ctx.repo->clone_url)
+				url = ctx.repo->clone_url;
 			else
 				url = fmt("%s%s", ctx.cfg.clone_prefix,
-					  cgit_repo->url);
+					  ctx.repo->url);
 			html("<a class='menu' href='");
diff --git a/ui-summary.c b/ui-summary.c
index 0a44994..3baac08 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -184,5 +184,5 @@ void cgit_print_summary()
 {
-	if (cgit_repo->readme) {
+	if (ctx.repo->readme) {
 		html("<div id='summary'>");
-		html_include(cgit_repo->readme);
+		html_include(ctx.repo->readme);
 		html("</div>");
diff --git a/ui-tree.c b/ui-tree.c
index 7cae85a..df05ad3 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -85,3 +85,3 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 		htmlf("<a class='ls-mod' href='");
-		html_attr(fmt(cgit_repo->module_link,
+		html_attr(fmt(ctx.repo->module_link,
 			      name,