]> gitweb.ps.run Git - ps-cgit/blobdiff - ui-shared.c
projects / ps-cgit / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
git: update to v2.39.1
[ps-cgit] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c
index 72879567b43a32e853e7daac96a2b44a85635b6d..baea6f2c84e9f168df4e29983e9593b1b2cf888a 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,18 +1,19 @@
 /* ui-shared.c: common web output functions
  *
 /* ui-shared.c: common web output functions
  *
- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2017 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"
+#include "version.h"
 
 
-const char cgit_doctype[] =
-"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
-"  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
+static const char cgit_doctype[] =
+"<!DOCTYPE html>\n";
 
 static char *http_date(time_t t)
 {
 
 static char *http_date(time_t t)
 {
@@ -20,61 +21,144 @@ static char *http_date(time_t t)
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
        static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
        static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-                "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
-       struct tm *tm = gmtime(&t);
-       return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
-                  tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
-                  tm->tm_hour, tm->tm_min, tm->tm_sec);
+                "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+       struct tm tm;
+       gmtime_r(&t, &tm);
+       return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm.tm_wday],
+                  tm.tm_mday, month[tm.tm_mon], 1900 + tm.tm_year,
+                  tm.tm_hour, tm.tm_min, tm.tm_sec);
 }
 
 }
 
-void cgit_print_error(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_rooturl()
+const char *cgit_httpscheme(void)
+{
+       if (ctx.env.https && !strcmp(ctx.env.https, "on"))
+               return "https://";
+       else
+               return "http://";
+}
+
+char *cgit_hosturl(void)
+{
+       if (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 xstrdup(ctx.env.server_name);
+       return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);
+}
+
+char *cgit_currenturl(void)
+{
+       const char *root = cgit_rooturl();
+
+       if (!ctx.qry.url)
+               return xstrdup(root);
+       if (root[0] && root[strlen(root) - 1] == '/')
+               return fmtalloc("%s%s", root, ctx.qry.url);
+       return fmtalloc("%s/%s", root, ctx.qry.url);
+}
+
+char *cgit_currentfullurl(void)
+{
+       const char *root = cgit_rooturl();
+       const char *orig_query = ctx.env.query_string ? ctx.env.query_string : "";
+       size_t len = strlen(orig_query);
+       char *query = xmalloc(len + 2), *start_url, *ret;
+
+       /* Remove all url=... parts from query string */
+       memcpy(query + 1, orig_query, len + 1);
+       query[0] = '?';
+       start_url = query;
+       while ((start_url = strstr(start_url, "url=")) != NULL) {
+               if (start_url[-1] == '?' || start_url[-1] == '&') {
+                       const char *end_url = strchr(start_url, '&');
+                       if (end_url)
+                               memmove(start_url, end_url + 1, strlen(end_url));
+                       else
+                               start_url[0] = '\0';
+               } else
+                       ++start_url;
+       }
+       if (!query[1])
+               query[0] = '\0';
+
+       if (!ctx.qry.url)
+               ret = fmtalloc("%s%s", root, query);
+       else if (root[0] && root[strlen(root) - 1] == '/')
+               ret = fmtalloc("%s%s%s", root, ctx.qry.url, query);
+       else
+               ret = fmtalloc("%s/%s%s", root, ctx.qry.url, query);
+       free(query);
+       return ret;
+}
+
+const char *cgit_rooturl(void)
 {
        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(void)
+{
+       static const char *login_url;
+       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 : ""));
-               delim = "&";
+               strbuf_addf(&sb, "?url=%s/%s/%s", reponame, pagename,
+                           (filename ? filename : ""));
+               delim = "&amp;";
        }
        if (query)
        }
        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,
                   const char *query)
 {
 }
 
 char *cgit_pageurl(const char *reponame, const char *pagename,
                   const char *query)
 {
-       return cgit_fileurl(reponame,pagename,0,query);
+       return cgit_fileurl(reponame, pagename, NULL, query);
 }
 
 const char *cgit_repobasename(const char *reponame)
 }
 
 const char *cgit_repobasename(const char *reponame)
@@ -83,39 +167,101 @@ const char *cgit_repobasename(const char *reponame)
        static char rvbuf[1024];
        int p;
        const char *rv;
        static char rvbuf[1024];
        int p;
        const char *rv;
-       strncpy(rvbuf,reponame,sizeof(rvbuf));
-       if(rvbuf[sizeof(rvbuf)-1])
+       size_t len;
+
+       len = strlcpy(rvbuf, reponame, sizeof(rvbuf));
+       if (len >= sizeof(rvbuf))
                die("cgit_repobasename: truncated repository name '%s'", reponame);
                die("cgit_repobasename: truncated repository name '%s'", reponame);
-       p = strlen(rvbuf)-1;
+       p = len - 1;
        /* strip trailing slashes */
        /* strip trailing slashes */
-       while(p && rvbuf[p]=='/') rvbuf[p--]=0;
+       while (p && rvbuf[p] == '/')
+               rvbuf[p--] = '\0';
        /* strip trailing .git */
        /* strip trailing .git */
-       if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
-               p -= 3; rvbuf[p--] = 0;
+       if (p >= 3 && starts_with(&rvbuf[p-3], ".git")) {
+               p -= 3;
+               rvbuf[p--] = '\0';
        }
        /* strip more trailing slashes if any */
        }
        /* strip more trailing slashes if any */
-       while( p && rvbuf[p]=='/') rvbuf[p--]=0;
+       while (p && rvbuf[p] == '/')
+               rvbuf[p--] = '\0';
        /* find last slash in the remaining string */
        /* find last slash in the remaining string */
-       rv = strrchr(rvbuf,'/');
-       if(rv)
+       rv = strrchr(rvbuf, '/');
+       if (rv)
                return ++rv;
        return rvbuf;
 }
 
                return ++rv;
        return rvbuf;
 }
 
