X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/37fce9916a264e23c0639df56ca3ecbbdc1c84b8..6edfc1672cdc5eb0dfb0ff5db0ec1de1ec53415e:/ui-shared.c diff --git a/ui-shared.c b/ui-shared.c index d9f8258..c04f380 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -54,21 +54,21 @@ const char *cgit_httpscheme(void) return "http://"; } -const char *cgit_hosturl(void) +char *cgit_hosturl(void) { if (ctx.env.http_host) - return ctx.env.http_host; + return xstrdup(ctx.env.http_host); if (!ctx.env.server_name) return NULL; if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80) - return ctx.env.server_name; + return xstrdup(ctx.env.server_name); return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port); } -const char *cgit_currenturl(void) +char *cgit_currenturl(void) { if (!ctx.qry.url) - return cgit_rooturl(); + return xstrdup(cgit_rooturl()); const char *root = cgit_rooturl(); size_t len = strlen(root); if (len && root[len - 1] == '/') @@ -157,8 +157,11 @@ static void site_url(const char *page, const char *search, const char *sort, int if (always_root || page) html_attr(cgit_rooturl()); - else - html_attr(cgit_currenturl()); + else { + char *currenturl = cgit_currenturl(); + html_attr(currenturl); + free(currenturl); + } if (page) { htmlf("?p=%s", page); @@ -727,7 +730,7 @@ void cgit_print_docstart(void) return; } - const char *host = cgit_hosturl(); + char *host = cgit_hosturl(); html(cgit_doctype); html("\n"); html("\n"); @@ -752,7 +755,7 @@ void cgit_print_docstart(void) html("\n"); html("\n"); } else if (ctx.env.authenticated) { + char *currenturl = cgit_currenturl(); site_link(NULL, "index", NULL, hc("repolist"), NULL, NULL, 0, 1); if (ctx.cfg.root_readme) site_link("about", "about", NULL, hc("about"), NULL, NULL, 0, 1); html(""); html("
\n"); html("\n"); html("\n"); html("
"); + free(currenturl); } html("\n"); if (ctx.env.authenticated && ctx.qry.vpath) {