]> git.cameronkatri.com Git - cgit.git/blobdiff - ui-shared.c
git.ckatri.com / cgit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ui-shared: don't print path crumbs without a repo
[cgit.git] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c
index 32f23f9d98355d5233035ecf5a7cae379df5ddc4..e5c9a02f9f08773eda336ba603ecd74edcf38953 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -11,9 +11,8 @@
 #include "cmd.h"
 #include "html.h"
 
 #include "cmd.h"
 #include "html.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)
 {
@@ -46,7 +45,7 @@ void cgit_vprint_error(const char *fmt, va_list ap)
        html("</div>\n");
 }
 
        html("</div>\n");
 }
 
-const char *cgit_httpscheme()
+const char *cgit_httpscheme(void)
 {
        if (ctx.env.https && !strcmp(ctx.env.https, "on"))
                return "https://";
 {
        if (ctx.env.https && !strcmp(ctx.env.https, "on"))
                return "https://";
@@ -54,18 +53,30 @@ const char *cgit_httpscheme()
                return "http://";
 }
 
                return "http://";
 }
 
-const char *cgit_hosturl()
+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_rooturl()
+char *cgit_currenturl(void)
+{
+       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);
+}
+
+const char *cgit_rooturl(void)
 {
        if (ctx.cfg.virtual_root)
                return ctx.cfg.virtual_root;
 {
        if (ctx.cfg.virtual_root)
                return ctx.cfg.virtual_root;
@@ -73,9 +84,9 @@ const char *cgit_rooturl()
                return ctx.cfg.script_name;
 }
 
                return ctx.cfg.script_name;
 }
 
-const char *cgit_loginurl()
+const char *cgit_loginurl(void)
 {
 {
-       static const char *login_url = 0;
+       static const char *login_url;
        if (!login_url)
                login_url = fmtalloc("%s?p=login", cgit_rooturl());
        return login_url;
        if (!login_url)
                login_url = fmtalloc("%s?p=login", cgit_rooturl());
        return login_url;
@@ -112,7 +123,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
 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)
@@ -140,14 +151,17 @@ const char *cgit_repobasename(const char *reponame)
        return rvbuf;
 }
 
        return rvbuf;
 }
 
