Makefile: suppress pkg-config error

[cgit.git] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 31224bc1aa23cb80118275a5077c5f28a4f8bfe9..1ede2b0bbfa4a55c49311fde04d6a5a7765d8362 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,12 +1,13 @@
 /* ui-shared.c: common web output functions
  *
 /* ui-shared.c: common web output functions
  *

- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"

+#include "ui-shared.h"

 #include "cmd.h"
 #include "html.h"
 
 #include "cmd.h"
 #include "html.h"
 


@@ -27,14 +28,25 @@ static char *http_date(time_t t)
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 

-void cgit_print_error(const char *msg)
+void cgit_print_error(const char *fmt, ...)

 {
 {

+       va_list ap;
+       va_start(ap, fmt);
+       cgit_vprint_error(fmt, ap);
+       va_end(ap);
+}
+
+void cgit_vprint_error(const char *fmt, va_list ap)
+{
+       va_list cp;

        html("<div class='error'>");
        html("<div class='error'>");

-       html_txt(msg);
+       va_copy(cp, ap);
+       html_vtxtf(fmt, cp);
+       va_end(cp);

        html("</div>\n");
 }
 
        html("</div>\n");
 }
 

-char *cgit_httpscheme()
+const char *cgit_httpscheme()

 {
        if (ctx.env.https && !strcmp(ctx.env.https, "on"))
                return "https://";
 {
        if (ctx.env.https && !strcmp(ctx.env.https, "on"))
                return "https://";


@@ -42,7 +54,7 @@ char *cgit_httpscheme()
                return "http://";
 }
 
                return "http://";
 }
 

-char *cgit_hosturl()
+const char *cgit_hosturl()

 {
        if (ctx.env.http_host)
                return ctx.env.http_host;
 {
        if (ctx.env.http_host)
                return ctx.env.http_host;


@@ -50,44 +62,51 @@ char *cgit_hosturl()
                return NULL;
        if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
                return ctx.env.server_name;
                return NULL;
        if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
                return ctx.env.server_name;

-       return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));
+       return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);

 }
 
 }
 

-char *cgit_rooturl()
+const char *cgit_rooturl()

 {
        if (ctx.cfg.virtual_root)
 {
        if (ctx.cfg.virtual_root)

-               return fmt("%s/", ctx.cfg.virtual_root);
+               return ctx.cfg.virtual_root;

        else
                return ctx.cfg.script_name;
 }
 
        else
                return ctx.cfg.script_name;
 }
 

+const char *cgit_loginurl()
+{
+       static const char *login_url = 0;
+       if (!login_url)
+               login_url = fmtalloc("%s?p=login", cgit_rooturl());
+       return login_url;
+}
+

 char *cgit_repourl(const char *reponame)
 {
 char *cgit_repourl(const char *reponame)
 {

-       if (ctx.cfg.virtual_root) {
-               return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
-       } else {
-               return fmt("?r=%s", reponame);
-       }
+       if (ctx.cfg.virtual_root)
+               return fmtalloc("%s%s/", ctx.cfg.virtual_root, reponame);
+       else
+               return fmtalloc("?r=%s", reponame);

 }
 
 char *cgit_fileurl(const char *reponame, const char *pagename,
                   const char *filename, const char *query)
 {
 }
 
 char *cgit_fileurl(const char *reponame, const char *pagename,
                   const char *filename, const char *query)
 {

-       char *tmp;
+       struct strbuf sb = STRBUF_INIT;

        char *delim;
 
        if (ctx.cfg.virtual_root) {
        char *delim;
 
        if (ctx.cfg.virtual_root) {

-               tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
-                         pagename, (filename ? filename:""));
+               strbuf_addf(&sb, "%s%s/%s/%s", ctx.cfg.virtual_root, reponame,
+                           pagename, (filename ? filename:""));

                delim = "?";
        } else {
                delim = "?";
        } else {

-               tmp = fmt("?url=%s/%s/%s", reponame, pagename,
-                         (filename ? filename : ""));
+               strbuf_addf(&sb, "?url=%s/%s/%s", reponame, pagename,
+                           (filename ? filename : ""));

                delim = "&amp;";
        }
        if (query)
                delim = "&amp;";
        }
        if (query)

-               tmp = fmt("%s%s%s", tmp, delim, query);
-       return tmp;
+               strbuf_addf(&sb, "%s%s", delim, query);
+       return strbuf_detach(&sb, NULL);

 }
 
 char *cgit_pageurl(const char *reponame, const char *pagename,
 }
 
 char *cgit_pageurl(const char *reponame, const char *pagename,


@@ -109,7 +128,7 @@ const char *cgit_repobasename(const char *reponame)
        /* strip trailing slashes */
        while (p && rvbuf[p] == '/') rvbuf[p--] = 0;
        /* strip trailing .git */
        /* strip trailing slashes */
        while (p && rvbuf[p] == '/') rvbuf[p--] = 0;
        /* strip trailing .git */

