]> git.cameronkatri.com Git - cgit.git/blobdiff - ui-shared.c
ui-blame: free read_sha1_file() buffer after use
[cgit.git] / ui-shared.c
index 1dd872264504c555bd0b7ee2784301c162eb28fa..9d8f66b9fab89ad63e5bfaac22eb6956567f10dd 100644 (file)
@@ -1,6 +1,6 @@
 /* ui-shared.c: common web output functions
  *
 /* ui-shared.c: common web output functions
  *
- * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
+ * Copyright (C) 2006-2017 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -12,8 +12,7 @@
 #include "html.h"
 
 static const char cgit_doctype[] =
 #include "html.h"
 
 static 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";
+"<!DOCTYPE html>\n";
 
 static char *http_date(time_t t)
 {
 
 static char *http_date(time_t t)
 {
@@ -54,23 +53,24 @@ const char *cgit_httpscheme(void)
                return "http://";
 }
 
                return "http://";
 }
 
-const char *cgit_hosturl(void)
+char *cgit_hosturl(void)
 {
        if (ctx.env.http_host)
 {
        if (ctx.env.http_host)
-               return ctx.env.http_host;
+               return xstrdup(ctx.env.http_host);
        if (!ctx.env.server_name)
                return NULL;
        if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
        if (!ctx.env.server_name)
                return NULL;
        if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
-               return ctx.env.server_name;
+               return xstrdup(ctx.env.server_name);
        return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);
 }
 
        return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);
 }
 
-const char *cgit_currenturl(void)
+char *cgit_currenturl(void)
 {
 {
-       if (!ctx.qry.url)
-               return cgit_rooturl();
        const char *root = cgit_rooturl();
        size_t len = strlen(root);
        const char *root = cgit_rooturl();
        size_t len = strlen(root);
+
+       if (!ctx.qry.url)
+               return xstrdup(root);
        if (len && root[len - 1] == '/')
                return fmtalloc("%s%s", root, ctx.qry.url);
        return fmtalloc("%s/%s", root, ctx.qry.url);
        if (len && root[len - 1] == '/')
                return fmtalloc("%s%s", root, ctx.qry.url);
        return fmtalloc("%s/%s", root, ctx.qry.url);
@@ -157,8 +157,11 @@ static void site_url(const char *page, const char *search, const char *sort, int
 
        if (always_root || page)
                html_attr(cgit_rooturl());
 
        if (always_root || page)
                html_attr(cgit_rooturl());
-       else
-               html_attr(cgit_currenturl());
+       else {
+               char *currenturl = cgit_currenturl();
+               html_attr(currenturl);
+               free(currenturl);
+       }
 
        if (page) {
                htmlf("?p=%s", page);
 
        if (page) {
                htmlf("?p=%s", page);
@@ -251,7 +254,7 @@ static char *repolink(const char *title, const char *class, const char *page,
                }
                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_url_arg(head);
                html(delim);
                html("h=");
                html_url_arg(head);
@@ -301,9 +304,16 @@ void cgit_plain_link(const char *name, const char *title, const char *class,
        reporevlink("plain", name, title, class, head, rev, 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,
 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 ofs, const char *grep, const char *pattern, int showmsg,
+                  int follow)
 {
        char *delim;
 
 {
        char *delim;
 
@@ -332,22 +342,20 @@ void cgit_log_link(const char *name, const char *title, const char *class,
        if (showmsg) {
                html(delim);
                html("showmsg=1");
        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, const char *title, const char *class,
+void cgit_commit_link(const char *name, const char *title, const char *class,
                      const char *head, const char *rev, const char *path)
 {
                      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);
        char *delim;
 
        delim = repolink(title, class, "commit", head, path);
@@ -373,10 +381,18 @@ void cgit_commit_link(char *name, const char *title, const char *class,
                html("ignorews=1");
                delim = "&amp;";
        }
                html("ignorews=1");
                delim = "&amp;";
        }
+       if (ctx.qry.follow) {
+               html(delim);
+               html("follow=1");
+       }
        html("'>");
        html("'>");
-       if (name[0] != '\0')
-               html_txt(name);
-       else
+       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>");
 }
                html_txt("(no commit message)");
        html("</a>");
 }
@@ -429,6 +445,10 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
                html("ignorews=1");
                delim = "&amp;";
        }
                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>");
@@ -464,12 +484,16 @@ static void cgit_self_link(char *name, const char *title, const char *class)
                cgit_plain_link(name, title, class, ctx.qry.head,
                                ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
                                ctx.qry.path);
                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, "blame"))
+               cgit_blame_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,
        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);
+                             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_sha1 ? ctx.qry.sha1 : NULL,
        else if (!strcmp(ctx.qry.page, "commit"))
                cgit_commit_link(name, title, class, ctx.qry.head,
                                 ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
@@ -508,7 +532,7 @@ void cgit_object_link(struct object *obj)
 {
        char *page, *shortrev, *fullrev, *name;
 
 {
        char *page, *shortrev, *fullrev, *name;
 
-       fullrev = sha1_to_hex(obj->sha1);
+       fullrev = oid_to_hex(&obj->oid);
        shortrev = xstrdup(fullrev);
        shortrev[10] = '\0';
        if (obj->type == OBJ_COMMIT) {
        shortrev = xstrdup(fullrev);
        shortrev[10] = '\0';
        if (obj->type == OBJ_COMMIT) {
@@ -590,39 +614,23 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
                path[len - 1] = tail;
 }
 
                path[len - 1] = tail;
 }
 
-void cgit_print_date(time_t secs, const char *format, int local_time)
+const struct date_mode *cgit_date_mode(enum date_mode_type type)
 {
 {
-       char buf[64];
-       struct tm *time;
-
-       if (!secs)
-               return;
-       if (local_time)
-               time = localtime(&secs);
-       else
-               time = gmtime(&secs);
-       strftime(buf, sizeof(buf)-1, format, time);
-       html_txt(buf);
+       static struct date_mode mode;
+       mode.type = type;
+       mode.local = ctx.cfg.local_time;
+       return &mode;
 }
 
 }
 
-static void print_rel_date(time_t t, double value,
+static void print_rel_date(time_t t, int tz, double value,
        const char *class, const char *suffix)
 {
        const char *class, const char *suffix)
 {
-       char buf[64];
-       struct tm *time;
-
-       if (ctx.cfg.local_time)
-               time = localtime(&t);
-       else
-               time = gmtime(&t);
-       strftime(buf, sizeof(buf) - 1, FMT_LONGDATE, time);
-
        htmlf("<span class='%s' title='", class);
        htmlf("<span class='%s' title='", class);
-       html_attr(buf);
+       html_attr(show_date(t, tz, cgit_date_mode(DATE_ISO8601)));
        htmlf("'>%.0f %s</span>", value, suffix);
 }
 
        htmlf("'>%.0f %s</span>", value, suffix);
 }
 
-void cgit_print_age(time_t t, time_t max_relative, const char *format)
+void cgit_print_age(time_t t, int tz, time_t max_relative)
 {
        time_t now, secs;
 
 {
        time_t now, secs;
 
@@ -634,31 +642,35 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
                secs = 0;
 
        if (secs > max_relative && max_relative >= 0) {
                secs = 0;
 
        if (secs > max_relative && max_relative >= 0) {
-               cgit_print_date(t, format, ctx.cfg.local_time);
+               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) {
-               print_rel_date(t, secs * 1.0 / TM_MIN, "age-mins", "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) {
-               print_rel_date(t, secs * 1.0 / TM_HOUR, "age-hours", "hours");
+               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) {
-               print_rel_date(t, secs * 1.0 / TM_DAY, "age-days", "days");
+               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) {
-               print_rel_date(t, secs * 1.0 / TM_WEEK, "age-weeks", "weeks");
+               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) {
-               print_rel_date(t, secs * 1.0 / TM_MONTH, "age-months", "months");
+               print_rel_date(t, tz, secs * 1.0 / TM_MONTH, "age-months", "months");
                return;
        }
                return;
        }
-       print_rel_date(t, secs * 1.0 / TM_YEAR, "age-years", "years");
+       print_rel_date(t, tz, secs * 1.0 / TM_YEAR, "age-years", "years");
 }
 
 void cgit_print_http_headers(void)
 }
 
 void cgit_print_http_headers(void)
@@ -675,9 +687,11 @@ void cgit_print_http_headers(void)
                htmlf("Content-Type: %s\n", ctx.page.mimetype);
        if (ctx.page.size)
                htmlf("Content-Length: %zd\n", ctx.page.size);
                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",
-                     ctx.page.filename);
+       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));
        if (!ctx.env.authenticated)
                html("Cache-Control: no-cache, no-store\n");
        htmlf("Last-Modified: %s\n", http_date(ctx.page.modified));
@@ -689,6 +703,14 @@ void cgit_print_http_headers(void)
                exit(0);
 }
 
                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='");
 static void print_rel_vcs_link(const char *url)
 {
        html("<link rel='vcs-git' href='");
@@ -700,15 +722,16 @@ static void print_rel_vcs_link(const char *url)
 
 void cgit_print_docstart(void)
 {
 
 void cgit_print_docstart(void)
 {
+       char *host = cgit_hosturl();
+
        if (ctx.cfg.embedded) {
                if (ctx.cfg.header)
                        html_include(ctx.cfg.header);
                return;
        }
 
        if (ctx.cfg.embedded) {
                if (ctx.cfg.header)
                        html_include(ctx.cfg.header);
                return;
        }
 
-       const char *host = cgit_hosturl();
        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_txt(ctx.page.title);
        html("<head>\n");
        html("<title>");
        html_txt(ctx.page.title);
@@ -725,16 +748,19 @@ void cgit_print_docstart(void)
                html("'/>\n");
        }
        if (host && ctx.repo && ctx.qry.head) {
                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());
                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_attr(cgit_fileurl(ctx.repo->url, "atom", ctx.qry.vpath,
-                                      sb.buf));
+               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);
                html("' type='application/atom+xml'/>\n");
                strbuf_release(&sb);
+               free(fileurl);
        }
        if (ctx.repo)
                cgit_add_clone_urls(print_rel_vcs_link);
        }
        if (ctx.repo)
                cgit_add_clone_urls(print_rel_vcs_link);
@@ -744,6 +770,7 @@ void cgit_print_docstart(void)
        html("<body>\n");
        if (ctx.cfg.header)
                html_include(ctx.cfg.header);
        html("<body>\n");
        if (ctx.cfg.header)
                html_include(ctx.cfg.header);
+       free(host);
 }
 
 void cgit_print_docend(void)
 }
 
 void cgit_print_docend(void)
@@ -758,15 +785,40 @@ void cgit_print_docend(void)
        if (ctx.cfg.footer)
                html_include(ctx.cfg.footer);
        else {
        if (ctx.cfg.footer)
                html_include(ctx.cfg.footer);
        else {
-               htmlf("<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit %s</a> at ",
+               htmlf("<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit %s</a> at ",
                        cgit_version);
                        cgit_version);
-               cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
+               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");
 }
 
                html("</div>\n");
        }
        html("</div> <!-- id=cgit -->\n");
        html("</body>\n</html>\n");
 }
 
+void cgit_print_error_page(int code, const char *msg, const char *fmt, ...)
+{
+       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();
+}
+
+void cgit_print_layout_start(void)
+{
+       cgit_print_http_headers();
+       cgit_print_docstart();
+       cgit_print_pageheader();
+}
+
+void cgit_print_layout_end(void)
+{
+       cgit_print_docend();
+}
+
 static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
 {
        struct strbuf **url_list = strbuf_split_str(txt, ' ', 0);
 static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
 {
        struct strbuf **url_list = strbuf_split_str(txt, ' ', 0);
@@ -792,7 +844,7 @@ void cgit_add_clone_urls(void (*fn)(const char *))
                add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url);
 }
 
                add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url);
 }
 
-static int print_branch_option(const char *refname, const unsigned char *sha1,
+static int print_branch_option(const char *refname, const struct object_id *oid,
                               int flags, void *cb_data)
 {
        char *name = (char *)refname;
                               int flags, void *cb_data)
 {
        char *name = (char *)refname;
@@ -834,6 +886,9 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
 
 static const char *hc(const char *page)
 {
 
 static const char *hc(const char *page)
 {
+       if (!ctx.qry.page)
+               return NULL;
+
        return strcmp(ctx.qry.page, page) ? NULL : "active";
 }
 
        return strcmp(ctx.qry.page, page) ? NULL : "active";
 }
 
@@ -891,12 +946,14 @@ static void print_header(void)
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                if (ctx.env.authenticated) {
                        html("</td><td class='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");
+                       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);
                        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("</select> ");
-                       html("<input type='submit' name='' value='switch'/>");
+                       html("<input type='submit' value='switch'/>");
                        html("</form>");
                }
        } else
                        html("</form>");
                }
        } else
@@ -935,9 +992,13 @@ void cgit_print_pageheader(void)
                               ctx.qry.sha1, NULL);
                cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
                              NULL, ctx.qry.vpath, 0, NULL, NULL,
                               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);
+                             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.sha1, ctx.qry.vpath);
+               else
+                       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);
                cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head,
                cgit_commit_link("commit", NULL, hc("commit"),
                                 ctx.qry.head, ctx.qry.sha1, ctx.qry.vpath);
                cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head,
@@ -945,11 +1006,19 @@ void cgit_print_pageheader(void)
                if (ctx.repo->max_stats)
                        cgit_stats_link("stats", NULL, hc("stats"),
                                        ctx.qry.head, 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='");
                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) {
+                       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("'>\n");
                cgit_add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");
@@ -958,31 +1027,41 @@ void cgit_print_pageheader(void)
                html_option("committer", "committer", ctx.qry.grep);
                html_option("range", "range", ctx.qry.grep);
                html("</select>\n");
                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("<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) {
                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='");
                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(cgit_currenturl());
+               html_attr(currenturl);
                html("'>\n");
                html("'>\n");
-               html("<input type='text' name='q' size='10' value='");
+               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>");
                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.qry.vpath) {
+       if (ctx.env.authenticated && ctx.repo && ctx.qry.vpath) {
                html("<div class='path'>");
                html("path: ");
                cgit_print_path_crumbs(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>");
        }
        html("<div class='content'>");
@@ -1003,18 +1082,34 @@ void cgit_print_filemode(unsigned short mode)
        html_fileperm(mode);
 }
 
        html_fileperm(mode);
 }
 
+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 char *repo, const char *head,
                               const char *hex, int snapshots)
 {
        const struct cgit_snapshot_format* f;
        struct strbuf filename = STRBUF_INIT;
        size_t prefixlen;
 void cgit_print_snapshot_links(const char *repo, const char *head,
                               const char *hex, int snapshots)
 {
        const struct cgit_snapshot_format* f;
        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++;
-       strbuf_addf(&filename, "%s-%s", cgit_repobasename(repo), hex);
+       cgit_compose_snapshot_prefix(&filename, cgit_repobasename(repo), hex);
        prefixlen = filename.len;
        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (!(snapshots & f->bit))
        prefixlen = filename.len;
        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (!(snapshots & f->bit))
@@ -1027,3 +1122,34 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
        }
        strbuf_release(&filename);
 }
        }
        strbuf_release(&filename);
 }
+
+void cgit_set_title_from_path(const char *path)
+{
+       size_t path_len, path_index, path_last_end;
+       char *new_title;
+
+       if (!path)
+               return;
+
+       path_len = strlen(path);
+       new_title = xmalloc(path_len + 3 + strlen(ctx.page.title) + 1);
+       new_title[0] = '\0';
+
+       for (path_index = path_len, path_last_end = path_len; path_index-- > 0;) {
+               if (path[path_index] == '/') {
+                       if (path_index == path_len - 1) {
+                               path_last_end = path_index - 1;
+                               continue;
+                       }
+                       strncat(new_title, &path[path_index + 1], path_last_end - path_index - 1);
+                       strcat(new_title, "\\");
+                       path_last_end = path_index;
+               }
+       }
+       if (path_last_end)
+               strncat(new_title, path, path_last_end);
+
+       strcat(new_title, " - ");
+       strcat(new_title, ctx.page.title);
+       ctx.page.title = new_title;
+}