ui-shared: Remove needless cgit_get_cmd() call, and refactor hc() accordingly

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 37c60b25d2c8ed1e4cecba4d2bd8873884a1baef..137e469f58eb7e0909ddc054782ebe01f641689e 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -20,33 +20,37 @@ 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"};
+                "Jul", "Aug", "Sep", "Oct", "Nov", "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);
 }
 
        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);
 }
 

-void cgit_print_error(char *msg)
+void cgit_print_error(const char *msg)

 {
        html("<div class='error'>");
        html_txt(msg);
        html("</div>\n");
 }
 
 {
        html("<div class='error'>");
        html_txt(msg);
        html("</div>\n");
 }
 

-char *cgit_hosturl()
+char *cgit_httpscheme()

 {
 {

-       char *host, *port;
+       if (ctx.env.https && !strcmp(ctx.env.https, "on"))
+               return "https://";
+       else
+               return "http://";
+}

 
 

-       host = getenv("SERVER_NAME");
-       if (!host)
+char *cgit_hosturl()
+{
+       if (ctx.env.http_host)
+               return ctx.env.http_host;
+       if (!ctx.env.server_name)

                return NULL;
                return NULL;

-       port = getenv("SERVER_PORT");
-       if (port && atoi(port) != 80)
-               host = xstrdup(fmt("%s:%d", host, atoi(port)));
-       else
-               host = xstrdup(host);
-       return host;
+       if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
+               return ctx.env.server_name;
+       return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));

 }
 
 char *cgit_rooturl()
 }
 
 char *cgit_rooturl()


@@ -129,7 +133,7 @@ char *cgit_currurl()
                return fmt("%s/", ctx.cfg.virtual_root);
 }
 
                return fmt("%s/", ctx.cfg.virtual_root);
 }
 

-static void site_url(char *page, char *search, int ofs)
+static void site_url(const char *page, const char *search, int ofs)

 {
        char *delim = "?";
 
 {
        char *delim = "?";
 


@@ -156,8 +160,8 @@ static void site_url(char *page, char *search, int ofs)
        }
 }
 
        }
 }
 

-static void site_link(char *page, char *name, char *title, char *class,
-                     char *search, int ofs)
+static void site_link(const char *page, const char *name, const char *title,
+                     const char *class, const char *search, int ofs)

 {
        html("<a");
        if (title) {
 {
        html("<a");
        if (title) {


@@ -177,14 +181,14 @@ static void site_link(char *page, char *name, char *title, char *class,
        html("</a>");
 }
 
        html("</a>");
 }
 

-void cgit_index_link(char *name, char *title, char *class, char *pattern,
-                    int ofs)
+void cgit_index_link(const char *name, const char *title, const char *class,
+                    const char *pattern, int ofs)

 {
        site_link(NULL, name, title, class, pattern, ofs);
 }
 
 {
        site_link(NULL, name, title, class, pattern, ofs);
 }
 

-static char *repolink(char *title, char *class, char *page, char *head,
-                     char *path)
+static char *repolink(const char *title, const char *class, const char *page,
+                     const char *head, const char *path)

 {
        char *delim = "?";
 
 {
        char *delim = "?";
 


@@ -201,65 +205,85 @@ 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);
+               html_url_path(ctx.cfg.virtual_root);

                if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
                        html("/");
                if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
                        html("/");

-               html_attr(ctx.repo->url);
+               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 {
                html(ctx.cfg.script_name);
                html("?url=");
                }
        } else {
                html(ctx.cfg.script_name);
                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;";
        }
        if (head && strcmp(head, ctx.repo->defbranch)) {
                html(delim);
                html("h=");
                }
                delim = "&amp;";
        }
        if (head && strcmp(head, ctx.repo->defbranch)) {
                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 *head, const char *rev)
+{
+       reporevlink("tag", name, title, class, head, rev, 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_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)

 {
        char *delim;
 
 {
        char *delim;
 


@@ -267,30 +291,35 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");

-               html_attr(rev);
+               html_url_arg(rev);

                delim = "&";
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");
                delim = "&";
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");

-               html_attr(grep);
+               html_url_arg(grep);

                delim = "&";
                html(delim);
                html("q=");
                delim = "&";
                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 = "&";
+       }
+       if (showmsg) {
+               html(delim);
+               html("showmsg=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(char *name, const char *title, const char *class,
+                     const char *head, const char *rev, int toggle_ssdiff)

 {
        if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
                name[ctx.cfg.max_msg_len] = '\0';
 {
        if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
                name[ctx.cfg.max_msg_len] = '\0';


@@ -298,77 +327,100 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
                name[ctx.cfg.max_msg_len - 2] = '.';
                name[ctx.cfg.max_msg_len - 3] = '.';
        }
                name[ctx.cfg.max_msg_len - 2] = '.';
                name[ctx.cfg.max_msg_len - 3] = '.';
        }

-       reporevlink("commit", name, title, class, head, rev, NULL);
+
+       char *delim;
+
+       delim = repolink(title, class, "commit", head, NULL);
+       if (rev && strcmp(rev, ctx.qry.head)) {
+               html(delim);
+               html("id=");
+               html_url_arg(rev);
+               delim = "&amp;";
+       }
+       if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+               html(delim);
+               html("ss=1");
+       }
+       html("'>");
+       html_txt(name);
+       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, int toggle_ssdiff)

 {
        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.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+               html(delim);
+               html("ss=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)

 {
        reporevlink("patch", name, title, class, head, rev, NULL);
 }
 
 {
        reporevlink("patch", name, title, class, head, rev, NULL);
 }
 

+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);
+}
+

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

-       char *page, *arg, *url;
+       char *page, *shortrev, *fullrev, *name;

 
 

+       fullrev = sha1_to_hex(obj->sha1);
+       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, 0);

                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";
-       }
-
-       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();
+       name = fmt("%s %s...", typename(obj->type), shortrev);
+       reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);

 }
 
 }
 