-       if (p >= 3 && !strncmp(&rvbuf[p-3], ".git", 4)) {
+       if (p >= 3 && !prefixcmp(&rvbuf[p-3], ".git")) {

                p -= 3; rvbuf[p--] = 0;
        }
        /* strip more trailing slashes if any */
                p -= 3; rvbuf[p--] = 0;
        }
        /* strip more trailing slashes if any */


@@ -125,12 +144,10 @@ static void site_url(const char *page, const char *search, const char *sort, int
 {
        char *delim = "?";
 
 {
        char *delim = "?";
 

-       if (ctx.cfg.virtual_root) {
+       if (ctx.cfg.virtual_root)

                html_attr(ctx.cfg.virtual_root);
                html_attr(ctx.cfg.virtual_root);

-               if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
-                       html("/");
-       } else
-               html(ctx.cfg.script_name);
+       else
+               html_url_path(ctx.cfg.script_name);

 
        if (page) {
                htmlf("?p=%s", page);
 
        if (page) {
                htmlf("?p=%s", page);


@@ -200,8 +217,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);
        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("/");
                html_url_path(ctx.repo->url);
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");


@@ -212,7 +227,7 @@ static char *repolink(const char *title, const char *class, const char *page,
                                html_url_path(path);
                }
        } else {
                                html_url_path(path);
                }
        } else {

-               html(ctx.cfg.script_name);
+               html_url_path(ctx.cfg.script_name);

                html("?url=");
                html_url_arg(ctx.repo->url);
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                html("?url=");
                html_url_arg(ctx.repo->url);
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')


@@ -421,62 +436,62 @@ void cgit_stats_link(const char *name, const char *title, const char *class,
        reporevlink("stats", name, title, class, head, NULL, path);
 }
 
        reporevlink("stats", name, title, class, head, NULL, path);
 }
 

-static void cgit_self_link(char *name, const char *title, const char *class,
-                          struct cgit_context *ctx)
-{
-       if (!strcmp(ctx->qry.page, "repolist"))
-               return cgit_index_link(name, title, class, ctx->qry.search, ctx->qry.sort,
-                                      ctx->qry.ofs);
-       else if (!strcmp(ctx->qry.page, "summary"))
-               return cgit_summary_link(name, title, class, ctx->qry.head);
-       else if (!strcmp(ctx->qry.page, "tag"))
-               return cgit_tag_link(name, title, class, ctx->qry.head,
-                                    ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
-       else if (!strcmp(ctx->qry.page, "tree"))
-               return cgit_tree_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
-       else if (!strcmp(ctx->qry.page, "plain"))
-               return cgit_plain_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
-       else if (!strcmp(ctx->qry.page, "log"))
-               return cgit_log_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path, ctx->qry.ofs,
-                                     ctx->qry.grep, ctx->qry.search,
-                                     ctx->qry.showmsg);
-       else if (!strcmp(ctx->qry.page, "commit"))
-               return cgit_commit_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path, 0);
-       else if (!strcmp(ctx->qry.page, "patch"))
-               return cgit_patch_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
-       else if (!strcmp(ctx->qry.page, "refs"))
-               return cgit_refs_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
-       else if (!strcmp(ctx->qry.page, "snapshot"))
-               return cgit_snapshot_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-                                     ctx->qry.path);
-       else if (!strcmp(ctx->qry.page, "diff"))
-               return cgit_diff_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.sha1, ctx->qry.sha2,
-                                     ctx->qry.path, 0);
-       else if (!strcmp(ctx->qry.page, "stats"))
-               return cgit_stats_link(name, title, class, ctx->qry.head,
-                                     ctx->qry.path);
-
-       /* Don't known how to make link for this page */
-       repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
-       html("><!-- cgit_self_link() doesn't know how to make link for page '");
-       html_txt(ctx->qry.page);
-       html("' -->");
-       html_txt(name);
-       html("</a>");
+static void cgit_self_link(char *name, const char *title, const char *class)
+{
+       if (!strcmp(ctx.qry.page, "repolist"))
+               cgit_index_link(name, title, class, ctx.qry.search, ctx.qry.sort,
+                               ctx.qry.ofs);
+       else if (!strcmp(ctx.qry.page, "summary"))
+               cgit_summary_link(name, title, class, ctx.qry.head);
+       else if (!strcmp(ctx.qry.page, "tag"))
+               cgit_tag_link(name, title, class, ctx.qry.head,
+                             ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL);
+       else if (!strcmp(ctx.qry.page, "tree"))
+               cgit_tree_link(name, title, class, ctx.qry.head,
+                              ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                              ctx.qry.path);
+       else if (!strcmp(ctx.qry.page, "plain"))
+               cgit_plain_link(name, title, class, ctx.qry.head,
+                               ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                               ctx.qry.path);
+       else if (!strcmp(ctx.qry.page, "log"))
+               cgit_log_link(name, title, class, ctx.qry.head,
+                             ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                             ctx.qry.path, ctx.qry.ofs,
+                             ctx.qry.grep, ctx.qry.search,
+                             ctx.qry.showmsg);
+       else if (!strcmp(ctx.qry.page, "commit"))
+               cgit_commit_link(name, title, class, ctx.qry.head,
+                                ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                                ctx.qry.path, 0);
+       else if (!strcmp(ctx.qry.page, "patch"))
+               cgit_patch_link(name, title, class, ctx.qry.head,
+                               ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                               ctx.qry.path);
+       else if (!strcmp(ctx.qry.page, "refs"))
+               cgit_refs_link(name, title, class, ctx.qry.head,
+                              ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                              ctx.qry.path);
+       else if (!strcmp(ctx.qry.page, "snapshot"))
+               cgit_snapshot_link(name, title, class, ctx.qry.head,
+                                  ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                                  ctx.qry.path);
+       else if (!strcmp(ctx.qry.page, "diff"))
+               cgit_diff_link(name, title, class, ctx.qry.head,
+                              ctx.qry.sha1, ctx.qry.sha2,
+                              ctx.qry.path, 0);
+       else if (!strcmp(ctx.qry.page, "stats"))
+               cgit_stats_link(name, title, class, ctx.qry.head,
+                               ctx.qry.path);
+       else {
+               /* Don't known how to make link for this page */
+               repolink(title, class, ctx.qry.page, ctx.qry.head, ctx.qry.path);
+               html("><!-- cgit_self_link() doesn't know how to make link for page '");
+               html_txt(ctx.qry.page);
+               html("' -->");
+               html_txt(name);
+               html("</a>");
+       }

 }
 
 void cgit_object_link(struct object *obj)
 }
 
 void cgit_object_link(struct object *obj)


