]> git.cameronkatri.com Git - cgit.git/blobdiff - ui-shared.c
ui-shared.c: Remove unused function cgit_currurl()
[cgit.git] / ui-shared.c
index 8827fff4b19ed6b231a09f6870d4c2615deea82a..31224bc1aa23cb80118275a5077c5f28a4f8bfe9 100644 (file)
@@ -23,11 +23,11 @@ static char *http_date(time_t t)
                 "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_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);
@@ -83,7 +83,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
        } else {
                tmp = fmt("?url=%s/%s/%s", reponame, pagename,
                          (filename ? filename : ""));
-               delim = "&";
+               delim = "&amp;";
        }
        if (query)
                tmp = fmt("%s%s%s", tmp, delim, query);
@@ -93,7 +93,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
 char *cgit_pageurl(const char *reponame, const char *pagename,
                   const char *query)
 {
-       return cgit_fileurl(reponame,pagename,0,query);
+       return cgit_fileurl(reponame, pagename, 0, query);
 }
 
 const char *cgit_repobasename(const char *reponame)
@@ -102,38 +102,26 @@ const char *cgit_repobasename(const char *reponame)
        static char rvbuf[1024];
        int p;
        const char *rv;
-       strncpy(rvbuf,reponame,sizeof(rvbuf));
-       if(rvbuf[sizeof(rvbuf)-1])
+       strncpy(rvbuf, reponame, sizeof(rvbuf));
+       if (rvbuf[sizeof(rvbuf)-1])
                die("cgit_repobasename: truncated repository name '%s'", reponame);
        p = strlen(rvbuf)-1;
        /* strip trailing slashes */
-       while(p && rvbuf[p]=='/') rvbuf[p--]=0;
+       while (p && rvbuf[p] == '/') rvbuf[p--] = 0;
        /* strip trailing .git */
-       if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
+       if (p >= 3 && !strncmp(&rvbuf[p-3], ".git", 4)) {
                p -= 3; rvbuf[p--] = 0;
        }
        /* strip more trailing slashes if any */
-       while( p && rvbuf[p]=='/') rvbuf[p--]=0;
+       while ( p && rvbuf[p] == '/') rvbuf[p--] = 0;
        /* find last slash in the remaining string */
        rv = strrchr(rvbuf,'/');
-       if(rv)
+       if (rv)
                return ++rv;
        return rvbuf;
 }
 