-void cgit_print_date(time_t secs, char *format, int local_time)
+void cgit_print_date(time_t secs, const char *format, int local_time)

 {
        char buf[64];
        struct tm *time;
 {
        char buf[64];
        struct tm *time;


@@ -383,7 +435,7 @@ void cgit_print_date(time_t secs, char *format, int local_time)
        html_txt(buf);
 }
 
        html_txt(buf);
 }
 

-void cgit_print_age(time_t t, time_t max_relative, char *format)
+void cgit_print_age(time_t t, time_t max_relative, const char *format)

 {
        time_t now, secs;
 
 {
        time_t now, secs;
 


@@ -428,21 +480,38 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
 
 void cgit_print_http_headers(struct cgit_context *ctx)
 {

+       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.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: %ld\n", ctx->page.size);

        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->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->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_print_docstart(struct cgit_context *ctx)
 {
 }
 
 void cgit_print_docstart(struct cgit_context *ctx)
 {

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

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


@@ -462,27 +531,39 @@ void cgit_print_docstart(struct cgit_context *ctx)
                html("'/>\n");
        }
        if (host && ctx->repo) {
                html("'/>\n");
        }
        if (host && ctx->repo) {

-               html("<link rel='alternate' title='Atom feed' href='http://");
+               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.path,
                                       fmt("h=%s", ctx->qry.head)));
                html_attr(cgit_hosturl());
                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
                                       fmt("h=%s", ctx->qry.head)));

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

        }
        }

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

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

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

 }
 
 void cgit_print_docend()
 {
 }
 
 void cgit_print_docend()
 {

-       html("</div>");
+       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 {
        if (ctx.cfg.footer)
                html_include(ctx.cfg.footer);
        else {

-               html("<div class='footer'>generated ");
+               htmlf("<div class='footer'>generated  by cgit %s at ",
+                       cgit_version);

                cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);

-               htmlf(" by cgit %s", cgit_version);

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

+       html("</div> <!-- id=cgit -->\n");

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


@@ -533,7 +614,8 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
        return 0;
 }
 
        return 0;
 }
 