@@ -522,6 +537,7 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
        char tail, *dir;
        size_t len;
 
        char tail, *dir;
        size_t len;
 

+       len = 0;

        tail = 0;
        list = &ctx.repo->submodules;
        item = lookup_path(list, path);
        tail = 0;
        list = &ctx.repo->submodules;
        item = lookup_path(list, path);


@@ -538,21 +554,21 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
                htmlf("class='%s' ", class);
        html("href='");
        if (item) {
                htmlf("class='%s' ", class);
        html("href='");
        if (item) {

-               html_attr(fmt(item->util, rev));
+               html_attrf(item->util, rev);

        } else if (ctx.repo->module_link) {
                dir = strrchr(path, '/');
                if (dir)
                        dir++;
                else
                        dir = path;
        } else if (ctx.repo->module_link) {
                dir = strrchr(path, '/');
                if (dir)
                        dir++;
                else
                        dir = path;

-               html_attr(fmt(ctx.repo->module_link, dir, rev));
+               html_attrf(ctx.repo->module_link, dir, rev);

        } else {
                html("#");
        }
        html("'>");
        html_txt(path);
        html("</a>");
        } else {
                html("#");
        }
        html("'>");
        html_txt(path);
        html("</a>");

-       html_txt(fmt(" @ %.7s", rev));
+       html_txtf(" @ %.7s", rev);

        if (item && tail)
                path[len - 1] = tail;
 }
        if (item && tail)
                path[len - 1] = tail;
 }