-char *cgit_currurl()
+const char *cgit_snapshot_prefix(const struct cgit_repo *repo)
 {
 {
-       if (!ctx.cfg.virtual_root)
-               return ctx.cfg.script_name;
-       else if (ctx.qry.page)
-               return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
-       else if (ctx.qry.repo)
-               return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
-       else
-               return fmt("%s/", ctx.cfg.virtual_root);
+       if (repo->snapshot_prefix)
+               return repo->snapshot_prefix;
+
+       return cgit_repobasename(repo->url);
 }
 
 }
 
-static char *repolink(char *title, char *class, char *page, char *head,
-                     char *path)
+static void site_url(const char *page, const char *search, const char *sort, int ofs, int always_root)
+{
+       char *delim = "?";
+
+       if (always_root || page)
+               html_attr(cgit_rooturl());
+       else {
+               char *currenturl = cgit_currenturl();
+               html_attr(currenturl);
+               free(currenturl);
+       }
+
+       if (page) {
+               htmlf("?p=%s", page);
+               delim = "&amp;";
+       }
+       if (search) {
+               html(delim);
+               html("q=");
+               html_attr(search);
+               delim = "&amp;";
+       }
+       if (sort) {
+               html(delim);
+               html("s=");
+               html_attr(sort);
+               delim = "&amp;";
+       }
+       if (ofs) {
+               html(delim);
+               htmlf("ofs=%d", ofs);
+       }
+}
+
+static void site_link(const char *page, const char *name, const char *title,
+                     const char *class, const char *search, const char *sort, int ofs, int always_root)
+{
+       html("<a");
+       if (title) {
+               html(" title='");
+               html_attr(title);
+               html("'");
+       }
+       if (class) {
+               html(" class='");
+               html_attr(class);
+               html("'");
+       }
+       html(" href='");
+       site_url(page, search, sort, ofs, always_root);
+       html("'>");
+       html_txt(name);
+       html("</a>");
+}
+
+void cgit_index_link(const char *name, const char *title, const char *class,
+                    const char *pattern, const char *sort, int ofs, int always_root)
+{
+       site_link(NULL, name, title, class, pattern, sort, ofs, always_root);
+}
+
+static char *repolink(const char *title, const char *class, const char *page,
+                     const char *head, const char *path)
 {
        char *delim = "?";
 
 {
        char *delim = "?";
 
@@ -132,186 +278,407 @@ static char *repolink(char *title, char *class, char *page, char *head,
        }
        html(" href='");
        if (ctx.cfg.virtual_root) {
        }
        html(" href='");
        if (ctx.cfg.virtual_root) {
-               html_attr(ctx.cfg.virtual_root);
-               if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
-                       html("/");
-               html_attr(ctx.repo->url);
+               html_url_path(ctx.cfg.virtual_root);
+               html_url_path(ctx.repo->url);
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
-                       html(page);
+                       html_url_path(page);
                        html("/");
                        if (path)
                        html("/");
                        if (path)
-                               html_attr(path);
+                               html_url_path(path);
                }
        } else {
                }
        } else {
-               html(ctx.cfg.script_name);
+               html_url_path(ctx.cfg.script_name);
                html("?url=");
                html("?url=");
-               html_attr(ctx.repo->url);
+               html_url_arg(ctx.repo->url);
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
-                       html(page);
+                       html_url_arg(page);
                        html("/");
                        if (path)
                        html("/");
                        if (path)
-                               html_attr(path);
+                               html_url_arg(path);
                }
                delim = "&amp;";
        }
                }
                delim = "&amp;";
        }
-       if (head && strcmp(head, ctx.repo->defbranch)) {
+       if (head && ctx.repo->defbranch && strcmp(head, ctx.repo->defbranch)) {
                html(delim);
                html("h=");
                html(delim);
                html("h=");
-               html_attr(head);
+               html_url_arg(head);
                delim = "&amp;";
        }
        return fmt("%s", delim);
 }
 
                delim = "&amp;";
        }
        return fmt("%s", delim);
 }
 