-void add_hidden_formfields(int incl_head, int incl_search, char *page)
+void cgit_add_hidden_formfields(int incl_head, int incl_search,
+                               const char *page)

 {
        char *url;
 
 {
        char *url;
 


@@ -552,6 +634,8 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
                html_hidden("id", ctx.qry.sha1);
        if (ctx.qry.sha2)
                html_hidden("id2", ctx.qry.sha2);
                html_hidden("id", ctx.qry.sha1);
        if (ctx.qry.sha2)
                html_hidden("id2", ctx.qry.sha2);

+       if (ctx.qry.showmsg)
+               html_hidden("showmsg", "1");

 
        if (incl_search) {
                if (ctx.qry.grep)
 
        if (incl_search) {
                if (ctx.qry.grep)


@@ -561,35 +645,35 @@ 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(struct cgit_context *ctx, const char *page)

 {
 {

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

 }
 
 }
 

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

 {
 {

-       struct cgit_cmd *cmd = cgit_get_cmd(ctx);
-

        html("<table id='header'>\n");
        html("<tr>\n");
        html("<table id='header'>\n");
        html("<tr>\n");

-       html("<td class='logo' rowspan='2'><a href='");
-       if (ctx->cfg.logo_link)
-               html_attr(ctx->cfg.logo_link);
-       else
-               html_attr(cgit_rooturl());
-       html("'><img src='");
-       html_attr(ctx->cfg.logo);
-       html("' alt='cgit logo'/></a></td>\n");
+
+       if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
+               html("<td class='logo' rowspan='2'><a href='");
+               if (ctx->cfg.logo_link)
+                       html_attr(ctx->cfg.logo_link);
+               else
+                       html_attr(cgit_rooturl());
+               html("'><img src='");
+               html_attr(ctx->cfg.logo);
+               html("' alt='cgit logo'/></a></td>\n");
+       }

 
        html("<td class='main'>");
        if (ctx->repo) {
                cgit_index_link("index", NULL, NULL, NULL, 0);
                html(" : ");
 
        html("<td class='main'>");
        if (ctx->repo) {
                cgit_index_link("index", NULL, NULL, NULL, 0);
                html(" : ");

-               reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
-                           ctx->qry.head, NULL, NULL);
+               cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);

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

-               add_hidden_formfields(0, 1, ctx->qry.page);
+               cgit_add_hidden_formfields(0, 1, ctx->qry.page);

                html("<select name='h' onchange='this.form.submit();'>\n");
                for_each_branch_ref(print_branch_option, ctx->qry.head);
                html("</select> ");
                html("<select name='h' onchange='this.form.submit();'>\n");
                for_each_branch_ref(print_branch_option, ctx->qry.head);
                html("</select> ");


@@ -611,32 +695,42 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                        html_include(ctx->cfg.index_info);
        }
        html("</td></tr></table>\n");
                        html_include(ctx->cfg.index_info);
        }
        html("</td></tr></table>\n");

+}
+
+void cgit_print_pageheader(struct cgit_context *ctx)
+{
+       html("<div id='cgit'>");
+       if (!ctx->cfg.noheader)
+               print_header(ctx);

 
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {
 
        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,
+               cgit_summary_link("summary", NULL, hc(ctx, "summary"),
+                                 ctx->qry.head);
+               cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,

                               ctx->qry.sha1, NULL);
                               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,
+               cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
+                             NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
+               cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,

                               ctx->qry.sha1, NULL);
                               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_commit_link("commit", NULL, hc(ctx, "commit"),
+                                ctx->qry.head, ctx->qry.sha1, 0);
+               cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
+                              ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
+               if (ctx->repo->max_stats)
+                       cgit_stats_link("stats", NULL, hc(ctx, "stats"),
+                                       ctx->qry.head, NULL);

                if (ctx->repo->readme)
                        reporevlink("about", "about", NULL,
                if (ctx->repo->readme)
                        reporevlink("about", "about", NULL,

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

                                    NULL);
                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
                if (ctx->cfg.virtual_root)
                                    NULL);
                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
                if (ctx->cfg.virtual_root)

-                       html_attr(cgit_fileurl(ctx->qry.repo, "log",
-                                              ctx->qry.path, NULL));
+                       html_url_path(cgit_fileurl(ctx->qry.repo, "log",
+                                                  ctx->qry.path, NULL));

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

-               add_hidden_formfields(1, 0, "log");
+               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("<select name='qt'>\n");
                html_option("grep", "log msg", ctx->qry.grep);
                html_option("author", "author", ctx->qry.grep);


@@ -648,9 +742,9 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else {
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else {

-               site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
+               site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);

                if (ctx->cfg.root_readme)
                if (ctx->cfg.root_readme)

-                       site_link("about", "about", NULL, hc(cmd, "about"),
+                       site_link("about", "about", NULL, hc(ctx, "about"),

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


@@ -685,15 +779,19 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
                               const char *hex, int snapshots)
 {
        const struct cgit_snapshot_format* f;
                               const char *hex, int snapshots)
 {
        const struct cgit_snapshot_format* f;

+       char *prefix;

        char *filename;
        char *filename;

+       unsigned char sha1[20];

 
 

+       if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
+           (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
+               hex++;
+       prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));

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

-               filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
-                              f->suffix);
-               cgit_snapshot_link(filename, NULL, NULL, (char *)head,
-                                  (char *)hex, filename);
+               filename = fmt("%s%s", prefix, f->suffix);
+               cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);

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