1 files changed, 203 insertions, 67 deletions

diff --git a/ui-shared.c b/ui-shared.c
index 8a7cc32..ae29615 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -27,7 +27,7 @@ static char *http_date(time_t t)
                    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);
@@ -133,7 +133,7 @@ char *cgit_currurl()
                 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 = "?";
 
@@ -160,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) {
@@ -181,14 +181,14 @@ static void site_link(char *page, char *name, char *title, char *class,
         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);
 }
 
-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 +240,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,32 +257,33 @@ 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;
 
@@ -316,8 +318,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)
+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';
@@ -325,23 +328,53 @@ 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] = '.';
         }
-        reporevlink("commit", name, title, class, head, rev, NULL);
+
+        char *delim;
+
+        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");
+                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_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)
+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;
 
@@ -356,24 +389,99 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
                 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");
+                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);
 }
 
+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;
@@ -383,7 +491,7 @@ void cgit_object_link(struct object *obj)
         shortrev[10] = '\0';
         if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
-                                 ctx.qry.head, fullrev);
+                                 ctx.qry.head, fullrev, NULL, 0);
                 return;
         } else if (obj->type == OBJ_TREE)
                 page = "tree";
@@ -395,7 +503,7 @@ void cgit_object_link(struct object *obj)
         reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);