X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/6fb7d09fea94b3dd6932469283358cb24f1e7e29..e189344:/ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 6f5cf2b..6211056 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -45,7 +45,7 @@ char *cgit_rooturl()
 	if (cgit_virtual_root)
 		return fmt("%s/", cgit_virtual_root);
 	else
-		return "./cgit.cgi";
+		return cgit_script_name;
 }
 
 char *cgit_repourl(const char *reponame)
@@ -61,8 +61,12 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
 		   const char *query)
 {
 	if (cgit_virtual_root) {
-		return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
-			   pagename, query);
+		if (query)
+			return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
+				   pagename, query);
+		else
+			return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
+				   pagename);
 	} else {
 		return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
 	}
@@ -71,7 +75,7 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
 char *cgit_currurl()
 {
 	if (!cgit_virtual_root)
-		return "./cgit.cgi";
+		return cgit_script_name;
 	else if (cgit_query_page)
 		return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
 	else if (cgit_query_repo)