-static void site_url(const char *page, const char *search, const char *sort, int ofs)
+static void site_url(const char *page, const char *search, const char *sort, int ofs, int always_root)
 {
        char *delim = "?";
 
 {
        char *delim = "?";
 
-       if (ctx.cfg.virtual_root)
-               html_attr(ctx.cfg.virtual_root);
-       else
-               html_url_path(ctx.cfg.script_name);
+       if (always_root || page)
+               html_attr(cgit_rooturl());
+       else {
+               char *currenturl = cgit_currenturl();
+               html_attr(currenturl);
+               free(currenturl);
+       }
 
        if (page) {
                htmlf("?p=%s", page);
 
        if (page) {
                htmlf("?p=%s", page);
@@ -172,7 +186,7 @@ static void site_url(const char *page, const char *search, const char *sort, int
 }
 
 static void site_link(const char *page, const char *name, const char *title,
 }
 
 static void site_link(const char *page, const char *name, const char *title,
-                     const char *class, const char *search, const char *sort, int ofs)
+                     const char *class, const char *search, const char *sort, int ofs, int always_root)
 {
        html("<a");
        if (title) {
 {
        html("<a");
        if (title) {
@@ -186,16 +200,16 @@ static void site_link(const char *page, const char *name, const char *title,
                html("'");
        }
        html(" href='");
                html("'");
        }
        html(" href='");
-       site_url(page, search, sort, ofs);
+       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,
        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)
+                    const char *pattern, const char *sort, int ofs, int always_root)
 {
 {
-       site_link(NULL, name, title, class, pattern, sort, ofs);
+       site_link(NULL, name, title, class, pattern, sort, ofs, always_root);
 }
 
 static char *repolink(const char *title, const char *class, const char *page,
 }
 
 static char *repolink(const char *title, const char *class, const char *page,
@@ -240,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);
@@ -273,9 +287,9 @@ void cgit_summary_link(const char *name, const char *title, const char *class,
 }
 
 void cgit_tag_link(const char *name, const char *title, const char *class,
 }
 
 void cgit_tag_link(const char *name, const char *title, const char *class,
-                  const char *head, const char *rev)
+                  const char *tag)
 {
 {
-       reporevlink("tag", name, title, class, head, rev, NULL);
+       reporevlink("tag", name, title, class, tag, NULL, NULL);
 }
 
 void cgit_tree_link(const char *name, const char *title, const char *class,
 }
 
 void cgit_tree_link(const char *name, const char *title, const char *class,
@@ -292,7 +306,8 @@ void cgit_plain_link(const char *name, const char *title, const char *class,
 
 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;
 
@@ -321,6 +336,11 @@ 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("'>");
        html_txt(name);
@@ -330,6 +350,8 @@ void cgit_log_link(const char *name, const char *title, const char *class,
 void cgit_commit_link(char *name, const char *title, const char *class,
                      const char *head, const char *rev, const char *path)
 {
 void cgit_commit_link(char *name, const char *title, const char *class,
                      const char *head, const char *rev, const char *path)
 {
+       char *delim;
+
        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] = '.';
        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] = '.';
@@ -337,8 +359,6 @@ void cgit_commit_link(char *name, const char *title, const char *class,
                name[ctx.cfg.max_msg_len - 3] = '.';
        }
 
                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);
        delim = repolink(title, class, "commit", head, path);
        if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
                html(delim);
@@ -362,6 +382,10 @@ 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("'>");
        if (name[0] != '\0')
                html_txt(name);
        html("'>");
        if (name[0] != '\0')
                html_txt(name);
@@ -418,6 +442,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>");
@@ -439,12 +467,12 @@ static void cgit_self_link(char *name, const char *title, const char *class)
 {
        if (!strcmp(ctx.qry.page, "repolist"))
                cgit_index_link(name, title, class, ctx.qry.search, ctx.qry.sort,
 {
        if (!strcmp(ctx.qry.page, "repolist"))
                cgit_index_link(name, title, class, ctx.qry.search, ctx.qry.sort,
-                               ctx.qry.ofs);
+                               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"))
        else if (!strcmp(ctx.qry.page, "summary"))
                cgit_summary_link(name, title, class, ctx.qry.head);
        else if (!strcmp(ctx.qry.page, "tag"))
-               cgit_tag_link(name, title, class, ctx.qry.head,
-                             ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL);
+               cgit_tag_link(name, title, class, ctx.qry.has_sha1 ?
+                              ctx.qry.sha1 : ctx.qry.head);
        else if (!strcmp(ctx.qry.page, "tree"))
                cgit_tree_link(name, title, class, ctx.qry.head,
                               ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
        else if (!strcmp(ctx.qry.page, "tree"))
                cgit_tree_link(name, title, class, ctx.qry.head,
                               ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
@@ -458,7 +486,7 @@ static void cgit_self_link(char *name, const char *title, const char *class)
                              ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
                              ctx.qry.path, ctx.qry.ofs,
                              ctx.qry.grep, ctx.qry.search,
                              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,
@@ -497,7 +525,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) {
@@ -548,63 +576,54 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
                        item = lookup_path(list, path);
                }
        }
                        item = lookup_path(list, path);
                }
        }
-       html("<a ");
-       if (class)
-               htmlf("class='%s' ", class);
-       html("href='");
-       if (item) {
-               html_attrf(item->util, rev);
-       } else if (ctx.repo->module_link) {
-               dir = strrchr(path, '/');
-               if (dir)
-                       dir++;
-               else
-                       dir = path;
-               html_attrf(ctx.repo->module_link, dir, rev);
+       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 {
        } else {
-               html("#");
+               html("<span");
+               if (class)
+                       htmlf(" class='%s'", class);
+               html(">");
+               html_txt(path);
+               html("</span>");
        }
        }
-       html("'>");
-       html_txt(path);
-       html("</a>");
        html_txtf(" @ %.7s", rev);
        if (item && tail)
                path[len - 1] = tail;
 }
 
        html_txtf(" @ %.7s", rev);
        if (item && 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;
 
@@ -616,31 +635,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)
@@ -657,9 +680,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));
@@ -671,6 +696,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='");
@@ -682,15 +715,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);
@@ -707,16 +741,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);
@@ -726,9 +763,10 @@ 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 cgit_print_docend(void)
 {
        html("</div> <!-- class=content -->\n");
        if (ctx.cfg.embedded) {
 {
        html("</div> <!-- class=content -->\n");
        if (ctx.cfg.embedded) {
@@ -740,42 +778,55 @@ void cgit_print_docend()
        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)
 {
 static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
 {
-       struct strbuf buf = STRBUF_INIT;
-       char *h = txt, *t, c;
+       struct strbuf **url_list = strbuf_split_str(txt, ' ', 0);
+       int i;
 
 
-       while (h && *h) {
-               while (h && *h == ' ')
-                       h++;
-               if (!*h)
-                       break;
-               t = h;
-               while (t && *t && *t != ' ')
-                       t++;
-               c = *t;
-               *t = 0;
-
-               if (suffix && *suffix) {
-                       strbuf_reset(&buf);
-                       strbuf_addf(&buf, "%s/%s", h, suffix);
-                       h = buf.buf;
-               }
-               fn(h);
-               *t = c;
-               h = t;
+       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_release(&buf);
+       strbuf_list_free(url_list);
 }
 
 void cgit_add_clone_urls(void (*fn)(const char *))
 }
 
 void cgit_add_clone_urls(void (*fn)(const char *))
@@ -786,7 +837,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;
@@ -828,6 +879,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";
 }
 
@@ -880,17 +934,19 @@ static void print_header(void)
 
        html("<td class='main'>");
        if (ctx.repo) {
 
        html("<td class='main'>");
        if (ctx.repo) {
-               cgit_index_link("index", NULL, NULL, NULL, NULL, 0);
+               cgit_index_link("index", NULL, NULL, NULL, NULL, 0, 1);
                html(" : ");
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                if (ctx.env.authenticated) {
                        html("</td><td class='form'>");
                html(" : ");
                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
@@ -929,7 +985,7 @@ 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);
+                             ctx.qry.showmsg, ctx.qry.follow);
                cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
                               ctx.qry.sha1, ctx.qry.vpath);
                cgit_commit_link("commit", NULL, hc("commit"),
                cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
                               ctx.qry.sha1, ctx.qry.vpath);
                cgit_commit_link("commit", NULL, hc("commit"),
@@ -939,11 +995,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,25 +1022,35 @@ void cgit_print_pageheader(void)
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else if (ctx.env.authenticated) {
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else if (ctx.env.authenticated) {
-               site_link(NULL, "index", NULL, hc("repolist"), NULL, NULL, 0);
+               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"),
                if (ctx.cfg.root_readme)
                        site_link("about", "about", NULL, hc("about"),
-                                 NULL, NULL, 0);
+                                 NULL, NULL, 0, 1);
                html("</td><td class='form'>");
                html("<form method='get' action='");
                html("</td><td class='form'>");
                html("<form method='get' action='");
-               html_attr(cgit_rooturl());
+               html_attr(currenturl);
                html("'>\n");
                html("<input type='text' name='q' size='10' value='");
                html_attr(ctx.qry.search);
                html("'/>\n");
                html("<input type='submit' value='search'/>\n");
                html("</form>");
                html("'>\n");
                html("<input type='text' 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.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'>");
@@ -997,18 +1071,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))
A hyperfast web frontend for git repositories written in C.