Merge branch 'lh/cleanup'

* lh/cleanup: (21 commits)
  Reset ctx.repo to NULL when the config parser is finished
  Move cgit_parse_query() from parsing.c to html.c as http_parse_querystring()
  Move function for configfile parsing into configfile.[ch]
  Add cache.h
  Remove global and obsolete cgit_cmd
  Makefile: copy the QUIET constructs from the Makefile in git.git
  Move cgit_version from shared.c to cgit.c
  Makefile: autobuild dependency rules
  Initial Makefile cleanup
  Move non-generic functions from shared.c to cgit.c
  Add ui-shared.h
  Add separate header-files for each page/view
  Refactor snapshot support
  Add command dispatcher
  Remove obsolete cacheitem parameter to ui-functions
  Add struct cgit_page to cgit_context
  Introduce html.h
  Improve initialization of git directory
  Move cgit_repo into cgit_context
  Add all config variables into struct cgit_context
  ...

1 files changed, 14 insertions, 12 deletions

diff --git a/ui-tree.c b/ui-tree.c
index c138877..9be3140 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -6,8 +6,10 @@
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
 
 char *curr_rev;
 char *match_path;
 int header = 0;
@@ -33,9 +35,9 @@ static void print_object(const unsigned char *sha1, char *path)
 		return;
 	}
 
 	html(" blob: <a href='");
-	html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
+	html_attr(cgit_pageurl(ctx.qry.repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
 	htmlf("'>%s</a>",sha1_to_hex(sha1));
 
 	html("<table summary='blob content' class='blob'>\n");
 	idx = 0;
@@ -66,10 +68,10 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 	enum object_type type;
 	unsigned long size = 0;
 
 	name = xstrdup(pathname);
-	fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
-		       cgit_query_path ? "/" : "", name);
+	fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
+		       ctx.qry.path ? "/" : "", name);
 
 	type = sha1_object_info(sha1, &size);
 	if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
 		htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
@@ -78,29 +80,29 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 		return 0;
 	}
 
 	html("<tr><td class='ls-mode'>");
-	html_filemode(mode);
+	cgit_print_filemode(mode);
 	html("</td><td>");
 	if (S_ISGITLINK(mode)) {
 		htmlf("<a class='ls-mod' href='");
-		html_attr(fmt(cgit_repo->module_link,
+		html_attr(fmt(ctx.repo->module_link,
 			      name,
 			      sha1_to_hex(sha1)));
 		html("'>");
 		html_txt(name);
 		html("</a>");
 	} else if (S_ISDIR(mode)) {
-		cgit_tree_link(name, NULL, "ls-dir", cgit_query_head,
+		cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
 			       curr_rev, fullpath);
 	} else {
-		cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
+		cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,
 			       curr_rev, fullpath);
 	}
 	htmlf("</td><td class='ls-size'>%li</td>", size);
 
 	html("<td>");
-	cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
+	cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
 		      fullpath, 0, NULL, NULL);
 	html("</td></tr>\n");
 	free(name);
 	return 0;
@@ -152,12 +154,12 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 
 	if (state == 0) {
 		memcpy(buffer, base, baselen);
 		strcpy(buffer+baselen, pathname);
-		url = cgit_pageurl(cgit_query_repo, "tree",
+		url = cgit_pageurl(ctx.qry.repo, "tree",
 				   fmt("h=%s&amp;path=%s", curr_rev, buffer));
 		html("/");
-		cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head,
+		cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
 			       curr_rev, buffer);
 
 		if (strcmp(match_path, buffer))
 			return READ_TREE_RECURSIVE;
@@ -187,9 +189,9 @@ void cgit_print_tree(const char *rev, char *path)
 	struct commit *commit;
 	const char *paths[] = {path, NULL};
 
 	if (!rev)
-		rev = cgit_query_head;
+		rev = ctx.qry.head;
 
 	curr_rev = xstrdup(rev);
 	if (get_sha1(rev, sha1)) {
 		cgit_print_error(fmt("Invalid revision name: %s", rev));
@@ -201,9 +203,9 @@ void cgit_print_tree(const char *rev, char *path)
 		return;
 	}
 
 	html("path: <a href='");
-	html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("h=%s", rev)));
+	html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
 	html("'>root</a>");
 
 	if (path == NULL) {
 		ls_tree(commit->tree->object.sha1, NULL);