X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/0255821e22678d4c58c809efe17bf2798835d5b9..57d09bf448990b3a67436e928807e854e491756f:/ui-shared.c?ds=sidebyside diff --git a/ui-shared.c b/ui-shared.c index 968933f..c1f3c20 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -7,6 +7,7 @@ */ #include "cgit.h" +#include "ui-shared.h" #include "cmd.h" #include "html.h" @@ -34,7 +35,7 @@ void cgit_print_error(const char *msg) html("\n"); } -char *cgit_httpscheme() +const char *cgit_httpscheme() { if (ctx.env.https && !strcmp(ctx.env.https, "on")) return "https://"; @@ -42,7 +43,7 @@ char *cgit_httpscheme() return "http://"; } -char *cgit_hosturl() +const char *cgit_hosturl() { if (ctx.env.http_host) return ctx.env.http_host; @@ -53,10 +54,10 @@ char *cgit_hosturl() return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port)); } -char *cgit_rooturl() +const char *cgit_rooturl() { if (ctx.cfg.virtual_root) - return fmt("%s/", ctx.cfg.virtual_root); + return ctx.cfg.virtual_root; else return ctx.cfg.script_name; } @@ -64,7 +65,7 @@ char *cgit_rooturl() char *cgit_repourl(const char *reponame) { if (ctx.cfg.virtual_root) { - return fmt("%s/%s/", ctx.cfg.virtual_root, reponame); + return fmt("%s%s/", ctx.cfg.virtual_root, reponame); } else { return fmt("?r=%s", reponame); } @@ -77,7 +78,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename, char *delim; if (ctx.cfg.virtual_root) { - tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame, + tmp = fmt("%s%s/%s/%s", ctx.cfg.virtual_root, reponame, pagename, (filename ? filename:"")); delim = "?"; } else { @@ -125,11 +126,9 @@ static void site_url(const char *page, const char *search, const char *sort, int { char *delim = "?"; - if (ctx.cfg.virtual_root) { + if (ctx.cfg.virtual_root) html_attr(ctx.cfg.virtual_root); - if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') - html("/"); - } else + else html(ctx.cfg.script_name); if (page) { @@ -200,8 +199,6 @@ static char *repolink(const char *title, const char *class, const char *page, html(" href='"); if (ctx.cfg.virtual_root) { html_url_path(ctx.cfg.virtual_root); - if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') - html("/"); html_url_path(ctx.repo->url); if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') html("/"); @@ -523,6 +520,7 @@ void cgit_submodule_link(const char *class, char *path, const char *rev) char tail, *dir; size_t len; + len = 0; tail = 0; list = &ctx.repo->submodules; item = lookup_path(list, path); @@ -650,7 +648,7 @@ void cgit_print_docstart(struct cgit_context *ctx) return; } - char *host = cgit_hosturl(); + const char *host = cgit_hosturl(); html(cgit_doctype); html("\n"); html("\n");