-char *cgit_currurl()
-{
-       if (!ctx.cfg.virtual_root)
-               return ctx.cfg.script_name;
-       else if (ctx.qry.page)
-               return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
-       else if (ctx.qry.repo)
-               return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
-       else
-               return fmt("%s/", ctx.cfg.virtual_root);
-}
-
-static void site_url(char *page, char *search, int ofs)
+static void site_url(const char *page, const char *search, const char *sort, int ofs)
 {
        char *delim = "?";
 
@@ -146,13 +134,19 @@ static void site_url(char *page, char *search, int ofs)
 
        if (page) {
                htmlf("?p=%s", page);
-               delim = "&";
+               delim = "&amp;";
        }
        if (search) {
                html(delim);
                html("q=");
                html_attr(search);
-               delim = "&";
+               delim = "&amp;";
+       }
+       if (sort) {
+               html(delim);
+               html("s=");
+               html_attr(sort);
+               delim = "&amp;";
        }
        if (ofs) {
                html(delim);
@@ -160,8 +154,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, const char *sort, int ofs)
 {
        html("<a");
        if (title) {
@@ -175,20 +169,20 @@ static void site_link(char *page, char *name, char *title, char *class,
                html("'");
        }
        html(" href='");
-       site_url(page, search, ofs);
+       site_url(page, search, sort, ofs);
        html("'>");
        html_txt(name);
        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, const char *sort, int ofs)
 {
-       site_link(NULL, name, title, class, pattern, ofs);
+       site_link(NULL, name, title, class, pattern, sort, 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 = "?";
 
@@ -240,8 +234,9 @@ static char *repolink(char *title, char *class, char *page, char *head,
        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;
 
@@ -256,47 +251,48 @@ static void reporevlink(char *page, char *name, char *title, char *class,
        html("</a>");
 }
 
-void cgit_summary_link(char *name, char *title, char *class, char *head)
+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(char *name, char *title, char *class, char *head,
-                  char *rev)
+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(char *name, char *title, char *class, char *head,
-                   char *rev, char *path)
+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);
 }
 
-void cgit_plain_link(char *name, char *title, char *class, char *head,
-                    char *rev, char *path)
+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(char *name, char *title, char *class, char *head,
-                  char *rev, char *path, int ofs, char *grep, char *pattern,
-                  int showmsg)
+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;
 
        delim = repolink(title, class, "log", head, path);
-       if (rev && strcmp(rev, ctx.qry.head)) {
+       if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_url_arg(rev);
-               delim = "&";
+               delim = "&amp;";
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");
                html_url_arg(grep);
-               delim = "&";
+               delim = "&amp;";
                html(delim);
                html("q=");
                html_url_arg(pattern);
@@ -305,7 +301,7 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);
-               delim = "&";
+               delim = "&amp;";
        }
        if (showmsg) {
                html(delim);
@@ -316,8 +312,9 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
        html("</a>");
 }
 
-void cgit_commit_link(char *name, char *title, char *class, char *head,
-                     char *rev, int toggle_ssdiff)
+void cgit_commit_link(char *name, const char *title, const char *class,
+                     const char *head, const char *rev, const char *path,
+                     int toggle_ssdiff)
 {
        if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
                name[ctx.cfg.max_msg_len] = '\0';
@@ -328,8 +325,8 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
 
        char *delim;
 
-       delim = repolink(title, class, "commit", head, NULL);
-       if (rev && strcmp(rev, ctx.qry.head)) {
+       delim = repolink(title, class, "commit", head, path);
+       if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_url_arg(rev);
@@ -338,27 +335,43 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
        if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
                html(delim);
                html("ss=1");
+               delim = "&amp;";
+       }
+       if (ctx.qry.context > 0 && ctx.qry.context != 3) {
+               html(delim);
+               html("context=");
+               htmlf("%d", ctx.qry.context);
+               delim = "&amp;";
+       }
+       if (ctx.qry.ignorews) {
+               html(delim);
+               html("ignorews=1");
+               delim = "&amp;";
        }
        html("'>");
-       html_txt(name);
+       if (name[0] != '\0')
+               html_txt(name);
+       else
+               html_txt("(no commit message)");
        html("</a>");
 }
 
-void cgit_refs_link(char *name, char *title, char *class, char *head,
-                   char *rev, char *path)
+void cgit_refs_link(const char *name, const char *title, const char *class,
+                   const char *head, const char *rev, const char *path)
 {
        reporevlink("refs", name, title, class, head, rev, path);
 }
 
-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);
 }
 
-void cgit_diff_link(char *name, char *title, char *class, char *head,
-                   char *new_rev, char *old_rev, char *path,
-                   int toggle_ssdiff)
+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;
 
@@ -378,24 +391,94 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
        if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
                html(delim);
                html("ss=1");