-static void reporevlink(char *page, char *name, char *title, char *class,
-                       char *head, char *rev, char *path)
+static void reporevlink(const char *page, const char *name, const char *title,
+                       const char *class, const char *head, const char *rev,
+                       const char *path)
 {
        char *delim;
 
        delim = repolink(title, class, page, head, path);
 {
        char *delim;
 
        delim = repolink(title, class, page, head, path);
-       if (rev && strcmp(rev, ctx.qry.head)) {
+       if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html(delim);
                html("id=");
-               html_attr(rev);
+               html_url_arg(rev);
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
-void cgit_tree_link(char *name, char *title, char *class, char *head,
-                   char *rev, char *path)
+void cgit_summary_link(const char *name, const char *title, const char *class,
+                      const char *head)
+{
+       reporevlink(NULL, name, title, class, head, NULL, NULL);
+}
+
+void cgit_tag_link(const char *name, const char *title, const char *class,
+                  const char *tag)
+{
+       reporevlink("tag", name, title, class, tag, NULL, NULL);
+}
+
+void cgit_tree_link(const char *name, const char *title, const char *class,
+                   const char *head, const char *rev, const char *path)
 {
        reporevlink("tree", name, title, class, head, rev, path);
 }
 
 {
        reporevlink("tree", name, title, class, head, rev, path);
 }
 
-void cgit_log_link(char *name, char *title, char *class, char *head,
-                  char *rev, char *path, int ofs, char *grep, char *pattern)
+void cgit_plain_link(const char *name, const char *title, const char *class,
+                    const char *head, const char *rev, const char *path)
+{
+       reporevlink("plain", name, title, class, head, rev, path);
+}
+
+void cgit_blame_link(const char *name, const char *title, const char *class,
+                    const char *head, const char *rev, const char *path)
+{
+       reporevlink("blame", name, title, class, head, rev, path);
+}
+
+void cgit_log_link(const char *name, const char *title, const char *class,
+                  const char *head, const char *rev, const char *path,
+                  int ofs, const char *grep, const char *pattern, int showmsg,
+                  int follow)
 {
        char *delim;
 
        delim = repolink(title, class, "log", head, path);
 {
        char *delim;
 
        delim = repolink(title, class, "log", head, path);
-       if (rev && strcmp(rev, ctx.qry.head)) {
+       if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html(delim);
                html("id=");
-               html_attr(rev);
-               delim = "&";
+               html_url_arg(rev);
+               delim = "&amp;";
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");
-               html_attr(grep);
-               delim = "&";
+               html_url_arg(grep);
+               delim = "&amp;";
                html(delim);
                html("q=");
                html(delim);
                html("q=");
-               html_attr(pattern);
+               html_url_arg(pattern);
        }
        if (ofs > 0) {
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);
        }
        if (ofs > 0) {
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);
+               delim = "&amp;";
+       }
+       if (showmsg) {
+               html(delim);
+               html("showmsg=1");
+               delim = "&amp;";
+       }
+       if (follow) {
+               html(delim);
+               html("follow=1");
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
-void cgit_commit_link(char *name, char *title, char *class, char *head,
-                     char *rev)
+void cgit_commit_link(const char *name, const char *title, const char *class,
+                     const char *head, const char *rev, const char *path)
 {
 {
-       if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
-               name[ctx.cfg.max_msg_len] = '\0';
-               name[ctx.cfg.max_msg_len - 1] = '.';
-               name[ctx.cfg.max_msg_len - 2] = '.';
-               name[ctx.cfg.max_msg_len - 3] = '.';
+       char *delim;
+
+       delim = repolink(title, class, "commit", head, path);
+       if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
+               html(delim);
+               html("id=");
+               html_url_arg(rev);
+               delim = "&amp;";
+       }
+       if (ctx.qry.difftype) {
+               html(delim);
+               htmlf("dt=%d", ctx.qry.difftype);
+               delim = "&amp;";
+       }
+       if (ctx.qry.context > 0 && ctx.qry.context != 3) {
+               html(delim);
+               html("context=");
+               htmlf("%d", ctx.qry.context);
+               delim = "&amp;";
+       }
+       if (ctx.qry.ignorews) {
+               html(delim);
+               html("ignorews=1");
+               delim = "&amp;";
+       }
+       if (ctx.qry.follow) {
+               html(delim);
+               html("follow=1");
        }
        }
-       reporevlink("commit", name, title, class, head, rev, NULL);
+       html("'>");
+       if (name[0] != '\0') {
+               if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
+                       html_ntxt(name, ctx.cfg.max_msg_len - 3);
+                       html("...");
+               } else
+                       html_txt(name);
+       } else
+               html_txt("(no commit message)");
+       html("</a>");
 }
 
 }
 
-void cgit_refs_link(char *name, char *title, char *class, char *head,
-                   char *rev, char *path)
+void cgit_refs_link(const char *name, const char *title, const char *class,
+                   const char *head, const char *rev, const char *path)
 {
        reporevlink("refs", name, title, class, head, rev, path);
 }
 
 {
        reporevlink("refs", name, title, class, head, rev, path);
 }
 
-void cgit_snapshot_link(char *name, char *title, char *class, char *head,
-                       char *rev, char *archivename)
+void cgit_snapshot_link(const char *name, const char *title, const char *class,
+                       const char *head, const char *rev,
+                       const char *archivename)
 {
        reporevlink("snapshot", name, title, class, head, rev, archivename);
 }
 
 {
        reporevlink("snapshot", name, title, class, head, rev, archivename);
 }
 
-void cgit_diff_link(char *name, char *title, char *class, char *head,
-                   char *new_rev, char *old_rev, char *path)
+void cgit_diff_link(const char *name, const char *title, const char *class,
+                   const char *head, const char *new_rev, const char *old_rev,
+                   const char *path)
 {
        char *delim;
 
        delim = repolink(title, class, "diff", head, path);
 {
        char *delim;
 
        delim = repolink(title, class, "diff", head, path);
-       if (new_rev && strcmp(new_rev, ctx.qry.head)) {
+       if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html(delim);
                html("id=");
-               html_attr(new_rev);
+               html_url_arg(new_rev);
                delim = "&amp;";
        }
        if (old_rev) {
                html(delim);
                html("id2=");
                delim = "&amp;";
        }
        if (old_rev) {
                html(delim);
                html("id2=");
-               html_attr(old_rev);
+               html_url_arg(old_rev);
+               delim = "&amp;";
+       }
+       if (ctx.qry.difftype) {
+               html(delim);
+               htmlf("dt=%d", ctx.qry.difftype);
+               delim = "&amp;";
+       }
+       if (ctx.qry.context > 0 && ctx.qry.context != 3) {
+               html(delim);
+               html("context=");
+               htmlf("%d", ctx.qry.context);
+               delim = "&amp;";
+       }
+       if (ctx.qry.ignorews) {
+               html(delim);
+               html("ignorews=1");
+               delim = "&amp;";
+       }
+       if (ctx.qry.follow) {
+               html(delim);
+               html("follow=1");
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
-void cgit_patch_link(char *name, char *title, char *class, char *head,
-                    char *rev)
+void cgit_patch_link(const char *name, const char *title, const char *class,
+                    const char *head, const char *rev, const char *path)
+{
+       reporevlink("patch", name, title, class, head, rev, path);
+}
+
+void cgit_stats_link(const char *name, const char *title, const char *class,
+                    const char *head, const char *path)
+{
+       reporevlink("stats", name, title, class, head, NULL, path);
+}
+
+static void cgit_self_link(char *name, const char *title, const char *class)
 {
 {
-       reporevlink("patch", name, title, class, head, rev, NULL);
+       if (!strcmp(ctx.qry.page, "repolist"))
+               cgit_index_link(name, title, class, ctx.qry.search, ctx.qry.sort,
+                               ctx.qry.ofs, 1);
+       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.has_oid ?
+                              ctx.qry.oid : ctx.qry.head);
+       else if (!strcmp(ctx.qry.page, "tree"))
+               cgit_tree_link(name, title, class, ctx.qry.head,
+                              ctx.qry.has_oid ? ctx.qry.oid : NULL,
+                              ctx.qry.path);
+       else if (!strcmp(ctx.qry.page, "plain"))
+               cgit_plain_link(name, title, class, ctx.qry.head,
+                               ctx.qry.has_oid ? ctx.qry.oid : NULL,
+                               ctx.qry.path);
+       else if (!strcmp(ctx.qry.page, "blame"))
+               cgit_blame_link(name, title, class, ctx.qry.head,
+                               ctx.qry.has_oid ? ctx.qry.oid : NULL,
+                               ctx.qry.path);
+       else if (!strcmp(ctx.qry.page, "log"))
+               cgit_log_link(name, title, class, ctx.qry.head,
+                             ctx.qry.has_oid ? ctx.qry.oid : NULL,
+                             ctx.qry.path, ctx.qry.ofs,
+                             ctx.qry.grep, ctx.qry.search,
+                             ctx.qry.showmsg, ctx.qry.follow);
+       else if (!strcmp(ctx.qry.page, "commit"))
+               cgit_commit_link(name, title, class, ctx.qry.head,
+                                ctx.qry.has_oid ? ctx.qry.oid : NULL,
+                                ctx.qry.path);
+       else if (!strcmp(ctx.qry.page, "patch"))
+               cgit_patch_link(name, title, class, ctx.qry.head,
+                               ctx.qry.has_oid ? ctx.qry.oid : NULL,
+                               ctx.qry.path);
+       else if (!strcmp(ctx.qry.page, "refs"))
+               cgit_refs_link(name, title, class, ctx.qry.head,
+                              ctx.qry.has_oid ? ctx.qry.oid : NULL,
+                              ctx.qry.path);
+       else if (!strcmp(ctx.qry.page, "snapshot"))
+               cgit_snapshot_link(name, title, class, ctx.qry.head,
+                                  ctx.qry.has_oid ? ctx.qry.oid : NULL,
+                                  ctx.qry.path);
+       else if (!strcmp(ctx.qry.page, "diff"))
+               cgit_diff_link(name, title, class, ctx.qry.head,
+                              ctx.qry.oid, ctx.qry.oid2,
+                              ctx.qry.path);
+       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)
 {
-       char *page, *arg, *url;
+       char *page, *shortrev, *fullrev, *name;
 
 
+       fullrev = oid_to_hex(&obj->oid);
+       shortrev = xstrdup(fullrev);
+       shortrev[10] = '\0';
        if (obj->type == OBJ_COMMIT) {
        if (obj->type == OBJ_COMMIT) {
-                cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
-                                ctx.qry.head, sha1_to_hex(obj->sha1));
+               cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
+                                ctx.qry.head, fullrev, NULL);
                return;
                return;
-       } else if (obj->type == OBJ_TREE) {
+       } else if (obj->type == OBJ_TREE)
                page = "tree";
                page = "tree";
-               arg = "id";
-       } else if (obj->type == OBJ_TAG) {
+       else if (obj->type == OBJ_TAG)
                page = "tag";
                page = "tag";
-               arg = "id";
-       } else {
+       else
                page = "blob";
                page = "blob";
-               arg = "id";
+       name = fmt("%s %s...", type_name(obj->type), shortrev);
+       reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
+}
+
+static struct string_list_item *lookup_path(struct string_list *list,
+                                           const char *path)
+{
+       struct string_list_item *item;
+
+       while (path && path[0]) {
+               if ((item = string_list_lookup(list, path)))
+                       return item;
+               if (!(path = strchr(path, '/')))
+                       break;
+               path++;
        }
        }
+       return NULL;
+}
 
 
-       url = cgit_pageurl(ctx.qry.repo, page,
-                          fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
-       html_link_open(url, NULL, NULL);
-       htmlf("%s %s", typename(obj->type),
-             sha1_to_hex(obj->sha1));
-       html_link_close();
+void cgit_submodule_link(const char *class, char *path, const char *rev)
+{
+       struct string_list *list;
+       struct string_list_item *item;
+       char tail, *dir;
+       size_t len;
+
+       len = 0;
+       tail = 0;
+       list = &ctx.repo->submodules;
+       item = lookup_path(list, path);
+       if (!item) {
+               len = strlen(path);
+               tail = path[len - 1];
+               if (tail == '/') {
+                       path[len - 1] = 0;
+                       item = lookup_path(list, path);
+               }
+       }
+       if (item || ctx.repo->module_link) {
+               html("<a ");
+               if (class)
+                       htmlf("class='%s' ", class);
+               html("href='");
+               if (item) {
+                       html_attrf(item->util, rev);
+               } else {
+                       dir = strrchr(path, '/');
+                       if (dir)
+                               dir++;
+                       else
+                               dir = path;
+                       html_attrf(ctx.repo->module_link, dir, rev);
+               }
+               html("'>");
+               html_txt(path);
+               html("</a>");
+       } else {
+               html("<span");
+               if (class)
+                       htmlf(" class='%s'", class);
+               html(">");
+               html_txt(path);
+               html("</span>");
+       }
+       html_txtf(" @ %.7s", rev);
+       if (item && tail)
+               path[len - 1] = tail;
 }
 
 }
 
-void cgit_print_date(time_t secs, char *format)
+const struct date_mode *cgit_date_mode(enum date_mode_type type)
 {
 {
-       char buf[64];
-       struct tm *time;
+       static struct date_mode mode;
+       mode.type = type;
+       mode.local = ctx.cfg.local_time;
+       return &mode;
+}
 
 
-       if (!secs)
-               return;
-       time = gmtime(&secs);
-       strftime(buf, sizeof(buf)-1, format, time);
-       html_txt(buf);
+static void print_rel_date(time_t t, int tz, double value,
+       const char *class, const char *suffix)
+{
+       htmlf("<span class='%s' data-ut='%" PRIu64 "' title='", class, (uint64_t)t);
+       html_attr(show_date(t, tz, cgit_date_mode(DATE_ISO8601)));
+       htmlf("'>%.0f %s</span>", value, suffix);
 }
 
 }
 
-void cgit_print_age(time_t t, time_t max_relative, char *format)
+void cgit_print_age(time_t t, int tz, time_t max_relative)
 {
        time_t now, secs;
 
 {
        time_t now, secs;
 
@@ -319,144 +686,285 @@ void cgit_print_age(time_t t, time_t max_relative, 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) {
 
        if (secs > max_relative && max_relative >= 0) {
-               cgit_print_date(t, format);
+               html("<span title='");
+               html_attr(show_date(t, tz, cgit_date_mode(DATE_ISO8601)));
+               html("'>");
+               html_txt(show_date(t, tz, cgit_date_mode(DATE_SHORT)));
+               html("</span>");
                return;
        }
 
        if (secs < TM_HOUR * 2) {
                return;
        }
 
        if (secs < TM_HOUR * 2) {
-               htmlf("<span class='age-mins'>%.0f min.</span>",
-                     secs * 1.0 / TM_MIN);
+               print_rel_date(t, tz, secs * 1.0 / TM_MIN, "age-mins", "min.");
                return;
        }
        if (secs < TM_DAY * 2) {
                return;
        }
        if (secs < TM_DAY * 2) {
-               htmlf("<span class='age-hours'>%.0f hours</span>",
-                     secs * 1.0 / TM_HOUR);
+               print_rel_date(t, tz, secs * 1.0 / TM_HOUR, "age-hours", "hours");
                return;
        }
        if (secs < TM_WEEK * 2) {
                return;
        }
        if (secs < TM_WEEK * 2) {
-               htmlf("<span class='age-days'>%.0f days</span>",
-                     secs * 1.0 / TM_DAY);
+               print_rel_date(t, tz, secs * 1.0 / TM_DAY, "age-days", "days");
                return;
        }
        if (secs < TM_MONTH * 2) {
                return;
        }
        if (secs < TM_MONTH * 2) {
-               htmlf("<span class='age-weeks'>%.0f weeks</span>",
-                     secs * 1.0 / TM_WEEK);
+               print_rel_date(t, tz, secs * 1.0 / TM_WEEK, "age-weeks", "weeks");
                return;
        }
        if (secs < TM_YEAR * 2) {
                return;
        }
        if (secs < TM_YEAR * 2) {
-               htmlf("<span class='age-months'>%.0f months</span>",
-                     secs * 1.0 / TM_MONTH);
+               print_rel_date(t, tz, secs * 1.0 / TM_MONTH, "age-months", "months");
                return;
        }
                return;
        }
-       htmlf("<span class='age-years'>%.0f years</span>",
-             secs * 1.0 / TM_YEAR);
+       print_rel_date(t, tz, secs * 1.0 / TM_YEAR, "age-years", "years");
 }
 
 }
 
-void cgit_print_http_headers(struct cgit_context *ctx)
+void cgit_print_http_headers(void)
 {
 {
-       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.filename)
-               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.env.no_http && !strcmp(ctx.env.no_http, "1"))
+               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) {
+               html("Content-Disposition: inline; filename=\"");
+               html_header_arg_in_quotes(ctx.page.filename);
+               html("\"\n");
+       }
+       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"))
+               exit(0);
+}
+
+void cgit_redirect(const char *url, bool permanent)
+{
+       htmlf("Status: %d %s\n", permanent ? 301 : 302, permanent ? "Moved" : "Found");
+       html("Location: ");
+       html_url_path(url);
+       html("\n\n");
+}
+
+static void print_rel_vcs_link(const char *url)
+{
+       html("<link rel='vcs-git' href='");
+       html_attr(url);
+       html("' title='");
+       html_attr(ctx.repo->name);
+       html(" Git repository'/>\n");
+}
+
+static int emit_css_link(struct string_list_item *s, void *arg)
+{
+       /* Do not emit anything if css= is specified. */
+       if (s && *s->string == '\0')
+               return 0;
+
+       html("<link rel='stylesheet' type='text/css' href='");
+       if (s)
+               html_attr(s->string);
+       else
+               html_attr((const char *)arg);
+       html("'/>\n");
+
+       return 0;
 }
 
 }
 
