X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/c422b9b3d5938a4d386533604d4c0dbedfcb2b6d..db4b735464aa9a3a329494b7f042413a65e182f2:/ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index d8cc4d7..f8e5bef 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -144,10 +144,10 @@ static void site_url(const char *page, const char *search, const char *sort, int
 {
 	char *delim = "?";
 
-	if (ctx.cfg.virtual_root)
-		html_attr(ctx.cfg.virtual_root);
+	if (!page)
+		html_attr(ctx.qry.url);
 	else
-		html_url_path(ctx.cfg.script_name);
+		html_attr(cgit_rooturl());
 
 	if (page) {
 		htmlf("?p=%s", page);
@@ -751,31 +751,19 @@ void cgit_print_docend()
 
 static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
 {
-	struct strbuf buf = STRBUF_INIT;
-	char *h = txt, *t, c;
+	struct strbuf **url_list = strbuf_split_str(txt, ' ', 0);
+	int i;
 
-	while (h && *h) {
-		while (h && *h == ' ')
-			h++;
-		if (!*h)
-			break;
-		t = h;
-		while (t && *t && *t != ' ')
-			t++;
-		c = *t;
-		*t = 0;
-
-		if (suffix && *suffix) {
-			strbuf_reset(&buf);
-			strbuf_addf(&buf, "%s/%s", h, suffix);
-			h = buf.buf;
-		}
-		fn(h);
-		*t = c;
-		h = t;
+	for (i = 0; url_list[i]; i++) {
+		strbuf_rtrim(url_list[i]);
+		if (url_list[i]->len == 0)
+			continue;
+		if (suffix && *suffix)
+			strbuf_addf(url_list[i], "/%s", suffix);
+		fn(url_list[i]->buf);
 	}
 
-	strbuf_release(&buf);
+	strbuf_list_free(url_list);
 }
 
 void cgit_add_clone_urls(void (*fn)(const char *))
@@ -964,7 +952,7 @@ void cgit_print_pageheader(void)
 				  NULL, NULL, 0);
 		html("</td><td class='form'>");
 		html("<form method='get' action='");
-		html_attr(cgit_rooturl());
+		html_attr(ctx.qry.url);
 		html("'>\n");
 		html("<input type='text' name='q' size='10' value='");
 		html_attr(ctx.qry.search);