ui-commit: Preserve path limit in links to commit page

This includes adding a path argument to cgit_commit_link() and updating all
its callers. The callers from within the commit page (i.e. the "commit",
"unidiff"/"side-by-side diff" and "parent" links) all preserve the path
limit of the current commit page. All other callers pass NULL (i.e. no path
limit).

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

5 files changed, 15 insertions, 12 deletions

diff --git a/ui-commit.c b/ui-commit.c
index 1793921..2d98ed9 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,127 +1,128 @@
 /* ui-commit.c: generate commit view
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-diff.h"
 #include "ui-log.h"
 
 void cgit_print_commit(char *hex, const char *prefix)
 {
         struct commit *commit, *parent;
         struct commitinfo *info;
         struct commit_list *p;
         unsigned char sha1[20];
         char *tmp;
         int parents = 0;
 
         if (!hex)
                 hex = ctx.qry.head;
 
         if (get_sha1(hex, sha1)) {
                 cgit_print_error(fmt("Bad object id: %s", hex));
                 return;
         }
         commit = lookup_commit_reference(sha1);
         if (!commit) {
                 cgit_print_error(fmt("Bad commit reference: %s", hex));
                 return;
         }
         info = cgit_parse_commit(commit);
 
         load_ref_decorations(DECORATE_FULL_REFS);
 
         html("<table summary='commit info' class='commit-info'>\n");
         html("<tr><th>author</th><td>");
         html_txt(info->author);
         if (!ctx.cfg.noplainemail) {
                 html(" ");
                 html_txt(info->author_email);
         }
         html("</td><td class='right'>");
         cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
         html("</td></tr>\n");
         html("<tr><th>committer</th><td>");
         html_txt(info->committer);
         if (!ctx.cfg.noplainemail) {
                 html(" ");
                 html_txt(info->committer_email);
         }
         html("</td><td class='right'>");
         cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
         html("</td></tr>\n");
         html("<tr><th>commit</th><td colspan='2' class='sha1'>");
         tmp = sha1_to_hex(commit->object.sha1);
-        cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0);
+        cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
         html(" (");
         cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
         html(") (");
         if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
-                cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1);
+                cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
         else
-                cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1);
+                cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
         html(")</td></tr>\n");
         html("<tr><th>tree</th><td colspan='2' class='sha1'>");
         tmp = xstrdup(hex);
         cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
                        ctx.qry.head, tmp, NULL);
         if (prefix) {
                 html(" /");
                 cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
         }
         html("</td></tr>\n");
               for (p = commit->parents; p ; p = p->next) {
                 parent = lookup_commit_reference(p->item->object.sha1);
                 if (!parent) {
                         html("<tr><td colspan='3'>");
                         cgit_print_error("Error reading parent commit");
                         html("</td></tr>");
                         continue;
                 }
                 html("<tr><th>parent</th>"
                      "<td colspan='2' class='sha1'>");
                 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
-                                 ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0);
+                                 ctx.qry.head,
+                                 sha1_to_hex(p->item->object.sha1), prefix, 0);
                 html(" (");
                 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
                                sha1_to_hex(p->item->object.sha1), prefix, 0);
                 html(")</td></tr>");
                 parents++;
         }
         if (ctx.repo->snapshots) {
                 html("<tr><th>download</th><td colspan='2' class='sha1'>");
                 cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
                                           hex, ctx.repo->snapshots);
                 html("</td></tr>");
         }
         html("</table>\n");
         html("<div class='commit-subject'>");
         if (ctx.repo->commit_filter)
                 cgit_open_filter(ctx.repo->commit_filter);
         html_txt(info->subject);
         if (ctx.repo->commit_filter)
                 cgit_close_filter(ctx.repo->commit_filter);
         show_commit_decorations(commit);
         html("</div>");
         html("<div class='commit-msg'>");
         if (ctx.repo->commit_filter)
                 cgit_open_filter(ctx.repo->commit_filter);
         html_txt(info->msg);
         if (ctx.repo->commit_filter)
                 cgit_close_filter(ctx.repo->commit_filter);
         html("</div>");
         if (parents < 3) {
                 if (parents)
                         tmp = sha1_to_hex(commit->parents->item->object.sha1);
                 else
                         tmp = NULL;
                 cgit_print_diff(ctx.qry.sha1, tmp, prefix);
         }
         cgit_free_commitinfo(info);
 }
diff --git a/ui-log.c b/ui-log.c
index 0947604..282eca3 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,220 +1,220 @@
 /* ui-log.c: functions for log output
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 int files, add_lines, rem_lines;
 
 void count_lines(char *line, int size)
 {
         if (size <= 0)
                 return;
 
         if (line[0] == '+')
                 add_lines++;
 
         else if (line[0] == '-')
                 rem_lines++;
 }
 
 void inspect_files(struct diff_filepair *pair)
 {
         unsigned long old_size = 0;
         unsigned long new_size = 0;
         int binary = 0;
 
         files++;
         if (ctx.repo->enable_log_linecount)
                 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
                                 &new_size, &binary, count_lines);
 }
 
 void show_commit_decorations(struct commit *commit)
 {
         struct name_decoration *deco;
         static char buf[1024];
 
         buf[sizeof(buf) - 1] = 0;
         deco = lookup_decoration(&name_decoration, &commit->object);
         while (deco) {
                 if (!prefixcmp(deco->name, "refs/heads/")) {
                         strncpy(buf, deco->name + 11, sizeof(buf) - 1);
                         cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL,
                                 0, NULL, NULL, ctx.qry.showmsg);
                 }
                 else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
                         strncpy(buf, deco->name + 15, sizeof(buf) - 1);
                         cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                 }
                 else if (!prefixcmp(deco->name, "refs/tags/")) {
                         strncpy(buf, deco->name + 10, sizeof(buf) - 1);
                         cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                 }
                 else if (!prefixcmp(deco->name, "refs/remotes/")) {
                         strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                         cgit_log_link(buf, NULL, "remote-deco", NULL,
                                 sha1_to_hex(commit->object.sha1), NULL,
                                 0, NULL, NULL, ctx.qry.showmsg);
                 }
                 else {
                         strncpy(buf, deco->name, sizeof(buf) - 1);
                         cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
-                                sha1_to_hex(commit->object.sha1), 0);
+                                sha1_to_hex(commit->object.sha1), NULL, 0);
                 }
                 deco = deco->next;
         }
 }
 
 void print_commit(struct commit *commit)
 {
         struct commitinfo *info;
         char *tmp;
         int cols = 2;
 
         info = cgit_parse_commit(commit);
         htmlf("<tr%s><td>",
                 ctx.qry.showmsg ? " class='logheader'" : "");
         tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
         tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
         html_link_open(tmp, NULL, NULL);
         cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
         html_link_close();
         htmlf("</td><td%s>",
                 ctx.qry.showmsg ? " class='logsubject'" : "");
         cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
-                         sha1_to_hex(commit->object.sha1), 0);
+                         sha1_to_hex(commit->object.sha1), NULL, 0);
         show_commit_decorations(commit);
         html("</td><td>");
         html_txt(info->author);
         if (ctx.repo->enable_log_filecount) {
                 files = 0;
                 add_lines = 0;
                 rem_lines = 0;
                 cgit_diff_commit(commit, inspect_files);
                 html("</td><td>");
                 htmlf("%d", files);
                 if (ctx.repo->enable_log_linecount) {
                         html("</td><td>");
                         htmlf("-%d/+%d", rem_lines, add_lines);
                 }
         }
         html("</td></tr>\n");
         if (ctx.qry.showmsg) {
                 if (ctx.repo->enable_log_filecount) {
                         cols++;
                         if (ctx.repo->enable_log_linecount)
                                 cols++;
                 }
                 htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
                         cols);
                 html_txt(info->msg);
                 html("</td></tr>\n");
         }
         cgit_free_commitinfo(info);
 }
 
 static const char *disambiguate_ref(const char *ref)
 {
         unsigned char sha1[20];
         const char *longref;
 
         longref = fmt("refs/heads/%s", ref);
         if (get_sha1(longref, sha1) == 0)
                 return longref;
 
         return ref;
 }
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
                     char *path, int pager)
 {
         struct rev_info rev;
         struct commit *commit;
         const char *argv[] = {NULL, NULL, NULL, NULL, NULL};
         int argc = 2;
         int i, columns = 3;
 
         if (!tip)
                 tip = ctx.qry.head;
 
         argv[1] = disambiguate_ref(tip);
 
         if (grep && pattern && (!strcmp(grep, "grep") ||
                                 !strcmp(grep, "author") ||
                                 !strcmp(grep, "committer")))
                 argv[argc++] = fmt("--%s=%s", grep, pattern);
 
         if (path) {
                 argv[argc++] = "--";
                 argv[argc++] = path;
         }
         init_revisions(&rev, NULL);
         rev.abbrev = DEFAULT_ABBREV;
         rev.commit_format = CMIT_FMT_DEFAULT;
         rev.verbose_header = 1;
         rev.show_root_diff = 0;
         setup_revisions(argc, argv, &rev, NULL);
         load_ref_decorations(DECORATE_FULL_REFS);
         rev.show_decorations = 1;
         rev.grep_filter.regflags |= REG_ICASE;
         compile_grep_patterns(&rev.grep_filter);
         prepare_revision_walk(&rev);
 
         if (pager)
                 html("<table class='list nowrap'>");
 
         html("<tr class='nohover'><th class='left'>Age</th>"
               "<th class='left'>Commit message");
         if (pager) {
                 html(" (");
                 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
                               NULL, ctx.qry.head, ctx.qry.sha1,
                               ctx.qry.path, ctx.qry.ofs, ctx.qry.grep,
                               ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
                 html(")");
         }
         html("</th><th class='left'>Author</th>");
         if (ctx.repo->enable_log_filecount) {
                 html("<th class='left'>Files</th>");
                 columns++;
                 if (ctx.repo->enable_log_linecount) {
                         html("<th class='left'>Lines</th>");
                         columns++;
                 }
         }
         html("</tr>\n");
 
         if (ofs<0)
                 ofs = 0;
 
         for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
                 free(commit->buffer);
                 commit->buffer = NULL;
                 free_commit_list(commit->parents);
                 commit->parents = NULL;
         }
 
         for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
                 print_commit(commit);
                 free(commit->buffer);
                 commit->buffer = NULL;
                 free_commit_list(commit->parents);
                 commit->parents = NULL;
         }
         if (pager) {
                 htmlf("</table><div class='pager'>",
                      columns);
                 if (ofs > 0) {
                         cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                                       ctx.qry.sha1, ctx.qry.path,
                                       ofs - cnt, ctx.qry.grep,
                                       ctx.qry.search, ctx.qry.showmsg);
                         html("&nbsp;");
                 }
diff --git a/ui-refs.c b/ui-refs.c
index 98738db..94ff6be 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -1,205 +1,205 @@
 /* ui-refs.c: browse symbolic refs
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 static int header;
 
 static int cmp_age(int age1, int age2)
 {
         if (age1 != 0 && age2 != 0)
                 return age2 - age1;
 
         if (age1 == 0 && age2 == 0)
                 return 0;
 
         if (age1 == 0)
                 return +1;
 
         return -1;
 }
 
 static int cmp_ref_name(const void *a, const void *b)
 {
         struct refinfo *r1 = *(struct refinfo **)a;
         struct refinfo *r2 = *(struct refinfo **)b;
 
         return strcmp(r1->refname, r2->refname);
 }
 
 static int cmp_branch_age(const void *a, const void *b)
 {
         struct refinfo *r1 = *(struct refinfo **)a;
         struct refinfo *r2 = *(struct refinfo **)b;
 
         return cmp_age(r1->commit->committer_date, r2->commit->committer_date);
 }
 
 static int cmp_tag_age(const void *a, const void *b)
 {
         struct refinfo *r1 = *(struct refinfo **)a;
         struct refinfo *r2 = *(struct refinfo **)b;
         int r1date, r2date;
 
         if (r1->object->type != OBJ_COMMIT)
                 r1date = r1->tag->tagger_date;
         else
                 r1date = r1->commit->committer_date;
 
         if (r2->object->type != OBJ_COMMIT)
                 r2date = r2->tag->tagger_date;
         else
                 r2date = r2->commit->committer_date;
 
         return cmp_age(r1date, r2date);
 }
 
 static int print_branch(struct refinfo *ref)
 {
         struct commitinfo *info = ref->commit;
         char *name = (char *)ref->refname;
 
         if (!info)
                 return 1;
         html("<tr><td>");
         cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL,
                       ctx.qry.showmsg);
         html("</td><td>");
 
         if (ref->object->type == OBJ_COMMIT) {
-                cgit_commit_link(info->subject, NULL, NULL, name, NULL, 0);
+                cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0);
                 html("</td><td>");
                 html_txt(info->author);
                 html("</td><td colspan='2'>");
                 cgit_print_age(info->commit->date, -1, NULL);
         } else {
                 html("</td><td></td><td>");
                 cgit_object_link(ref->object);
         }
         html("</td></tr>\n");
         return 0;
 }
 
 static void print_tag_header()
 {
         html("<tr class='nohover'><th class='left'>Tag</th>"
              "<th class='left'>Download</th>"
              "<th class='left'>Author</th>"
              "<th class='left' colspan='2'>Age</th></tr>\n");
         header = 1;
 }
 
 static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
 {
         const struct cgit_snapshot_format* f;
             char *filename;
         const char *basename;
 
         if (!ref || strlen(ref) < 2)
                 return;
 
         basename = cgit_repobasename(repo->url);
         if (prefixcmp(ref, basename) != 0) {
                 if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
                         ref++;
                 if (isdigit(ref[0]))
                         ref = xstrdup(fmt("%s-%s", basename, ref));
         }
 
         for (f = cgit_snapshot_formats; f->suffix; f++) {
                 if (!(repo->snapshots & f->bit))
                         continue;
                 filename = fmt("%s%s", ref, f->suffix);
                 cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                 html("&nbsp;&nbsp;");
         }
 }
 static int print_tag(struct refinfo *ref)
 {
         struct tag *tag;
         struct taginfo *info;
         char *name = (char *)ref->refname;
 
         if (ref->object->type == OBJ_TAG) {
                 tag = (struct tag *)ref->object;
                 info = ref->tag;
                 if (!tag || !info)
                         return 1;
                 html("<tr><td>");
                 cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
                 html("</td><td>");
                 if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
                         print_tag_downloads(ctx.repo, name);
                 else
                         cgit_object_link(tag->tagged);
                 html("</td><td>");
                 if (info->tagger)
                         html(info->tagger);
                 html("</td><td colspan='2'>");
                 if (info->tagger_date > 0)
                         cgit_print_age(info->tagger_date, -1, NULL);
                 html("</td></tr>\n");
         } else {
                 if (!header)
                         print_tag_header();
                 html("<tr><td>");
                 cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
                 html("</td><td>");
                 if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT))
                         print_tag_downloads(ctx.repo, name);
                 else
                         cgit_object_link(ref->object);
                 html("</td><td>");
                 if (ref->object->type == OBJ_COMMIT)
                         html(ref->commit->author);
                 html("</td><td colspan='2'>");
                 if (ref->object->type == OBJ_COMMIT)
                         cgit_print_age(ref->commit->commit->date, -1, NULL);
                 html("</td></tr>\n");
         }
         return 0;
 }
 
 static void print_refs_link(char *path)
 {
         html("<tr class='nohover'><td colspan='4'>");
         cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
         html("</td></tr>");
 }
 
 void cgit_print_branches(int maxcount)
 {
         struct reflist list;
         int i;
 
         html("<tr class='nohover'><th class='left'>Branch</th>"
              "<th class='left'>Commit message</th>"
              "<th class='left'>Author</th>"
              "<th class='left' colspan='2'>Age</th></tr>\n");
 
         list.refs = NULL;
         list.alloc = list.count = 0;
         for_each_branch_ref(cgit_refs_cb, &list);
         if (ctx.repo->enable_remote_branches)
                 for_each_remote_ref(cgit_refs_cb, &list);
 
         if (maxcount == 0 || maxcount > list.count)
                 maxcount = list.count;
 
         if (maxcount < list.count) {
                 qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
                 qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
         }
 
         for(i=0; i<maxcount; i++)
                 print_branch(list.refs[i]);
 
         if (maxcount < list.count)
                 print_refs_link("heads");
diff --git a/ui-shared.c b/ui-shared.c
index d5c4c10..372b9e7 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -194,404 +194,405 @@ static char *repolink(const char *title, const char *class, const char *page,
 
         html("<a");
         if (title) {
                 html(" title='");
                 html_attr(title);
                 html("'");
         }
         if (class) {
                 html(" class='");
                 html_attr(class);
                 html("'");
         }
         html(" href='");
         if (ctx.cfg.virtual_root) {
                 html_url_path(ctx.cfg.virtual_root);
                 if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
                         html("/");
                 html_url_path(ctx.repo->url);
                 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                         html("/");
                 if (page) {
                         html_url_path(page);
                         html("/");
                         if (path)
                                 html_url_path(path);
                 }
         } else {
                 html(ctx.cfg.script_name);
                 html("?url=");
                 html_url_arg(ctx.repo->url);
                 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                         html("/");
                 if (page) {
                         html_url_arg(page);
                         html("/");
                         if (path)
                                 html_url_arg(path);
                 }
                 delim = "&amp;";
         }
         if (head && strcmp(head, ctx.repo->defbranch)) {
                 html(delim);
                 html("h=");
                 html_url_arg(head);
                 delim = "&amp;";
         }
         return fmt("%s", delim);
 }
 
 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);
         if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) {
                 html(delim);
                 html("id=");
                 html_url_arg(rev);
         }
         html("'>");
         html_txt(name);
         html("</a>");
 }
 
 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);
 }
 
 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;
 
         delim = repolink(title, class, "log", head, path);
         if (rev && strcmp(rev, ctx.qry.head)) {
                 html(delim);
                 html("id=");
                 html_url_arg(rev);
                 delim = "&";
         }
         if (grep && pattern) {
                 html(delim);
                 html("qt=");
                 html_url_arg(grep);
                 delim = "&";
                 html(delim);
                 html("q=");
                 html_url_arg(pattern);
         }
         if (ofs > 0) {
                 html(delim);
                 html("ofs=");
                 htmlf("%d", ofs);
                 delim = "&";
         }
         if (showmsg) {
                 html(delim);
                 html("showmsg=1");
         }
         html("'>");
         html_txt(name);
         html("</a>");
 }
 
 void cgit_commit_link(char *name, const char *title, const char *class,
-                      const char *head, const char *rev, int toggle_ssdiff)
+                      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';
                 name[ctx.cfg.max_msg_len - 1] = '.';
                 name[ctx.cfg.max_msg_len - 2] = '.';
                 name[ctx.cfg.max_msg_len - 3] = '.';
         }
 
         char *delim;
 
-        delim = repolink(title, class, "commit", head, NULL);
+        delim = repolink(title, class, "commit", head, path);
         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(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(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(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);
         if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) {
                 html(delim);
                 html("id=");
                 html_url_arg(new_rev);
                 delim = "&amp;";
         }
         if (old_rev) {
                 html(delim);
                 html("id2=");
                 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>");
 }
 
 void cgit_patch_link(const char *name, const char *title, const char *class,
                      const char *head, const char *rev, const char *path)
 {
         reporevlink("patch", name, title, class, head, rev, path);
 }
 
 void cgit_stats_link(const char *name, const char *title, const char *class,
                      const char *head, const char *path)
 {
         reporevlink("stats", name, title, class, head, NULL, path);
 }
 
 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.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;
 
         fullrev = sha1_to_hex(obj->sha1);
         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);
+                                 ctx.qry.head, fullrev, NULL, 0);
                 return;
         } else if (obj->type == OBJ_TREE)
                 page = "tree";
         else if (obj->type == OBJ_TAG)
                 page = "tag";
         else
                 page = "blob";
         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, const char *format, int local_time)
 {
         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);
 }
 
 void cgit_print_age(time_t t, time_t max_relative, const char *format)
 {
         time_t now, secs;
 
         if (!t)
                 return;
         time(&now);
         secs = now - t;
 
         if (secs > max_relative && max_relative >= 0) {
                 cgit_print_date(t, format, ctx.cfg.local_time);
                 return;
         }
 
         if (secs < TM_HOUR * 2) {
                 htmlf("<span class='age-mins'>%.0f min.</span>",
                       secs * 1.0 / TM_MIN);
                 return;
         }
         if (secs < TM_DAY * 2) {
                 htmlf("<span class='age-hours'>%.0f hours</span>",
                       secs * 1.0 / TM_HOUR);
                 return;
         }
         if (secs < TM_WEEK * 2) {
                 htmlf("<span class='age-days'>%.0f days</span>",
                       secs * 1.0 / TM_DAY);
                 return;
         }
         if (secs < TM_MONTH * 2) {
                 htmlf("<span class='age-weeks'>%.0f weeks</span>",
                       secs * 1.0 / TM_WEEK);
                 return;
         }
         if (secs < TM_YEAR * 2) {
                 htmlf("<span class='age-months'>%.0f months</span>",
                       secs * 1.0 / TM_MONTH);
                 return;
         }
         htmlf("<span class='age-years'>%.0f years</span>",
               secs * 1.0 / TM_YEAR);
 }
 
 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.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.etag)
                 htmlf("ETag: \"%s\"\n", ctx->page.etag);
         html("\n");
         if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
                 exit(0);
 }
 
 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");
         html("<head>\n");
         html("<title>");
         html_txt(ctx->page.title);
         html("</title>\n");
         htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
         if (ctx->cfg.robots && *ctx->cfg.robots)
                 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
         html("<link rel='stylesheet' type='text/css' href='");
         html_attr(ctx->cfg.css);
         html("'/>\n");
         if (ctx->cfg.favicon) {
                 html("<link rel='shortcut icon' href='");
                 html_attr(ctx->cfg.favicon);
                 html("'/>\n");
         }
         if (host && ctx->repo) {
                 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,
                                        fmt("h=%s", ctx->qry.head)));
                 html("' type='application/atom+xml'/>\n");
@@ -668,215 +669,215 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
                                buf));
         html_link_open(url, NULL, "menu");
         html_txt(strlpart(buf, 20));
         html_link_close();
         return 0;
 }
 
 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.vpath)
                         url = fmt("%s/%s", url, ctx.qry.vpath);
                 html_hidden("url", url);
         }
 
         if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
             strcmp(ctx.qry.head, ctx.repo->defbranch))
                 html_hidden("h", ctx.qry.head);
 
         if (ctx.qry.sha1)
                 html_hidden("id", ctx.qry.sha1);
         if (ctx.qry.sha2)
                 html_hidden("id2", ctx.qry.sha2);
         if (ctx.qry.showmsg)
                 html_hidden("showmsg", "1");
 
         if (incl_search) {
                 if (ctx.qry.grep)
                         html_hidden("qt", ctx.qry.grep);
                 if (ctx.qry.search)
                         html_hidden("q", ctx.qry.search);
         }
 }
 
 static const char *hc(struct cgit_context *ctx, const char *page)
 {
         return strcmp(ctx->qry.page, page) ? NULL : "active";
 }
 
 static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
 {
         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)
 {
         html("<table id='header'>\n");
         html("<tr>\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(" : ");
                 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                 html("</td><td class='form'>");
                 html("<form method='get' action=''>\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);
                 html("</select> ");
                 html("<input type='submit' name='' value='switch'/>");
                 html("</form>");
         } else
                 html_txt(ctx->cfg.root_title);
         html("</td></tr>\n");
 
         html("<tr><td class='sub'>");
         if (ctx->repo) {
                 html_txt(ctx->repo->desc);
                 html("</td><td class='sub right'>");
                 html_txt(ctx->repo->owner);
         } else {
                 if (ctx->cfg.root_desc)
                         html_txt(ctx->cfg.root_desc);
                 else if (ctx->cfg.index_info)
                         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) {
                 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);
                 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);
                 cgit_commit_link("commit", NULL, hc(ctx, "commit"),
-                                 ctx->qry.head, ctx->qry.sha1, 0);
+                                 ctx->qry.head, ctx->qry.sha1, NULL, 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,
                                     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.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("</select>\n");
                 html("<input class='txt' type='text' size='10' name='q' value='");
                 html_attr(ctx->qry.search);
                 html("'/>\n");
                 html("<input type='submit' value='search'/>\n");
                 html("</form>\n");
         } else {
                 site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
                 if (ctx->cfg.root_readme)
                         site_link("about", "about", NULL, hc(ctx, "about"),
                                   NULL, 0);
                 html("</td><td class='form'>");
                 html("<form method='get' action='");
                 html_attr(cgit_rooturl());
                 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("</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'>");
 }
 
 void cgit_print_filemode(unsigned short mode)
 {
         if (S_ISDIR(mode))
                 html("d");
         else if (S_ISLNK(mode))
                 html("l");
         else if (S_ISGITLINK(mode))
                 html("m");
         else
                 html("-");
         html_fileperm(mode >> 6);
         html_fileperm(mode >> 3);
         html_fileperm(mode);
 }
 
 void cgit_print_snapshot_links(const char *repo, const char *head,
                                const char *hex, int snapshots)
 {
         const struct cgit_snapshot_format* f;
         char *prefix;
             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;
                 filename = fmt("%s%s", prefix, f->suffix);
                 cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                 html("<br/>");
         }
 }
diff --git a/ui-shared.h b/ui-shared.h
index c0e5c55..3cc1258 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -1,65 +1,66 @@
 #ifndef UI_SHARED_H
 #define UI_SHARED_H
 
 extern char *cgit_httpscheme();
 extern char *cgit_hosturl();
 extern char *cgit_rooturl();
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,
                           const char *filename, const char *query);
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
                           const char *query);
 
 extern void cgit_index_link(const char *name, const char *title,
                             const char *class, const char *pattern, int ofs);
 extern void cgit_summary_link(const char *name, const char *title,
                               const char *class, const char *head);
 extern void cgit_tag_link(const char *name, const char *title,
                           const char *class, const char *head,
                           const char *rev);
 extern void cgit_tree_link(const char *name, const char *title,
                            const char *class, const char *head,
                            const char *rev, const char *path);
 extern void cgit_plain_link(const char *name, const char *title,
                             const char *class, const char *head,
                             const char *rev, const char *path);
 extern 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);
 extern void cgit_commit_link(char *name, const char *title,
                              const char *class, const char *head,
-                             const char *rev, int toggle_ssdiff);
+                             const char *rev, const char *path,
+                             int toggle_ssdiff);
 extern void cgit_patch_link(const char *name, const char *title,
                             const char *class, const char *head,
                             const char *rev, const char *path);
 extern void cgit_refs_link(const char *name, const char *title,
                            const char *class, const char *head,
                            const char *rev, const char *path);
 extern void cgit_snapshot_link(const char *name, const char *title,
                                const char *class, const char *head,
                                const char *rev, const char *archivename);
 extern 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);
 extern void cgit_stats_link(const char *name, const char *title,
                             const char *class, const char *head,
                             const char *path);
 extern void cgit_self_link(char *name, const char *title,
                            const char *class, struct cgit_context *ctx);
 extern void cgit_object_link(struct object *obj);
 
 extern void cgit_print_error(const char *msg);
 extern void cgit_print_date(time_t secs, const char *format, int local_time);
 extern void cgit_print_age(time_t t, time_t max_relative, const char *format);
 extern void cgit_print_http_headers(struct cgit_context *ctx);
 extern void cgit_print_docstart(struct cgit_context *ctx);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(struct cgit_context *ctx);
 extern void cgit_print_filemode(unsigned short mode);
 extern void cgit_print_snapshot_links(const char *repo, const char *head,
                                       const char *hex, int snapshots);
 extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
                                        const char *page);
 #endif /* UI_SHARED_H */