Add ofs argument to cgit_log_link and use it in ui-log.c

This fixes a bug in the prev/next links on the log page: when on the default
branch the links to prev/next page would contain h=(null).

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

6 files changed, 30 insertions, 16 deletions

diff --git a/cgit.h b/cgit.h
index ddb2fff..a59a370 100644
--- a/cgit.h
+++ b/cgit.h
@@ -197,25 +197,25 @@ extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_cancel_lock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
                           const char *query);
 
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
                            char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
-                          char *rev, char *path);
+                          char *rev, char *path, int ofs);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
                              char *rev);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
                            char *new_rev, char *old_rev, char *path);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_date(time_t secs, char *format);
 extern void cgit_print_age(time_t t, time_t max_relative, char *format);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title, int show_search);
 extern void cgit_print_snapshot_start(const char *mimetype,
diff --git a/ui-log.c b/ui-log.c
index 95cb453..d38e40a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -104,27 +104,25 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, i
         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;
         }
         html("</table>\n");
 
         if (pager) {
                 html("<div class='pager'>");
                 if (ofs > 0) {
-                        html("&nbsp;<a href='");
-                        html(cgit_pageurl(cgit_query_repo, cgit_query_page,
-                                          fmt("h=%s&amp;ofs=%d", tip, ofs-cnt)));
-                        html("'>[prev]</a>&nbsp;");
+                        cgit_log_link("[prev]", NULL, NULL, cgit_query_head,
+                                      cgit_query_sha1, cgit_query_path,
+                                      ofs - cnt);
+                        html("&nbsp;");
                 }
-
                 if ((commit = get_revision(&rev)) != NULL) {
-                        html("&nbsp;<a href='");
-                        html(cgit_pageurl(cgit_query_repo, "log",
-                                          fmt("h=%s&amp;ofs=%d", tip, ofs+cnt)));
-                        html("'>[next]</a>&nbsp;");
+                        cgit_log_link("[next]", NULL, NULL, cgit_query_head,
+                                      cgit_query_sha1, cgit_query_path,
+                                      ofs + cnt);
                 }
                 html("</div>");
         }
 }
diff --git a/ui-repolist.c b/ui-repolist.c
index c735368..4c86543 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -89,21 +89,21 @@ void cgit_print_repolist(struct cacheitem *item)
                 html("</td><td>");
                 html_ntxt(cgit_max_repodesc_len, cgit_repo->desc);
                 html("</td><td>");
                 html_txt(cgit_repo->owner);
                 html("</td><td>");
                 print_modtime(cgit_repo);
                 html("</td>");
                 if (cgit_enable_index_links) {
                         html("<td>");
                         html_link_open(cgit_repourl(cgit_repo->url),
                                        NULL, "button");
                         html("summary</a>");
-                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL);
+                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL, 0);
                         cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
                         html("</td>");
                 }
                 html("</tr>\n");
         }
         html("</table>");
         cgit_print_docend();
 }
diff --git a/ui-shared.c b/ui-shared.c
index 64c237f..bfcc2ac 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -154,27 +154,43 @@ static void reporevlink(char *page, char *name, char *title, char *class,
         html("'>");
         html_txt(name);
         html("</a>");
 }
 
 void cgit_tree_link(char *name, char *title, char *class, char *head,
                     char *rev, char *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)
+                   char *rev, char *path, int ofs)
 {
-        reporevlink("log", name, title, class, head, rev, path);
+        char *delim;
+
+        delim = repolink(title, class, "log", head, path);
+        if (rev && strcmp(rev, cgit_query_head)) {
+                html(delim);
+                html("id=");
+                html_attr(rev);
+                delim = "&";
+        }
+        if (ofs > 0) {
+                html(delim);
+                html("ofs=");
+                htmlf("%d", ofs);
+        }
+        html("'>");
+        html_txt(name);
+        html("</a>");
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,
                       char *rev)
 {
         if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {
                 name[cgit_max_msg_len] = '\0';
                 name[cgit_max_msg_len - 1] = '.';
                 name[cgit_max_msg_len - 2] = '.';
                 name[cgit_max_msg_len - 3] = '.';
         }
         reporevlink("commit", name, title, class, head, rev, NULL);
@@ -293,25 +309,25 @@ void cgit_print_pageheader(char *title, int show_search)
         htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo);
         html("</td></tr>");
         html("<tr><td id='crumb'>");
         if (cgit_query_repo) {
                 html_txt(cgit_repo->name);
                 html(" (");
                 html_txt(cgit_query_head);
                 html(") : &nbsp;");
                 reporevlink(NULL, "summary", NULL, NULL, cgit_query_head,
                             NULL, NULL);
                 html(" ");
                 cgit_log_link("log", NULL, NULL, cgit_query_head,
-                              cgit_query_sha1, cgit_query_path);
+                              cgit_query_sha1, cgit_query_path, 0);
                 html(" ");
                 cgit_tree_link("tree", NULL, NULL, cgit_query_head,
                                cgit_query_sha1, NULL);
                 html(" ");
                 cgit_commit_link("commit", NULL, NULL, cgit_query_head,
                               cgit_query_sha1);
                 html(" ");
                 cgit_diff_link("diff", NULL, NULL, cgit_query_head,
                                cgit_query_sha1, cgit_query_sha2,
                                cgit_query_path);
         } else {
                 html_txt("Index of repositories");
diff --git a/ui-summary.c b/ui-summary.c
index 03dd078..b4bc6d8 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -18,25 +18,25 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
         char buf[256];
         char *ref;
 
         ref = xstrdup(refname);
         strncpy(buf, refname, sizeof(buf));
         commit = lookup_commit(sha1);
         // object is not really parsed at this point, because of some fallout
         // from previous calls to git functions in cgit_print_log()
         commit->object.parsed = 0;
         if (commit && !parse_commit(commit)){
                 info = cgit_parse_commit(commit);
                 html("<tr><td>");
-                cgit_log_link(ref, NULL, NULL, ref, NULL, NULL);
+                cgit_log_link(ref, NULL, NULL, ref, NULL, NULL, 0);
                 html("</td><td>");
                 cgit_print_age(commit->date, -1, NULL);
                 html("</td><td>");
                 html_txt(info->author);
                 html("</td><td>");
                 cgit_commit_link(info->subject, NULL, NULL, ref, NULL);
                 html("</td></tr>\n");
                 cgit_free_commitinfo(info);
         } else {
                 html("<tr><td>");
                 html_txt(buf);
                 html("</td><td colspan='3'>");
diff --git a/ui-tree.c b/ui-tree.c
index b6cb813..c5d64ff 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -84,25 +84,25 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                 html("</a>");
         } else if (S_ISDIR(mode)) {
                 cgit_tree_link(name, NULL, "ls-dir", cgit_query_head,
                                curr_rev, fullpath);
         } else {
                 cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
                                curr_rev, fullpath);
         }
         htmlf("</td><td class='ls-size'>%li</td>", size);
 
         html("<td>");
         cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
-                      fullpath);
+                      fullpath, 0);
         html("</td></tr>\n");
         free(name);
         return 0;
 }
 
 static void ls_head()
 {
         html("<table class='list'>\n");
         html("<tr class='nohover'>");
         html("<th class='left'>Mode</th>");
         html("<th class='left'>Name</th>");
         html("<th class='right'>Size</th>");