X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/94e5f212f55d3f4dd6ce83edb6db823de7eb8cc7..7511f4b4df521656d422010b06e2b5b96b21eb84:/ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 1e3c131..23a893b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -69,7 +69,11 @@ const char *cgit_currenturl(void)
 {
 	if (!ctx.qry.url)
 		return cgit_rooturl();
-	return ctx.qry.url;
+	const char *root = cgit_rooturl();
+	size_t len = strlen(root);
+	if (len && root[len - 1] == '/')
+		return fmtalloc("%s%s", root, ctx.qry.url);
+	return fmtalloc("%s/%s", root, ctx.qry.url);
 }
 
 const char *cgit_rooturl(void)
@@ -119,7 +123,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
 char *cgit_pageurl(const char *reponame, const char *pagename,
 		   const char *query)
 {
-	return cgit_fileurl(reponame, pagename, 0, query);
+	return cgit_fileurl(reponame, pagename, NULL, query);
 }
 
 const char *cgit_repobasename(const char *reponame)