-void cgit_print_docstart(struct cgit_context *ctx)
+static int emit_js_link(struct string_list_item *s, void *arg)
 {
 {
+       /* Do not emit anything if js= is specified. */
+       if (s && *s->string == '\0')
+               return 0;
+
+       html("<script type='text/javascript' src='");
+       if (s)
+               html_attr(s->string);
+       else
+               html_attr((const char *)arg);
+       html("'></script>\n");
+
+       return 0;
+}
+
+void cgit_print_docstart(void)
+{
+       char *host = cgit_hosturl();
+
+       if (ctx.cfg.embedded) {
+               if (ctx.cfg.header)
+                       html_include(ctx.cfg.header);
+               return;
+       }
+
        html(cgit_doctype);
        html(cgit_doctype);
-       html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
+       html("<html lang='en'>\n");
        html("<head>\n");
        html("<title>");
        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);
-       html("<link rel='stylesheet' type='text/css' href='");
-       html_attr(ctx->cfg.css);
-       html("'/>\n");
+       if (ctx.cfg.robots && *ctx.cfg.robots)
+               htmlf("<meta name='robots' content='%s'/>\n", ctx.cfg.robots);
+
+       if (ctx.cfg.css.items)
+               for_each_string_list(&ctx.cfg.css, emit_css_link, NULL);
+       else
+               emit_css_link(NULL, "/cgit.css");
+
+       if (ctx.cfg.js.items)
+               for_each_string_list(&ctx.cfg.js, emit_js_link, NULL);
+       else
+               emit_js_link(NULL, "/cgit.js");
+
+       if (ctx.cfg.favicon) {
+               html("<link rel='shortcut icon' href='");
+               html_attr(ctx.cfg.favicon);
+               html("'/>\n");
+       }
+       if (host && ctx.repo && ctx.qry.head) {
+               char *fileurl;
+               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(host);
+               fileurl = cgit_fileurl(ctx.repo->url, "atom", ctx.qry.vpath,
+                                      sb.buf);
+               html_attr(fileurl);
+               html("' type='application/atom+xml'/>\n");
+               strbuf_release(&sb);
+               free(fileurl);
+       }
+       if (ctx.repo)
+               cgit_add_clone_urls(print_rel_vcs_link);
+       if (ctx.cfg.head_include)
+               html_include(ctx.cfg.head_include);
+       if (ctx.repo && ctx.repo->extra_head_content)
+               html(ctx.repo->extra_head_content);
        html("</head>\n");
        html("<body>\n");
        html("</head>\n");
        html("<body>\n");
+       if (ctx.cfg.header)
+               html_include(ctx.cfg.header);
+       free(host);
 }
 
 }
 