@@ -580,6 +596,8 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
                return;
        time(&now);
        secs = now - t;
                return;
        time(&now);
        secs = now - t;

+       if (secs < 0)
+               secs = 0;

 
        if (secs > max_relative && max_relative >= 0) {
                cgit_print_date(t, format, ctx.cfg.local_time);
 
        if (secs > max_relative && max_relative >= 0) {
                cgit_print_date(t, format, ctx.cfg.local_time);


@@ -615,72 +633,78 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
              secs * 1.0 / TM_YEAR);
 }
 
              secs * 1.0 / TM_YEAR);
 }
 

-void cgit_print_http_headers(struct cgit_context *ctx)
+void cgit_print_http_headers(void)

 {
 {

-       if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
+       if (ctx.env.no_http && !strcmp(ctx.env.no_http, "1"))

                return;
 
                return;
 

-       if (ctx->page.status)
-               htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
-       if (ctx->page.mimetype && ctx->page.charset)
-               htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
-                     ctx->page.charset);
-       else if (ctx->page.mimetype)
-               htmlf("Content-Type: %s\n", ctx->page.mimetype);
-       if (ctx->page.size)
-               htmlf("Content-Length: %zd\n", ctx->page.size);
-       if (ctx->page.filename)
+       if (ctx.page.status)
+               htmlf("Status: %d %s\n", ctx.page.status, ctx.page.statusmsg);
+       if (ctx.page.mimetype && ctx.page.charset)
+               htmlf("Content-Type: %s; charset=%s\n", ctx.page.mimetype,
+                     ctx.page.charset);
+       else if (ctx.page.mimetype)
+               htmlf("Content-Type: %s\n", ctx.page.mimetype);
+       if (ctx.page.size)
+               htmlf("Content-Length: %zd\n", ctx.page.size);
+       if (ctx.page.filename)

                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                htmlf("Content-Disposition: inline; filename=\"%s\"\n",

-                     ctx->page.filename);
-       htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
-       htmlf("Expires: %s\n", http_date(ctx->page.expires));
-       if (ctx->page.etag)
-               htmlf("ETag: \"%s\"\n", ctx->page.etag);
+                     ctx.page.filename);
+       if (!ctx.env.authenticated)
+               html("Cache-Control: no-cache, no-store\n");
+       htmlf("Last-Modified: %s\n", http_date(ctx.page.modified));
+       htmlf("Expires: %s\n", http_date(ctx.page.expires));
+       if (ctx.page.etag)
+               htmlf("ETag: \"%s\"\n", ctx.page.etag);

        html("\n");
        html("\n");

-       if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
+       if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))

                exit(0);
 }
 
                exit(0);
 }
 

