Merge branch 'virtual-url'

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 6f5cf2b9155f6b4f5c158e34c0b2f14c3a2dff1f..c7fbc5e576a9ca6dec19890c5bb29d1229d7e313 100644 (file)
--- 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,17 +61,24 @@ 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);
+               if (query)
+                       return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
+               else
+                       return fmt("?r=%s&p=%s", reponame, 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)