1 files changed, 10 insertions, 13 deletions

diff --git a/ui-tree.c b/ui-tree.c
index a164767..75ec9cb 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -89,36 +89,42 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
 	unsigned long size;
 
 	type = sha1_object_info(sha1, &size);
 	if (type == OBJ_BAD) {
 		cgit_print_error(fmt("Bad object name: %s",
 				     sha1_to_hex(sha1)));
 		return;
 	}
 
 	buf = read_sha1_file(sha1, &type, &size);
 	if (!buf) {
 		cgit_print_error(fmt("Error reading object %s",
 				     sha1_to_hex(sha1)));
 		return;
 	}
 
-	html(" (");
+	htmlf("blob: %s (", sha1_to_hex(sha1));
 	cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
 		        curr_rev, path);
-	htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
+	html(")\n");
+
+	if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
+		htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>",
+				size / 1024, ctx.cfg.max_blob_size);
+		return;
+	}
 
 	if (buffer_is_binary(buf, size))
 		print_binary_buffer(buf, size);
 	else
 		print_text_buffer(basename, buf, size);
 }
 
 
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 		   const char *pathname, unsigned int mode, int stage,
 		   void *cbdata)
 {
 	char *name;
 	char *fullpath;
 	char *class;
 	enum object_type type;
@@ -156,32 +162,34 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 		class = strrchr(name, '.');
 		if (class != NULL) {
 			class = fmt("ls-blob %s", class + 1);
 		} else
 			class = "ls-blob";
 		cgit_tree_link(name, NULL, class, ctx.qry.head,
 			       curr_rev, fullpath);
 	}
 	htmlf("</td><td class='ls-size'>%li</td>", size);
 
 	html("<td>");
 	cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
 		      fullpath, 0, NULL, NULL, ctx.qry.showmsg);
 	if (ctx.repo->max_stats)
 		cgit_stats_link("stats", NULL, "button", ctx.qry.head,
 				fullpath);
+	cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev,
+			fullpath);
 	html("</td></tr>\n");
 	free(name);
 	return 0;
 }
 
 static void ls_head()
 {
 	html("<table summary='tree listing' class='list'>\n");
 	html("<tr class='nohover'>");
 	html("<th class='left'>Mode</th>");
 	html("<th class='left'>Name</th>");
 	html("<th class='right'>Size</th>");
 	html("<th/>");
 	html("</tr>\n");
 	header = 1;
 }
@@ -204,43 +212,36 @@ static void ls_tree(const unsigned char *sha1, char *path)
 				     sha1_to_hex(sha1)));
 		return;
 	}
 
 	ls_head();
 	read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL);
 	ls_tail();
 }
 
 
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 		     const char *pathname, unsigned mode, int stage,
 		     void *cbdata)
 {
 	static int state;
 	static char buffer[PATH_MAX];
-	char *url;
 
 	if (state == 0) {
 		memcpy(buffer, base, baselen);
 		strcpy(buffer+baselen, pathname);
-		url = cgit_pageurl(ctx.qry.repo, "tree",
-				   fmt("h=%s&amp;path=%s", curr_rev, buffer));
-		html("/");
-		cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
-			       curr_rev, buffer);
-
 		if (strcmp(match_path, buffer))
 			return READ_TREE_RECURSIVE;
 
 		if (S_ISDIR(mode)) {
 			state = 1;
 			ls_head();
 			return READ_TREE_RECURSIVE;
 		} else {
 			print_object(sha1, buffer, pathname);
 			return 0;
 		}
 	}
 	ls_item(sha1, base, baselen, pathname, mode, stage, NULL);
 	return 0;
 }
 
@@ -257,29 +258,25 @@ void cgit_print_tree(const char *rev, char *path)
 	const char *paths[] = {path, NULL};
 
 	if (!rev)
 		rev = ctx.qry.head;
 
 	curr_rev = xstrdup(rev);
 	if (get_sha1(rev, sha1)) {
 		cgit_print_error(fmt("Invalid revision name: %s", rev));
 		return;
 	}
 	commit = lookup_commit_reference(sha1);
 	if (!commit || parse_commit(commit)) {
 		cgit_print_error(fmt("Invalid commit reference: %s", rev));
 		return;
 	}
 
-	html("path: <a href='");
-	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);
 		return;
 	}
 
 	match_path = path;
 	read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
 	ls_tail();
 }