+               delim = "&amp;";
+       }
+       if (ctx.qry.context > 0 && ctx.qry.context != 3) {
+               html(delim);
+               html("context=");
+               htmlf("%d", ctx.qry.context);
+               delim = "&amp;";
+       }
+       if (ctx.qry.ignorews) {
+               html(delim);
+               html("ignorews=1");
+               delim = "&amp;";
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
-void cgit_patch_link(char *name, char *title, char *class, char *head,
-                    char *rev)
+void cgit_patch_link(const char *name, const char *title, const char *class,
+                    const char *head, const char *rev, const char *path)
 {
-       reporevlink("patch", name, title, class, head, rev, NULL);
+       reporevlink("patch", name, title, class, head, rev, path);
 }
 
-void cgit_stats_link(char *name, char *title, char *class, char *head,
-                    char *path)
+void cgit_stats_link(const char *name, const char *title, const char *class,
+                    const char *head, const char *path)
 {
        reporevlink("stats", name, title, class, head, NULL, path);
 }
 
+static void cgit_self_link(char *name, const char *title, const char *class,
+                          struct cgit_context *ctx)
+{
+       if (!strcmp(ctx->qry.page, "repolist"))
+               return cgit_index_link(name, title, class, ctx->qry.search, ctx->qry.sort,
+                                      ctx->qry.ofs);
+       else if (!strcmp(ctx->qry.page, "summary"))
+               return cgit_summary_link(name, title, class, ctx->qry.head);
+       else if (!strcmp(ctx->qry.page, "tag"))
+               return cgit_tag_link(name, title, class, ctx->qry.head,
+                                    ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
+       else if (!strcmp(ctx->qry.page, "tree"))
+               return cgit_tree_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path);
+       else if (!strcmp(ctx->qry.page, "plain"))
+               return cgit_plain_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path);
+       else if (!strcmp(ctx->qry.page, "log"))
+               return cgit_log_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path, ctx->qry.ofs,
+                                     ctx->qry.grep, ctx->qry.search,
+                                     ctx->qry.showmsg);
+       else if (!strcmp(ctx->qry.page, "commit"))
+               return cgit_commit_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path, 0);
+       else if (!strcmp(ctx->qry.page, "patch"))
+               return cgit_patch_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path);
+       else if (!strcmp(ctx->qry.page, "refs"))
+               return cgit_refs_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path);
+       else if (!strcmp(ctx->qry.page, "snapshot"))
+               return cgit_snapshot_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path);
+       else if (!strcmp(ctx->qry.page, "diff"))
+               return cgit_diff_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.sha1, ctx->qry.sha2,
+                                     ctx->qry.path, 0);
+       else if (!strcmp(ctx->qry.page, "stats"))
+               return cgit_stats_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.path);
+
+       /* Don't known how to make link for this page */
+       repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
+       html("><!-- cgit_self_link() doesn't know how to make link for page '");
+       html_txt(ctx->qry.page);
+       html("' -->");
+       html_txt(name);
+       html("</a>");
+}
+
 void cgit_object_link(struct object *obj)
 {
        char *page, *shortrev, *fullrev, *name;
@@ -404,8 +487,8 @@ void cgit_object_link(struct object *obj)
        shortrev = xstrdup(fullrev);
        shortrev[10] = '\0';
        if (obj->type == OBJ_COMMIT) {
-                cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
-                                ctx.qry.head, fullrev, 0);
+               cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
+                                ctx.qry.head, fullrev, NULL, 0);
                return;
        } else if (obj->type == OBJ_TREE)
                page = "tree";
@@ -417,14 +500,71 @@ void cgit_object_link(struct object *obj)
        reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
 }
 
-void cgit_print_date(time_t secs, char *format, int local_time)
+static struct string_list_item *lookup_path(struct string_list *list,
+                                           const char *path)
+{
+       struct string_list_item *item;
+
+       while (path && path[0]) {
+               if ((item = string_list_lookup(list, path)))
+                       return item;
+               if (!(path = strchr(path, '/')))
+                       break;
+               path++;
+       }
+       return NULL;
+}
+
+void cgit_submodule_link(const char *class, char *path, const char *rev)
+{
+       struct string_list *list;
+       struct string_list_item *item;
+       char tail, *dir;
+       size_t len;
+
+       tail = 0;
+       list = &ctx.repo->submodules;
+       item = lookup_path(list, path);
+       if (!item) {
+               len = strlen(path);
+               tail = path[len - 1];
+               if (tail == '/') {
+                       path[len - 1] = 0;
+                       item = lookup_path(list, path);
+               }
+       }
+       html("<a ");
+       if (class)
+               htmlf("class='%s' ", class);
+       html("href='");
+       if (item) {
+               html_attr(fmt(item->util, rev));
+       } else if (ctx.repo->module_link) {
+               dir = strrchr(path, '/');
+               if (dir)
+                       dir++;
+               else
+                       dir = path;
+               html_attr(fmt(ctx.repo->module_link, dir, rev));
+       } else {
+               html("#");
+       }
+       html("'>");
+       html_txt(path);
+       html("</a>");
+       html_txt(fmt(" @ %.7s", rev));
+       if (item && tail)
+               path[len - 1] = tail;
+}
+
+void cgit_print_date(time_t secs, const char *format, int local_time)
 {
        char buf[64];
        struct tm *time;
 
        if (!secs)
                return;
-       if(local_time)
+       if (local_time)
                time = localtime(&secs);
        else
                time = gmtime(&secs);
@@ -432,7 +572,7 @@ void cgit_print_date(time_t secs, char *format, int local_time)
        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;
 
@@ -488,7 +628,7 @@ void cgit_print_http_headers(struct cgit_context *ctx)
        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);