-void cgit_print_docend()
+void cgit_print_docend(void)
 {
 {
-       html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
+       html("</div> <!-- class=content -->\n");
+       if (ctx.cfg.embedded) {
+               html("</div> <!-- id=cgit -->\n");
+               if (ctx.cfg.footer)
+                       html_include(ctx.cfg.footer);
+               return;
+       }
+       if (ctx.cfg.footer)
+               html_include(ctx.cfg.footer);
+       else {
+               htmlf("<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit %s</a> "
+                       "(<a href='https://git-scm.com/'>git %s</a>) at ", cgit_version, git_version_string);
+               html_txt(show_date(time(NULL), 0, cgit_date_mode(DATE_ISO8601)));
+               html("</div>\n");
+       }
+       html("</div> <!-- id=cgit -->\n");
+       html("</body>\n</html>\n");
 }
 
 }
 
-int print_branch_option(const char *refname, const unsigned char *sha1,
-                       int flags, void *cb_data)
+void cgit_print_error_page(int code, const char *msg, const char *fmt, ...)
 {
 {
-       char *name = (char *)refname;
-       html_option(name, name, ctx.qry.head);
-       return 0;
+       va_list ap;
+       ctx.page.expires = ctx.cfg.cache_dynamic_ttl;
+       ctx.page.status = code;
+       ctx.page.statusmsg = msg;
+       cgit_print_layout_start();
+       va_start(ap, fmt);
+       cgit_vprint_error(fmt, ap);
+       va_end(ap);
+       cgit_print_layout_end();
 }
 
 }
 