-void cgit_print_docstart(struct cgit_context *ctx)
+void cgit_print_docstart(void)

 {
 {

-       if (ctx->cfg.embedded) {
-               if (ctx->cfg.header)
-                       html_include(ctx->cfg.header);
+       if (ctx.cfg.embedded) {
+               if (ctx.cfg.header)
+                       html_include(ctx.cfg.header);

                return;
        }
 
                return;
        }
 

-       char *host = cgit_hosturl();
+       const char *host = cgit_hosturl();

        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");
        html("<title>");
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");
        html("<title>");

-       html_txt(ctx->page.title);
+       html_txt(ctx.page.title);

        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);

-       if (ctx->cfg.robots && *ctx->cfg.robots)
-               htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
+       if (ctx.cfg.robots && *ctx.cfg.robots)
+               htmlf("<meta name='robots' content='%s'/>\n", ctx.cfg.robots);

        html("<link rel='stylesheet' type='text/css' href='");
        html("<link rel='stylesheet' type='text/css' href='");

-       html_attr(ctx->cfg.css);
+       html_attr(ctx.cfg.css);

        html("'/>\n");
        html("'/>\n");

-       if (ctx->cfg.favicon) {
+       if (ctx.cfg.favicon) {

                html("<link rel='shortcut icon' href='");
                html("<link rel='shortcut icon' href='");

-               html_attr(ctx->cfg.favicon);
+               html_attr(ctx.cfg.favicon);

                html("'/>\n");
        }
                html("'/>\n");
        }

-       if (host && ctx->repo && ctx->qry.head) {
+       if (host && ctx.repo && ctx.qry.head) {
+               struct strbuf sb = STRBUF_INIT;
+               strbuf_addf(&sb, "h=%s", ctx.qry.head);
+

                html("<link rel='alternate' title='Atom feed' href='");
                html(cgit_httpscheme());
                html_attr(cgit_hosturl());
                html("<link rel='alternate' title='Atom feed' href='");
                html(cgit_httpscheme());
                html_attr(cgit_hosturl());

-               html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath,
-                                      fmt("h=%s", ctx->qry.head)));
+               html_attr(cgit_fileurl(ctx.repo->url, "atom", ctx.qry.vpath,
+                                      sb.buf));

                html("' type='application/atom+xml'/>\n");
                html("' type='application/atom+xml'/>\n");

+               strbuf_release(&sb);

        }
        }

-       if (ctx->cfg.head_include)
-               html_include(ctx->cfg.head_include);
+       if (ctx.cfg.head_include)
+               html_include(ctx.cfg.head_include);

        html("</head>\n");
        html("<body>\n");
        html("</head>\n");
        html("<body>\n");

-       if (ctx->cfg.header)
-               html_include(ctx->cfg.header);
+       if (ctx.cfg.header)
+               html_include(ctx.cfg.header);

 }
 
 void cgit_print_docend()
 }
 
 void cgit_print_docend()


@@ -712,55 +736,17 @@ static int print_branch_option(const char *refname, const unsigned char *sha1,
        return 0;
 }
 
        return 0;
 }
 

-static int print_archive_ref(const char *refname, const unsigned char *sha1,
-                            int flags, void *cb_data)
-{
-       struct tag *tag;
-       struct taginfo *info;
-       struct object *obj;
-       char buf[256], *url;
-       unsigned char fileid[20];
-       int *header = (int *)cb_data;
-
-       if (prefixcmp(refname, "refs/archives"))
-               return 0;
-       strncpy(buf, refname + 14, sizeof(buf));
-       obj = parse_object(sha1);
-       if (!obj)
-               return 1;
-       if (obj->type == OBJ_TAG) {
-               tag = lookup_tag(sha1);
-               if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
-                       return 0;
-               hashcpy(fileid, tag->tagged->sha1);
-       } else if (obj->type != OBJ_BLOB) {
-               return 0;
-       } else {
-               hashcpy(fileid, sha1);
-       }
-       if (!*header) {
-               html("<h1>download</h1>\n");
-               *header = 1;
-       }
-       url = cgit_pageurl(ctx.qry.repo, "blob",
-                          fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
-                              buf));
-       html_link_open(url, NULL, "menu");
-       html_txt(strlpart(buf, 20));
-       html_link_close();
-       return 0;
-}
-

 void cgit_add_hidden_formfields(int incl_head, int incl_search,
                                const char *page)
 {
 void cgit_add_hidden_formfields(int incl_head, int incl_search,
                                const char *page)
 {

-       char *url;
-

        if (!ctx.cfg.virtual_root) {
        if (!ctx.cfg.virtual_root) {

-               url = fmt("%s/%s", ctx.qry.repo, page);
+               struct strbuf url = STRBUF_INIT;
+
+               strbuf_addf(&url, "%s/%s", ctx.qry.repo, page);

                if (ctx.qry.vpath)
                if (ctx.qry.vpath)

-                       url = fmt("%s/%s", url, ctx.qry.vpath);
-               html_hidden("url", url);
+                       strbuf_addf(&url, "/%s", ctx.qry.vpath);
+               html_hidden("url", url.buf);
+               strbuf_release(&url);

        }
 
        if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
        }
 
        if (incl_head && ctx.qry.head && ctx.repo->defbranch &&


@@ -782,47 +768,47 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
        }
 }
 
        }
 }
 

