X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/3d8a6507ca542881a5e8b30ad6b7068a9c4fdeea..30304d8156a72ffc95e45e1aa9407319b81bd253:/ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 725f3ab..b0af073 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -12,36 +12,13 @@
 #include "ui-log.h"
 #include "ui-refs.h"
 #include "ui-blob.h"
+#include "ui-shared.h"
 #include <libgen.h>
 
-static void print_url(char *base, char *suffix)
-{
-	int columns = 3;
-	struct strbuf basebuf = STRBUF_INIT;
+static int urls;
 
-	if (ctx.repo->enable_log_filecount)
-		columns++;
-	if (ctx.repo->enable_log_linecount)
-		columns++;
-
-	if (!base || !*base)
-		return;
-	if (suffix && *suffix) {
-		strbuf_addf(&basebuf, "%s/%s", base, suffix);
-		base = basebuf.buf;
-	}
-	htmlf("<tr><td colspan='%d'><a href='", columns);
-	html_url_path(base);
-	html("'>");
-	html_txt(base);
-	html("</a></td></tr>\n");
-	strbuf_release(&basebuf);
-}
-
-static void print_urls(char *txt, char *suffix)
+static void print_url(const char *url)
 {
-	char *h = txt, *t, c;
-	int urls = 0;
 	int columns = 3;
 
 	if (ctx.repo->enable_log_filecount)
@@ -49,28 +26,21 @@ static void print_urls(char *txt, char *suffix)
 	if (ctx.repo->enable_log_linecount)
 		columns++;
 
-
-	while (h && *h) {
-		while (h && *h == ' ')
-			h++;
-		if (!*h)
-			break;
-		t = h;
-		while (t && *t && *t != ' ')
-			t++;
-		c = *t;
-		*t = 0;
-		if (urls++ == 0) {
-			htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
-			htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
-		}
-		print_url(h, suffix);
-		*t = c;
-		h = t;
+	if (urls++ == 0) {
+		htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
+		htmlf("<tr class='nohover'><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
 	}
+
+	htmlf("<tr><td colspan='%d'><a rel='vcs-git' href='", columns);
+	html_url_path(url);
+	html("' title='");
+	html_attr(ctx.repo->name);
+	html(" Git repository'>");
+	html_txt(url);
+	html("</a></td></tr>\n");
 }
 
-void cgit_print_summary()
+void cgit_print_summary(void)
 {
 	int columns = 3;
 
@@ -88,10 +58,8 @@ void cgit_print_summary()
 		cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
 			       NULL, NULL, 0, 0, 0);
 	}
-	if (ctx.repo->clone_url)
-		print_urls(expand_macros(ctx.repo->clone_url), NULL);
-	else if (ctx.cfg.clone_prefix)
-		print_urls(ctx.cfg.clone_prefix, ctx.repo->url);
+	urls = 0;
+	cgit_add_clone_urls(print_url);
 	html("</table>");
 }
 
@@ -112,11 +80,11 @@ static char* append_readme_path(const char *filename, const char *ref, const cha
 		full_path = xstrdup(path);
 	} else
 		full_path = fmtalloc("%s/%s", base_dir, path);
-	
+
 	if (!ref) {
 		resolved_base = realpath(base_dir, NULL);
 		resolved_full = realpath(full_path, NULL);
-		if (!resolved_base || !resolved_full || prefixcmp(resolved_full, resolved_base)) {
+		if (!resolved_base || !resolved_full || !starts_with(resolved_full, resolved_base)) {
 			free(full_path);
 			full_path = NULL;
 		}
@@ -136,7 +104,7 @@ void cgit_print_repo_readme(char *path)
 
 	if (ctx.repo->readme.nr == 0)
 		return;
-	
+
 	filename = ctx.repo->readme.items[0].string;
 	ref = ctx.repo->readme.items[0].util;
 
@@ -151,16 +119,12 @@ void cgit_print_repo_readme(char *path)
 	 * filesystem, while applying the about-filter.
 	 */
 	html("<div id='summary'>");
-	if (ctx.repo->about_filter)
-		cgit_open_filter(ctx.repo->about_filter, filename);
-
+	cgit_open_filter(ctx.repo->about_filter, filename);
 	if (ref)
 		cgit_print_file(filename, ref, 1);
 	else
 		html_include(filename);
-
-	if (ctx.repo->about_filter)
-		cgit_close_filter(ctx.repo->about_filter);
+	cgit_close_filter(ctx.repo->about_filter);
 
 	html("</div>");
 	if (free_filename)