-int print_archive_ref(const char *refname, const unsigned char *sha1,
-                      int flags, void *cb_data)
+void cgit_print_layout_start(void)
 {
 {
-       struct tag *tag;
-       struct taginfo *info;
-       struct object *obj;
-       char buf[256], *url;
-       unsigned char fileid[20];
-       int *header = (int *)cb_data;
+       cgit_print_http_headers();
+       cgit_print_docstart();
+       cgit_print_pageheader();
+}
 
 
-       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_print_layout_end(void)
+{
+       cgit_print_docend();
 }
 
 }
 
-void add_hidden_formfields(int incl_head, int incl_search, char *page)
+static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
 {
 {
-       char *url;
+       struct strbuf **url_list = strbuf_split_str(txt, ' ', 0);
+       int i;
 
 
+       for (i = 0; url_list[i]; i++) {
+               strbuf_rtrim(url_list[i]);
+               if (url_list[i]->len == 0)
+                       continue;
+               if (suffix && *suffix)
+                       strbuf_addf(url_list[i], "/%s", suffix);
+               fn(url_list[i]->buf);
+       }
+
+       strbuf_list_free(url_list);
+}
+
+void cgit_add_clone_urls(void (*fn)(const char *))
+{
+       if (ctx.repo->clone_url)
+               add_clone_urls(fn, expand_macros(ctx.repo->clone_url), NULL);
+       else if (ctx.cfg.clone_prefix)
+               add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url);
+}
+
+static int print_branch_option(const char *refname, const struct object_id *oid,
+                              int flags, void *cb_data)
+{
+       char *name = (char *)refname;
+       html_option(name, name, ctx.qry.head);
+       return 0;
+}
+
+void cgit_add_hidden_formfields(int incl_head, int incl_search,
+                               const char *page)
+{
        if (!ctx.cfg.virtual_root) {
        if (!ctx.cfg.virtual_root) {
-               url = fmt("%s/%s", ctx.qry.repo, page);
-               if (ctx.qry.path)
-                       url = fmt("%s/%s", url, ctx.qry.path);
-               html_hidden("url", url);
+               struct strbuf url = STRBUF_INIT;
+
+               strbuf_addf(&url, "%s/%s", ctx.qry.repo, page);
+               if (ctx.qry.vpath)
+                       strbuf_addf(&url, "/%s", ctx.qry.vpath);
+               html_hidden("url", url.buf);
+               strbuf_release(&url);
        }
 
        }
 
-       if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
+       if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
+           strcmp(ctx.qry.head, ctx.repo->defbranch))
                html_hidden("h", ctx.qry.head);
 
                html_hidden("h", ctx.qry.head);
 
-       if (ctx.qry.sha1)
-               html_hidden("id", ctx.qry.sha1);
-       if (ctx.qry.sha2)
-               html_hidden("id2", ctx.qry.sha2);
+       if (ctx.qry.oid)
+               html_hidden("id", ctx.qry.oid);
+       if (ctx.qry.oid2)
+               html_hidden("id2", ctx.qry.oid2);
+       if (ctx.qry.showmsg)
+               html_hidden("showmsg", "1");
 
        if (incl_search) {
                if (ctx.qry.grep)
 
        if (incl_search) {
                if (ctx.qry.grep)
@@ -466,58 +974,192 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
        }
 }
 
        }
 }
 