-static const char *hc(struct cgit_context *ctx, const char *page)
+static const char *hc(const char *page)

 {
 {

-       return strcmp(ctx->qry.page, page) ? NULL : "active";
+       return strcmp(ctx.qry.page, page) ? NULL : "active";

 }
 
 }
 

-static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
+static void cgit_print_path_crumbs(char *path)

 {
 {

-       char *old_path = ctx->qry.path;
+       char *old_path = ctx.qry.path;

        char *p = path, *q, *end = path + strlen(path);
 
        char *p = path, *q, *end = path + strlen(path);
 

-       ctx->qry.path = NULL;
-       cgit_self_link("root", NULL, NULL, ctx);
-       ctx->qry.path = p = path;
+       ctx.qry.path = NULL;
+       cgit_self_link("root", NULL, NULL);
+       ctx.qry.path = p = path;

        while (p < end) {
                if (!(q = strchr(p, '/')))
                        q = end;
                *q = '\0';
                html_txt("/");
        while (p < end) {
                if (!(q = strchr(p, '/')))
                        q = end;
                *q = '\0';
                html_txt("/");

-               cgit_self_link(p, NULL, NULL, ctx);
+               cgit_self_link(p, NULL, NULL);

                if (q < end)
                        *q = '/';
                p = q + 1;
        }
                if (q < end)
                        *q = '/';
                p = q + 1;
        }

-       ctx->qry.path = old_path;
+       ctx.qry.path = old_path;

 }
 
 }
 

-static void print_header(struct cgit_context *ctx)
+static void print_header(void)

 {
        char *logo = NULL, *logo_link = NULL;
 
        html("<table id='header'>\n");
        html("<tr>\n");
 
 {
        char *logo = NULL, *logo_link = NULL;
 
        html("<table id='header'>\n");
        html("<tr>\n");
 

-       if (ctx->repo && ctx->repo->logo && *ctx->repo->logo)
-               logo = ctx->repo->logo;
+       if (ctx.repo && ctx.repo->logo && *ctx.repo->logo)
+               logo = ctx.repo->logo;

        else
        else

-               logo = ctx->cfg.logo;
-       if (ctx->repo && ctx->repo->logo_link && *ctx->repo->logo_link)
-               logo_link = ctx->repo->logo_link;
+               logo = ctx.cfg.logo;
+       if (ctx.repo && ctx.repo->logo_link && *ctx.repo->logo_link)
+               logo_link = ctx.repo->logo_link;

        else
        else

-               logo_link = ctx->cfg.logo_link;
+               logo_link = ctx.cfg.logo_link;

        if (logo && *logo) {
                html("<td class='logo' rowspan='2'><a href='");
                if (logo_link && *logo_link)
        if (logo && *logo) {
                html("<td class='logo' rowspan='2'><a href='");
                if (logo_link && *logo_link)


@@ -835,102 +821,104 @@ static void print_header(struct cgit_context *ctx)
        }
 
        html("<td class='main'>");
        }
 
        html("<td class='main'>");

-       if (ctx->repo) {
+       if (ctx.repo) {

                cgit_index_link("index", NULL, NULL, NULL, NULL, 0);
                html(" : ");
                cgit_index_link("index", NULL, NULL, NULL, NULL, 0);
                html(" : ");

-               cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
-               html("</td><td class='form'>");
-               html("<form method='get' action=''>\n");
-               cgit_add_hidden_formfields(0, 1, ctx->qry.page);
-               html("<select name='h' onchange='this.form.submit();'>\n");
-               for_each_branch_ref(print_branch_option, ctx->qry.head);
-               html("</select> ");
-               html("<input type='submit' name='' value='switch'/>");
-               html("</form>");
+               cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
+               if (ctx.env.authenticated) {
+                       html("</td><td class='form'>");
+                       html("<form method='get' action=''>\n");
+                       cgit_add_hidden_formfields(0, 1, ctx.qry.page);
+                       html("<select name='h' onchange='this.form.submit();'>\n");
+                       for_each_branch_ref(print_branch_option, ctx.qry.head);
+                       html("</select> ");
+                       html("<input type='submit' name='' value='switch'/>");
+                       html("</form>");
+               }

        } else
        } else

-               html_txt(ctx->cfg.root_title);
+               html_txt(ctx.cfg.root_title);

        html("</td></tr>\n");
 
        html("<tr><td class='sub'>");
        html("</td></tr>\n");
 
        html("<tr><td class='sub'>");

-       if (ctx->repo) {
-               html_txt(ctx->repo->desc);
+       if (ctx.repo) {
+               html_txt(ctx.repo->desc);

                html("</td><td class='sub right'>");
                html("</td><td class='sub right'>");

-               html_txt(ctx->repo->owner);
+               html_txt(ctx.repo->owner);

        } else {
        } else {

-               if (ctx->cfg.root_desc)
-                       html_txt(ctx->cfg.root_desc);
-               else if (ctx->cfg.index_info)
-                       html_include(ctx->cfg.index_info);
+               if (ctx.cfg.root_desc)
+                       html_txt(ctx.cfg.root_desc);
+               else if (ctx.cfg.index_info)
+                       html_include(ctx.cfg.index_info);

        }
        html("</td></tr></table>\n");
 }
 
        }
        html("</td></tr></table>\n");
 }
 