+               htmlf("Content-Length: %zd\n", ctx->page.size);
        if (ctx->page.filename)
                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                      ctx->page.filename);
@@ -527,11 +667,11 @@ void cgit_print_docstart(struct cgit_context *ctx)
                html_attr(ctx->cfg.favicon);
                html("'/>\n");
        }
-       if (host && ctx->repo) {
+       if (host && ctx->repo && 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.path,
+               html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath,
                                       fmt("h=%s", ctx->qry.head)));
                html("' type='application/atom+xml'/>\n");
        }
@@ -564,16 +704,16 @@ void cgit_print_docend()
        html("</body>\n</html>\n");
 }
 
-int print_branch_option(const char *refname, const unsigned char *sha1,
-                       int flags, void *cb_data)
+static int print_branch_option(const char *refname, const unsigned char *sha1,
+                              int flags, void *cb_data)
 {
        char *name = (char *)refname;
        html_option(name, name, ctx.qry.head);
        return 0;
 }
 
-int print_archive_ref(const char *refname, const unsigned char *sha1,
-                      int flags, void *cb_data)
+static int print_archive_ref(const char *refname, const unsigned char *sha1,
+                            int flags, void *cb_data)
 {
        struct tag *tag;
        struct taginfo *info;
@@ -584,7 +724,7 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
 
        if (prefixcmp(refname, "refs/archives"))
                return 0;
-       strncpy(buf, refname+14, sizeof(buf));
+       strncpy(buf, refname + 14, sizeof(buf));
        obj = parse_object(sha1);
        if (!obj)
                return 1;
@@ -611,14 +751,15 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
        return 0;
 }
 
-void cgit_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;
 
        if (!ctx.cfg.virtual_root) {
                url = fmt("%s/%s", ctx.qry.repo, page);
-               if (ctx.qry.path)
-                       url = fmt("%s/%s", url, ctx.qry.path);
+               if (ctx.qry.vpath)
+                       url = fmt("%s/%s", url, ctx.qry.vpath);
                html_hidden("url", url);
        }
 
@@ -641,32 +782,61 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
        }
 }
 
-const char *fallback_cmd = "repolist";
+static const char *hc(struct cgit_context *ctx, const char *page)
+{
+       return strcmp(ctx->qry.page, page) ? NULL : "active";
+}
 