-char *hc(struct cgit_cmd *cmd, const char *page)
+static const char *hc(const char *page)
+{
+       if (!ctx.qry.page)
+               return NULL;
+
+       return strcmp(ctx.qry.page, page) ? NULL : "active";
+}
+
+static void cgit_print_path_crumbs(char *path)
 {
 {
-       return (strcmp(cmd->name, page) ? NULL : "active");
+       char *old_path = ctx.qry.path;
+       char *p = path, *q, *end = path + strlen(path);
+       int levels = 0;
+
+       ctx.qry.path = NULL;
+       cgit_self_link("root", NULL, NULL);
+       ctx.qry.path = p = path;
+       while (p < end) {
+               if (!(q = strchr(p, '/')) || levels > 15)
+                       q = end;
+               *q = '\0';
+               html_txt("/");
+               cgit_self_link(p, NULL, NULL);
+               if (q < end)
+                       *q = '/';
+               p = q + 1;
+               ++levels;
+       }
+       ctx.qry.path = old_path;
 }
 
 }
 
-void cgit_print_pageheader(struct cgit_context *ctx)
+static void print_header(void)
 {
 {
-       struct cgit_cmd *cmd = cgit_get_cmd(ctx);
+       char *logo = NULL, *logo_link = NULL;
 
        html("<table id='header'>\n");
        html("<tr>\n");
 
        html("<table id='header'>\n");
        html("<tr>\n");
-       html("<td class='logo' rowspan='2'><a href='");
-       html_attr(cgit_rooturl());
-       html("'><img src='");
-       html_attr(ctx->cfg.logo);
-       html("'/></a></td>\n");
-       html("<td class='main'>");
-       if (ctx->repo)
-               html_txt(ctx->repo->name);
+
+       if (ctx.repo && ctx.repo->logo && *ctx.repo->logo)
+               logo = ctx.repo->logo;
        else
        else
-               html_txt(ctx->cfg.root_title);
-       html("</td></tr>\n");
-       html("<tr><td class='sub'>");
-       if (ctx->repo)
-               html_txt(ctx->repo->desc);
+               logo = ctx.cfg.logo;
+       if (ctx.repo && ctx.repo->logo_link && *ctx.repo->logo_link)
+               logo_link = ctx.repo->logo_link;
        else
        else
-               html_txt(ctx->cfg.index_info);
+               logo_link = ctx.cfg.logo_link;
+       if (logo && *logo) {
+               html("<td class='logo' rowspan='2'><a href='");
+               if (logo_link && *logo_link)
+                       html_attr(logo_link);
+               else
+                       html_attr(cgit_rooturl());
+               html("'><img src='");
+               html_attr(logo);
+               html("' alt='cgit logo'/></a></td>\n");
+       }
+
+       html("<td class='main'>");
+       if (ctx.repo) {
+               cgit_index_link("index", NULL, NULL, NULL, NULL, 0, 1);
+               html(" : ");
+               cgit_summary_link(ctx.repo->name, NULL, NULL, NULL);
+               if (ctx.env.authenticated) {
+                       html("</td><td class='form'>");
+                       html("<form method='get'>\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);
+                       if (ctx.repo->enable_remote_branches)
+                               for_each_remote_ref(print_branch_option, ctx.qry.head);
+                       html("</select> ");
+                       html("<input type='submit' value='switch'/>");
+                       html("</form>");
+               }
+       } else
+               html_txt(ctx.cfg.root_title);
        html("</td></tr>\n");
        html("</td></tr>\n");
-       html("</table>\n");
 
 
-       html("<table class='tabs'><tr><td>\n");
-       if (ctx->repo) {
-               reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
-                           ctx->qry.head, NULL, NULL);
-               cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
-                              ctx->qry.sha1, NULL);
-               cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
-                             NULL, NULL, 0, NULL, NULL);
-               cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
-                              ctx->qry.sha1, NULL);
-               cgit_commit_link("commit", NULL, hc(cmd, "commit"),
-                                ctx->qry.head, ctx->qry.sha1);
-               cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
-                              ctx->qry.sha1, ctx->qry.sha2, NULL);
-               cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
-                               ctx->qry.sha1);
+       html("<tr><td class='sub'>");
+       if (ctx.repo) {
+               html_txt(ctx.repo->desc);
+               html("</td><td class='sub right'>");
+               if (ctx.repo->owner_filter) {
+                       cgit_open_filter(ctx.repo->owner_filter);
+                       html_txt(ctx.repo->owner);
+                       cgit_close_filter(ctx.repo->owner_filter);
+               } else {
+                       html_txt(ctx.repo->owner);
+               }
        } else {
        } else {
-               html("<a class='active' href='");
-               html_attr(cgit_rooturl());
-               html("'>index</a>\n");
+               if (ctx.cfg.root_desc)
+                       html_txt(ctx.cfg.root_desc);
+       }
+       html("</td></tr></table>\n");
+}
+
+void cgit_print_pageheader(void)
+{
+       html("<div id='cgit'>");
+       if (!ctx.env.authenticated || !ctx.cfg.noheader)
+               print_header();
+
+       html("<table class='tabs'><tr><td>\n");
+       if (ctx.env.authenticated && ctx.repo) {
+               if (ctx.repo->readme.nr)
+                       reporevlink("about", "about", NULL,
+                                   hc("about"), ctx.qry.head, NULL,
+                                   NULL);
+               cgit_summary_link("summary", NULL, hc("summary"),
+                                 ctx.qry.head);
+               cgit_refs_link("refs", NULL, hc("refs"), ctx.qry.head,
+                              ctx.qry.oid, NULL);
+               cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
+                             NULL, ctx.qry.vpath, 0, NULL, NULL,
+                             ctx.qry.showmsg, ctx.qry.follow);
+               if (ctx.qry.page && !strcmp(ctx.qry.page, "blame"))
+                       cgit_blame_link("blame", NULL, hc("blame"), ctx.qry.head,
+                                       ctx.qry.oid, ctx.qry.vpath);
+               else
+                       cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
+                                      ctx.qry.oid, ctx.qry.vpath);
+               cgit_commit_link("commit", NULL, hc("commit"),
+                                ctx.qry.head, ctx.qry.oid, ctx.qry.vpath);
+               cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head,
+                              ctx.qry.oid, ctx.qry.oid2, ctx.qry.vpath);
+               if (ctx.repo->max_stats)
+                       cgit_stats_link("stats", NULL, hc("stats"),
+                                       ctx.qry.head, ctx.qry.vpath);
+               if (ctx.repo->homepage) {
+                       html("<a href='");
+                       html_attr(ctx.repo->homepage);
+                       html("'>homepage</a>");
+               }
+               html("</td><td class='form'>");
+               html("<form class='right' method='get' action='");
+               if (ctx.cfg.virtual_root) {
+                       char *fileurl = cgit_fileurl(ctx.qry.repo, "log",
+                                                  ctx.qry.vpath, NULL);
+                       html_url_path(fileurl);
+                       free(fileurl);
+               }
+               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("</select>\n");
+               html("<input class='txt' type='search' size='10' name='q' value='");
+               html_attr(ctx.qry.search);
+               html("'/>\n");
+               html("<input type='submit' value='search'/>\n");
+               html("</form>\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("</td><td class='form'>");
+               html("<form method='get' action='");
+               html_attr(currenturl);
+               html("'>\n");
+               html("<input type='search' name='q' size='10' value='");
+               html_attr(ctx.qry.search);
+               html("'/>\n");
+               html("<input type='submit' value='search'/>\n");
+               html("</form>");
+               free(currenturl);
        }
        html("</td></tr></table>\n");
        }
        html("</td></tr></table>\n");