-void cgit_print_pageheader(struct cgit_context *ctx)
+void cgit_print_pageheader(void)

 {
        html("<div id='cgit'>");
 {
        html("<div id='cgit'>");

-       if (!ctx->cfg.noheader)
-               print_header(ctx);
+       if (!ctx.env.authenticated || !ctx.cfg.noheader)
+               print_header();

 
        html("<table class='tabs'><tr><td>\n");
 
        html("<table class='tabs'><tr><td>\n");

-       if (ctx->repo) {
-               cgit_summary_link("summary", NULL, hc(ctx, "summary"),
-                                 ctx->qry.head);
-               cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
-                              ctx->qry.sha1, NULL);
-               cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
-                             NULL, ctx->qry.vpath, 0, NULL, NULL,
-                             ctx->qry.showmsg);
-               cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
-                              ctx->qry.sha1, ctx->qry.vpath);
-               cgit_commit_link("commit", NULL, hc(ctx, "commit"),
-                                ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0);
-               cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
-                              ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0);
-               if (ctx->repo->max_stats)
-                       cgit_stats_link("stats", NULL, hc(ctx, "stats"),
-                                       ctx->qry.head, ctx->qry.vpath);
-               if (ctx->repo->readme)
+       if (ctx.env.authenticated && ctx.repo) {
+               if (ctx.repo->readme.nr)

                        reporevlink("about", "about", NULL,
                        reporevlink("about", "about", NULL,

-                                   hc(ctx, "about"), ctx->qry.head, NULL,
+                                   hc("about"), ctx.qry.head, NULL,

                                    NULL);
                                    NULL);

+               cgit_summary_link("summary", NULL, hc("summary"),
+                                 ctx.qry.head);
+               cgit_refs_link("refs", NULL, hc("refs"), ctx.qry.head,
+                              ctx.qry.sha1, NULL);
+               cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
+                             NULL, ctx.qry.vpath, 0, NULL, NULL,
+                             ctx.qry.showmsg);
+               cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
+                              ctx.qry.sha1, ctx.qry.vpath);
+               cgit_commit_link("commit", NULL, hc("commit"),
+                                ctx.qry.head, ctx.qry.sha1, ctx.qry.vpath, 0);
+               cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head,
+                              ctx.qry.sha1, ctx.qry.sha2, ctx.qry.vpath, 0);
+               if (ctx.repo->max_stats)
+                       cgit_stats_link("stats", NULL, hc("stats"),
+                                       ctx.qry.head, ctx.qry.vpath);

                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");

