X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/859d106d5e8d884bf8f25b2ceea8600b2987c387..973deda0eaf4e16c8cc0b25ca1bff1faae17584e:/ui-tree.c?ds=inline

diff --git a/ui-tree.c b/ui-tree.c
index 2d8d2f3..4d932a0 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -27,10 +27,10 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
 		html("<tr><td class='linenumbers'><pre>");
 		idx = 0;
 		lineno = 0;
-	
+
 		if (size) {
 			htmlf(numberfmt, ++lineno);
-			while(idx < size - 1) { // skip absolute last newline
+			while (idx < size - 1) { // skip absolute last newline
 				if (buf[idx] == '\n')
 					htmlf(numberfmt, ++lineno);
 				idx++;
@@ -45,7 +45,7 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
 	if (ctx.repo->source_filter) {
 		html("<td class='lines'><pre><code>");
 		ctx.repo->source_filter->argv[1] = xstrdup(name);
-		cgit_open_filter(ctx.repo->source_filter, ctx.repo);
+		cgit_open_filter(ctx.repo->source_filter);
 		html_raw(buf, size);
 		cgit_close_filter(ctx.repo->source_filter);
 		free(ctx.repo->source_filter->argv[1]);
@@ -150,13 +150,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 	cgit_print_filemode(mode);
 	html("</td><td>");
 	if (S_ISGITLINK(mode)) {
-		htmlf("<a class='ls-mod' href='");
-		html_attr(fmt(ctx.repo->module_link,
-			      name,
-			      sha1_to_hex(sha1)));
-		html("'>");
-		html_txt(name);
-		html("</a>");
+		cgit_submodule_link("ls-mod", fullpath, sha1_to_hex(sha1));
 	} else if (S_ISDIR(mode)) {
 		cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
 			       curr_rev, fullpath);
@@ -177,8 +171,9 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 	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);
+	if (!S_ISGITLINK(mode))
+		cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev,
+				fullpath);
 	html("</td></tr>\n");
 	free(name);
 	return 0;
@@ -207,6 +202,9 @@ static void ls_tail()
 static void ls_tree(const unsigned char *sha1, char *path)
 {
 	struct tree *tree;
+	struct pathspec paths = {
+		.nr = 0
+	};
 
 	tree = parse_tree_indirect(sha1);
 	if (!tree) {
@@ -216,7 +214,7 @@ static void ls_tree(const unsigned char *sha1, char *path)
 	}
 
 	ls_head();
-	read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL);
+	read_tree_recursive(tree, "", 0, 1, &paths, ls_item, NULL);
 	ls_tail();
 }
 
@@ -230,7 +228,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 
 	if (state == 0) {
 		memcpy(buffer, base, baselen);
-		strcpy(buffer+baselen, pathname);
+		strcpy(buffer + baselen, pathname);
 		if (strcmp(match_path, buffer))
 			return READ_TREE_RECURSIVE;
 
@@ -257,7 +255,14 @@ void cgit_print_tree(const char *rev, char *path)
 {
 	unsigned char sha1[20];
 	struct commit *commit;
-	const char *paths[] = {path, NULL};
+	struct pathspec_item path_items = {
+		.match = path,
+		.len = path ? strlen(path) : 0
+	};
+	struct pathspec paths = {
+		.nr = path ? 1 : 0,
+		.items = &path_items
+	};
 
 	if (!rev)
 		rev = ctx.qry.head;
@@ -279,6 +284,6 @@ void cgit_print_tree(const char *rev, char *path)
 	}
 
 	match_path = path;
-	read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
+	read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL);
 	ls_tail();
 }