+       if (ctx.env.authenticated && ctx.repo && ctx.qry.vpath) {
+               html("<div class='path'>");
+               html("path: ");
+               cgit_print_path_crumbs(ctx.qry.vpath);
+               if (ctx.cfg.enable_follow_links && !strcmp(ctx.qry.page, "log")) {
+                       html(" (");
+                       ctx.qry.follow = !ctx.qry.follow;
+                       cgit_self_link(ctx.qry.follow ? "follow" : "unfollow",
+                                       NULL, NULL);
+                       ctx.qry.follow = !ctx.qry.follow;
+                       html(")");
+               }
+               html("</div>");
+       }
        html("<div class='content'>");
 }
 
        html("<div class='content'>");
 }
 
@@ -536,19 +1178,80 @@ void cgit_print_filemode(unsigned short mode)
        html_fileperm(mode);
 }
 
        html_fileperm(mode);
 }
 
-void cgit_print_snapshot_links(const char *repo, const char *head,
-                              const char *hex, int snapshots)
+void cgit_compose_snapshot_prefix(struct strbuf *filename, const char *base,
+                                 const char *ref)
+{
+       struct object_id oid;
+
+       /*
+        * Prettify snapshot names by stripping leading "v" or "V" if the tag
+        * name starts with {v,V}[0-9] and the prettify mapping is injective,
+        * i.e. each stripped tag can be inverted without ambiguities.
+        */
+       if (get_oid(fmt("refs/tags/%s", ref), &oid) == 0 &&
+           (ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]) &&
+           ((get_oid(fmt("refs/tags/%s", ref + 1), &oid) == 0) +
+            (get_oid(fmt("refs/tags/v%s", ref + 1), &oid) == 0) +
+            (get_oid(fmt("refs/tags/V%s", ref + 1), &oid) == 0) == 1))
+               ref++;
+
+       strbuf_addf(filename, "%s-%s", base, ref);
+}
+
+void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref,
+                              const char *separator)
 {
 {
-       const struct cgit_snapshot_format* f;
-       char *filename;
+       const struct cgit_snapshot_format *f;
+       struct strbuf filename = STRBUF_INIT;
+       const char *basename;
+       size_t prefixlen;
+
+       basename = cgit_snapshot_prefix(repo);
+       if (starts_with(ref, basename))
+               strbuf_addstr(&filename, ref);
+       else
+               cgit_compose_snapshot_prefix(&filename, basename, ref);
 
 
+       prefixlen = filename.len;
        for (f = cgit_snapshot_formats; f->suffix; f++) {
        for (f = cgit_snapshot_formats; f->suffix; f++) {
-               if (!(snapshots & f->bit))
+               if (!(repo->snapshots & cgit_snapshot_format_bit(f)))
                        continue;
                        continue;
-               filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
-                              f->suffix);
-               cgit_snapshot_link(filename, NULL, NULL, (char *)head,
-                                  (char *)hex, filename);
-               html("<br/>");
+               strbuf_setlen(&filename, prefixlen);
+               strbuf_addstr(&filename, f->suffix);
+               cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL,
+                                  filename.buf);
+               if (cgit_snapshot_get_sig(ref, f)) {
+                       strbuf_addstr(&filename, ".asc");
+                       html(" (");
+                       cgit_snapshot_link("sig", NULL, NULL, NULL, NULL,
+                                          filename.buf);
+                       html(")");
+               } else if (starts_with(f->suffix, ".tar") && cgit_snapshot_get_sig(ref, &cgit_snapshot_formats[0])) {
+                       strbuf_setlen(&filename, strlen(filename.buf) - strlen(f->suffix));
+                       strbuf_addstr(&filename, ".tar.asc");
+                       html(" (");
+                       cgit_snapshot_link("sig", NULL, NULL, NULL, NULL,
+                                          filename.buf);
+                       html(")");
+               }
+               html(separator);
+       }
+       strbuf_release(&filename);
+}
+
+void cgit_set_title_from_path(const char *path)
+{
+       struct strbuf sb = STRBUF_INIT;
+       const char *slash, *last_slash;
+
+       if (!path)
+               return;
+
+       for (last_slash = path + strlen(path); (slash = memrchr(path, '/', last_slash - path)) != NULL; last_slash = slash) {
+               strbuf_add(&sb, slash + 1, last_slash - slash - 1);
+               strbuf_addstr(&sb, " \xc2\xab ");
        }
        }
+       strbuf_add(&sb, path, last_slash - path);
+       strbuf_addf(&sb, " - %s", ctx.page.title);
+       ctx.page.title = strbuf_detach(&sb, NULL);
 }
 }
Unnamed repository; edit this file 'description' to name the repository.