-               if (ctx->cfg.virtual_root)
-                       html_url_path(cgit_fileurl(ctx->qry.repo, "log",
-                                                  ctx->qry.vpath, NULL));
+               if (ctx.cfg.virtual_root)
+                       html_url_path(cgit_fileurl(ctx.qry.repo, "log",
+                                                  ctx.qry.vpath, NULL));

                html("'>\n");
                cgit_add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");
                html("'>\n");
                cgit_add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");

-               html_option("grep", "log msg", ctx->qry.grep);
-               html_option("author", "author", ctx->qry.grep);
-               html_option("committer", "committer", ctx->qry.grep);
-               html_option("range", "range", ctx->qry.grep);
+               html_option("grep", "log msg", ctx.qry.grep);
+               html_option("author", "author", ctx.qry.grep);
+               html_option("committer", "committer", ctx.qry.grep);
+               html_option("range", "range", ctx.qry.grep);

                html("</select>\n");
                html("<input class='txt' type='text' size='10' name='q' value='");
                html("</select>\n");
                html("<input class='txt' type='text' size='10' name='q' value='");

-               html_attr(ctx->qry.search);
+               html_attr(ctx.qry.search);

                html("'/>\n");
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
                html("'/>\n");
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");

-       } else {
-               site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, NULL, 0);
-               if (ctx->cfg.root_readme)
-                       site_link("about", "about", NULL, hc(ctx, "about"),
+       } else if (ctx.env.authenticated) {
+               site_link(NULL, "index", NULL, hc("repolist"), NULL, NULL, 0);
+               if (ctx.cfg.root_readme)
+                       site_link("about", "about", NULL, hc("about"),

                                  NULL, NULL, 0);
                html("</td><td class='form'>");
                html("<form method='get' action='");
                html_attr(cgit_rooturl());
                html("'>\n");
                html("<input type='text' name='q' size='10' value='");
                                  NULL, NULL, 0);
                html("</td><td class='form'>");
                html("<form method='get' action='");
                html_attr(cgit_rooturl());
                html("'>\n");
                html("<input type='text' name='q' size='10' value='");

-               html_attr(ctx->qry.search);
+               html_attr(ctx.qry.search);

                html("'/>\n");
                html("<input type='submit' value='search'/>\n");
                html("</form>");
        }
        html("</td></tr></table>\n");
                html("'/>\n");
                html("<input type='submit' value='search'/>\n");
                html("</form>");
        }
        html("</td></tr></table>\n");

-       if (ctx->qry.vpath) {
+       if (ctx.env.authenticated && ctx.qry.vpath) {

                html("<div class='path'>");
                html("path: ");
                html("<div class='path'>");
                html("path: ");

-               cgit_print_path_crumbs(ctx, ctx->qry.vpath);
+               cgit_print_path_crumbs(ctx.qry.vpath);

                html("</div>");
        }
        html("<div class='content'>");
                html("</div>");
        }
        html("<div class='content'>");


@@ -955,19 +943,23 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
                               const char *hex, int snapshots)
 {
        const struct cgit_snapshot_format* f;
                               const char *hex, int snapshots)
 {
        const struct cgit_snapshot_format* f;

-       char *prefix;
-       char *filename;
+       struct strbuf filename = STRBUF_INIT;
+       size_t prefixlen;

        unsigned char sha1[20];
 
        if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
            (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
                hex++;
        unsigned char sha1[20];
 
        if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
            (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
                hex++;

-       prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));
+       strbuf_addf(&filename, "%s-%s", cgit_repobasename(repo), hex);
+       prefixlen = filename.len;

        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (!(snapshots & f->bit))
                        continue;
        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (!(snapshots & f->bit))
                        continue;

-               filename = fmt("%s%s", prefix, f->suffix);
-               cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
+               strbuf_setlen(&filename, prefixlen);
+               strbuf_addstr(&filename, f->suffix);
+               cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL,
+                                  filename.buf);

                html("<br/>");
        }
                html("<br/>");
        }

+       strbuf_release(&filename);

 }
 }