ui-shared: currenturl should take into account leading slash

diff --git a/ui-shared.c b/ui-shared.c
index 7bcb8d33f5ba38a4421a1b7aac48d229a0e5a3d7..23a893be1cb6cab351adf596c26aa4f8637d9911 100644 (file)
--- 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)