-char *hc(struct cgit_cmd *cmd, const char *page)
+static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
 {
-       return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
+       char *old_path = ctx->qry.path;
+       char *p = path, *q, *end = path + strlen(path);
+
+       ctx->qry.path = NULL;
+       cgit_self_link("root", NULL, NULL, ctx);
+       ctx->qry.path = p = path;
+       while (p < end) {
+               if (!(q = strchr(p, '/')))
+                       q = end;
+               *q = '\0';
+               html_txt("/");
+               cgit_self_link(p, NULL, NULL, ctx);
+               if (q < end)
+                       *q = '/';
+               p = q + 1;
+       }
+       ctx->qry.path = old_path;
 }
 
 static void print_header(struct cgit_context *ctx)
 {
+       char *logo = NULL, *logo_link = NULL;
+
        html("<table id='header'>\n");
        html("<tr>\n");
 
-       if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
+       if (ctx->repo && ctx->repo->logo && *ctx->repo->logo)
+               logo = ctx->repo->logo;
+       else
+               logo = ctx->cfg.logo;
+       if (ctx->repo && ctx->repo->logo_link && *ctx->repo->logo_link)
+               logo_link = ctx->repo->logo_link;
+       else
+               logo_link = ctx->cfg.logo_link;
+       if (logo && *logo) {
                html("<td class='logo' rowspan='2'><a href='");
-               if (ctx->cfg.logo_link)
-                       html_attr(ctx->cfg.logo_link);
+               if (logo_link && *logo_link)
+                       html_attr(logo_link);
                else
                        html_attr(cgit_rooturl());
                html("'><img src='");
-               html_attr(ctx->cfg.logo);
+               html_attr(logo);
                html("' alt='cgit logo'/></a></td>\n");
        }
 
        html("<td class='main'>");
        if (ctx->repo) {
-               cgit_index_link("index", NULL, NULL, NULL, 0);
+               cgit_index_link("index", NULL, NULL, NULL, NULL, 0);
                html(" : ");
                cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                html("</td><td class='form'>");
@@ -697,47 +867,44 @@ static void print_header(struct cgit_context *ctx)
 
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
-       struct cgit_cmd *cmd = cgit_get_cmd(ctx);
-
-       if (!cmd && ctx->repo)
-               fallback_cmd = "summary";
-
        html("<div id='cgit'>");
        if (!ctx->cfg.noheader)
                print_header(ctx);
 
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {
-               cgit_summary_link("summary", NULL, hc(cmd, "summary"),
+               cgit_summary_link("summary", NULL, hc(ctx, "summary"),
                                  ctx->qry.head);
-               cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
-                              ctx->qry.sha1, NULL);
-               cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
-                             NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
-               cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
+               cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
-               cgit_commit_link("commit", NULL, hc(cmd, "commit"),
-                                ctx->qry.head, ctx->qry.sha1, 0);
-               cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
-                              ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
+               cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
+                             NULL, ctx->qry.vpath, 0, NULL, NULL,
+                             ctx->qry.showmsg);
+               cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
+                              ctx->qry.sha1, ctx->qry.vpath);
+               cgit_commit_link("commit", NULL, hc(ctx, "commit"),
+                                ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0);
+               cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
+                              ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0);
                if (ctx->repo->max_stats)
-                       cgit_stats_link("stats", NULL, hc(cmd, "stats"),
-                                       ctx->qry.head, NULL);
+                       cgit_stats_link("stats", NULL, hc(ctx, "stats"),
+                                       ctx->qry.head, ctx->qry.vpath);
                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)
                        html_url_path(cgit_fileurl(ctx->qry.repo, "log",
-                                                  ctx->qry.path, NULL));
+                                                  ctx->qry.vpath, NULL));
                html("'>\n");
                cgit_add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");
                html_option("grep", "log msg", ctx->qry.grep);
                html_option("author", "author", ctx->qry.grep);
                html_option("committer", "committer", ctx->qry.grep);
+               html_option("range", "range", ctx->qry.grep);
                html("</select>\n");
                html("<input class='txt' type='text' size='10' name='q' value='");
                html_attr(ctx->qry.search);
@@ -745,10 +912,10 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                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, NULL, 0);
                if (ctx->cfg.root_readme)
-                       site_link("about", "about", NULL, hc(cmd, "about"),
-                                 NULL, 0);
+                       site_link("about", "about", NULL, hc(ctx, "about"),
+                                 NULL, NULL, 0);
                html("</td><td class='form'>");
                html("<form method='get' action='");
                html_attr(cgit_rooturl());
@@ -760,6 +927,12 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                html("</form>");
        }
        html("</td></tr></table>\n");
+       if (ctx->qry.vpath) {
+               html("<div class='path'>");
+               html("path: ");
+               cgit_print_path_crumbs(ctx, ctx->qry.vpath);
+               html("</div>");
+       }
        html("<div class='content'>");
 }
 
@@ -783,7 +956,7 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
 {
        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 &&